From 418fb55bf016ce8ab74640da40bb5cce9406d777 Mon Sep 17 00:00:00 2001
From: daiyongfei <974332738@qq.com>
Date: Mon, 13 Oct 2025 14:25:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E7=94=B5=E5=AD=90=E5=9B=B4?=
 =?UTF-8?q?=E6=A0=8F=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fence/DeviceGeoFenceController.java       |  6 ++
 .../equipment/domain/vo/DeviceGeoFenceVo.java | 80 +++++++++++++++----
 2 files changed, 72 insertions(+), 14 deletions(-)

diff --git a/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/fence/DeviceGeoFenceController.java b/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/fence/DeviceGeoFenceController.java
index 1092b203..6ad03a08 100644
--- a/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/fence/DeviceGeoFenceController.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/fence/DeviceGeoFenceController.java
@@ -59,9 +59,15 @@ public class DeviceGeoFenceController extends BaseController {
     @PostMapping("/export")
     public void export(DeviceGeoFenceBo bo, HttpServletResponse response) {
         List<DeviceGeoFenceVo> list = deviceGeoFenceService.queryList(bo);
+        // 设置区域类型名称
+        list.forEach(item -> {
+            item.setAreaTypeNameByAreaType();
+            item.setIsActiveNameByIsActive(); // 添加这行来设置激活状态名称
+        });
         ExcelUtil.exportExcel(list, "电子围栏", DeviceGeoFenceVo.class, response);
     }
 
+
     /**
      * 获取电子围栏详细信息
      *
diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceGeoFenceVo.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceGeoFenceVo.java
index 119dd8d7..cefb305b 100644
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceGeoFenceVo.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceGeoFenceVo.java
@@ -1,6 +1,7 @@
 package com.fuyuanshen.equipment.domain.vo;
 
 import java.util.Date;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
@@ -15,7 +16,6 @@ import java.io.Serializable;
 import java.util.Date;
 
 
-
 /**
  * 电子围栏视图对象 device_geo_fence
  *
@@ -33,7 +33,7 @@ public class DeviceGeoFenceVo implements Serializable {
     /**
      * 围栏唯一标识
      */
-    @ExcelProperty(value = "围栏唯一标识")
+    // @ExcelProperty(value = "围栏唯一标识")
     private Long id;
 
     /**
@@ -42,22 +42,22 @@ public class DeviceGeoFenceVo implements Serializable {
     @ExcelProperty(value = "围栏名称")
     private String name;
 
-    /**
-     * 围栏描述
-     */
-    @ExcelProperty(value = "围栏描述")
-    private String description;
-
     /**
      * 围栏区域类型,  0 POLYGON, 1 CIRCLE
      */
-    @ExcelProperty(value = "围栏区域类型,  0 POLYGON, 1 CIRCLE")
+    // @ExcelProperty(value = "围栏区域类型")
     private Integer areaType;
 
+    /**
+     * 围栏区域类型,  0 POLYGON 多边形, 1 CIRCLE 圆形
+     */
+    @ExcelProperty(value = "围栏区域类型")
+    private String areaTypeName;
+
     /**
      * 围栏坐标数据
      */
-    @ExcelProperty(value = "围栏坐标数据")
+    // @ExcelProperty(value = "围栏坐标数据")
     private String coordinates;
 
     /**
@@ -69,26 +69,78 @@ public class DeviceGeoFenceVo implements Serializable {
     /**
      * 是否激活
      */
-    @ExcelProperty(value = "是否激活")
+    // @ExcelProperty(value = "是否激活")
     private Long isActive;
 
+    /**
+     * 激活状态名称
+     */
+    @ExcelProperty(value = "是否激活")
+    private String isActiveName;
+
+    /**
+     * 围栏描述
+     */
+    @ExcelProperty(value = "围栏描述")
+    private String description;
+
     /**
      * 创建人
      */
-    @ExcelProperty(value = "创建人")
+    // @ExcelProperty(value = "创建人")
     private Long createBy;
 
     /**
      * 创建时间
      */
-    @ExcelProperty(value = "创建时间")
+    // @ExcelProperty(value = "创建时间")
     private Date createTime;
 
     /**
      * 更新时间
      */
-    @ExcelProperty(value = "更新时间")
+    // @ExcelProperty(value = "更新时间")
     private Date updateTime;
 
 
+    public void setAreaTypeNameByAreaType() {
+        if (this.areaType != null) {
+            switch (this.areaType) {
+                case 0:
+                    this.areaTypeName = "多边形";
+                    break;
+                case 1:
+                    this.areaTypeName = "圆形";
+                    break;
+                default:
+                    this.areaTypeName = "未知";
+                    break;
+            }
+        } else {
+            this.areaTypeName = "未知";
+        }
+    }
+
+
+
+    public void setIsActiveNameByIsActive() {
+        if (this.isActive != null) {
+            switch (this.isActive.intValue()) {
+                case 0:
+                    this.isActiveName = "未激活";
+                    break;
+                case 1:
+                    this.isActiveName = "已激活";
+                    break;
+                default:
+                    this.isActiveName = "未知";
+                    break;
+            }
+        } else {
+            this.isActiveName = "未知";
+        }
+    }
+
+
+
 }