From 063bdf69732f41a3c01385be5bae41399cdc8c8c Mon Sep 17 00:00:00 2001
From: wangxy <1356089412@qq.com>
Date: Wed, 21 Aug 2024 14:33:09 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=9F=A5=E8=AF=A2=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/carrier/CarrierController.java | 30 +++++++++++++++++--
 .../system/domain/carrier/TdCarrier.java      | 19 ++++++++----
 2 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/carrier/CarrierController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/carrier/CarrierController.java
index c6e2eeb..b131310 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/carrier/CarrierController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/carrier/CarrierController.java
@@ -5,8 +5,11 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.TdFileProvide;
 import com.ruoyi.system.domain.carrier.TdCarrier;
 import com.ruoyi.web.controller.manager.CarrierManager;
+import com.ruoyi.web.controller.manager.SysAreaManager;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
@@ -51,6 +54,27 @@ public class CarrierController extends BaseController {
         return getDataTable(carriers);
     }
 
+
+    @Resource
+    private SysAreaManager sysAreaManager;
+
+    /**
+     * 导出文件下发列表
+     */
+    @RequiresPermissions("system:carrier:export")
+    @Log(title = "国家秘密载体", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(TdCarrier tdCarrier) {
+        List<TdCarrier> carriers = carrierManager.selectTdCarrierList(tdCarrier);
+        carriers.forEach(tdCarrier1 -> {
+            tdCarrier1.setAreaCity(sysAreaManager.getAreaName(tdCarrier1.getAreaCity()));
+            tdCarrier1.setAreaDistrict(sysAreaManager.getAreaName(tdCarrier1.getAreaDistrict()));
+        });
+        ExcelUtil<TdCarrier> util = new ExcelUtil<>(TdCarrier.class);
+        return util.exportExcel(carriers, "国家秘密载体数据");
+    }
+
     /**
      * 新增载体
      */
@@ -117,10 +141,10 @@ public class CarrierController extends BaseController {
     /**
      * 修改状态
      */
-    @GetMapping ("/updateStatus/{id}/{status}")
+    @GetMapping("/updateStatus/{id}/{status}")
     @ResponseBody
-    public AjaxResult updateStatus(@PathVariable("id") String id,@PathVariable("status") String status) {
-        return toAjax(carrierManager.updateStatus(id,status));
+    public AjaxResult updateStatus(@PathVariable("id") String id, @PathVariable("status") String status) {
+        return toAjax(carrierManager.updateStatus(id, status));
     }
 
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/carrier/TdCarrier.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/carrier/TdCarrier.java
index f6851c3..756e6b0 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/carrier/TdCarrier.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/carrier/TdCarrier.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.util.Date;
 
+import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -24,49 +25,57 @@ public class TdCarrier extends BaseEntity {
     private String id;
 
     /**
-     * 载体数量
+     * 载体名称
      */
-    private String carrierCount;
-
+    @Excel(name = "载体名称")
+    private String carrierName;
 
     /**
-     * 载体名称
+     * 载体数量
      */
-    private String carrierName;
+    @Excel(name = "载体数量")
+    private String carrierCount;
 
     /**
      * 载体类型
      */
+    @Excel(name = "载体类型")
     private String carrierLevel;
 
     /**
      * 紧急程度
      */
+    @Excel(name = "紧急程度",readConverterExp = "0=普通,1=紧急,2=加急")
     private String carrierExtent;
 
     /**
      * 定密依据
      */
+    @Excel(name = "定密依据")
     private String carrierAlliance;
 
     /**
      * 密级
      */
+    @Excel(name = "密级",readConverterExp = "0=秘密,1=机密,2=绝密")
     private String carrierSecret;
 
     /**
      * 编号
      */
+    @Excel(name = "编号")
     private String carrierNumber;
 
     /**
      * 保密期限
      */
+    @Excel(name = "保密期限")
     private String carrierTerm;
 
     /**
      * 发放范围
      */
+    @Excel(name = "发放范围")
     private String carrierContent;
 
     /**