From 3edcc599e8c319b997f25fb76a179c06864372c4 Mon Sep 17 00:00:00 2001
From: 18650502300 <18650502300@163.com>
Date: Sat, 21 Dec 2024 15:39:04 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A8=E8=BF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/app/AppController.java     |  1 -
 .../controller/app/AppVerifyController.java   | 67 +++++++++++++++++++
 .../system/EtParkingAreaController.java       |  2 +-
 .../ruoyi/system/domain/EtLocationLog.java    |  2 +
 4 files changed, 70 insertions(+), 2 deletions(-)

diff --git a/electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppController.java b/electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppController.java
index ab38308..9099a29 100644
--- a/electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppController.java
+++ b/electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppController.java
@@ -212,7 +212,6 @@ public class AppController extends BaseController
     public TableDataInfo list(EtParkingArea etParkingArea)
     {
         etParkingArea.setStatus("0");
-//        startPage();
         List<EtParkingArea> list = etParkingAreaService.selectEtParkingAreaList(etParkingArea);
         return getDataTable(list);
     }
diff --git a/electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppVerifyController.java b/electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppVerifyController.java
index b83b866..58f8251 100644
--- a/electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppVerifyController.java
+++ b/electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppVerifyController.java
@@ -1662,4 +1662,71 @@ public class AppVerifyController extends BaseController
         }
         return toAjax(etOperatingAreaService.updateEtOperatingArea(etOperatingArea));
     }
+
+    /**
+     * 查询停车区列表
+     */
+    @GetMapping("/parking/list")
+    public AjaxResult list(EtParkingArea etParkingArea)
+    {
+        List<EtParkingArea> list = etParkingAreaService.selectEtParkingAreaList(etParkingArea);
+        return success(list);
+    }
+
+    /**
+     * 新增停车区
+     */
+    @Log(title = "停车区", businessType = BusinessType.INSERT)
+    @PostMapping("/parking")
+    public AjaxResult add(@RequestBody EtParkingArea etParkingArea)
+    {
+        return toAjax(etParkingAreaService.insertEtParkingArea(etParkingArea));
+    }
+
+    /**
+     * 修改停车区
+     */
+    @Log(title = "停车区", businessType = BusinessType.UPDATE)
+    @PutMapping("/parking")
+    public AjaxResult edit(@RequestBody EtParkingArea etParkingArea)
+    {
+        return toAjax(etParkingAreaService.updateEtParkingArea(etParkingArea));
+    }
+
+    /**
+     * 删除停车区
+     */
+    @Log(title = "停车区", businessType = BusinessType.DELETE)
+    @DeleteMapping("/parking/{parkingIds}")
+    public AjaxResult remove(@PathVariable Long[] parkingIds)
+    {
+        return toAjax(etParkingAreaService.deleteEtParkingAreaByParkingIds(parkingIds));
+    }
+
+    /**
+     * 状态修改
+     */
+    @Log(title = "停车区状态修改", businessType = BusinessType.UPDATE)
+    @PutMapping("/parking/changeParkingStatus")
+    public AjaxResult changeStatus(@RequestBody EtParkingArea area)
+    {
+        return toAjax(etParkingAreaService.updateParkingStatus(area));
+    }
+
+    /**
+     * 根据时间查询车辆轨迹  /trajectory  给方法取个名，本来是查询轨迹的，现在增加一个带详情的轨迹，给新接口取个名
+     */
+    @PostMapping("/trajectoryDetails")
+    public AjaxResult trajectoryDetails(String sn,String startTime,String endTime)
+    {
+        AjaxResult ajax = AjaxResult.success();
+        if(StrUtil.isBlank(sn)){
+            logger.info("没有sn号参数：【sn={}】",sn);
+            return error("请传sn号参数"+"【sn="+sn+"】");
+        }
+        logger.info("【根据时间查询车辆轨迹】：{}",sn,startTime,endTime);
+        List<EtLocationLog> trajectoryDetails = asDeviceService.trajectoryDetails(sn,startTime,endTime);
+        ajax.put(AjaxResult.DATA_TAG,trajectoryDetails);
+        return ajax;
+    }
 }
diff --git a/electripper-admin/src/main/java/com/ruoyi/web/controller/system/EtParkingAreaController.java b/electripper-admin/src/main/java/com/ruoyi/web/controller/system/EtParkingAreaController.java
index 439fd5d..0a93c12 100644
--- a/electripper-admin/src/main/java/com/ruoyi/web/controller/system/EtParkingAreaController.java
+++ b/electripper-admin/src/main/java/com/ruoyi/web/controller/system/EtParkingAreaController.java
@@ -115,7 +115,7 @@ public class EtParkingAreaController extends BaseController
     /**
      * 状态修改
      */
-    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
+    @Log(title = "停车区状态修改", businessType = BusinessType.UPDATE)
     @PutMapping("/changeParkingStatus")
     public AjaxResult changeStatus(@RequestBody EtParkingArea area)
     {
diff --git a/electripper-system/src/main/java/com/ruoyi/system/domain/EtLocationLog.java b/electripper-system/src/main/java/com/ruoyi/system/domain/EtLocationLog.java
index c85a2f4..1d49a59 100644
--- a/electripper-system/src/main/java/com/ruoyi/system/domain/EtLocationLog.java
+++ b/electripper-system/src/main/java/com/ruoyi/system/domain/EtLocationLog.java
@@ -1,5 +1,6 @@
 package com.ruoyi.system.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 import lombok.Data;
@@ -37,6 +38,7 @@ public class EtLocationLog extends BaseEntity
     private String latitude;
 
     @Excel(name = "onenet消息时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date at;
 
     /** 车辆状态 */