解决BUG 4470

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentDetailController.java

@@ -533,27 +533,27 @@ public class EquipmentDetailController extends AbstractBaseController {
 //        List<EquipmentDetailDownloadTemplateVO> equipmentDetailDownloads = new ArrayList<>();
 //        ExcelUtils.exportExcel(equipmentDetailDownloads, "设备信息", "设备信息", EquipmentDetailDownloadTemplateVO.class, simpleDateFormat.format(new Date()) + ".xls", response);
 
-        try {
-            // 判读机场服务是否在线
-            ExcelEnums excelEnums;
-            ResponseModel<String[]> result = jcsFeign.getEquipmentInfo(getAppKey(), getProduct(), getToken(), null, "getEquipCompany");
-            if (200 == result.getStatus()) {
-                excelEnums = ExcelEnums.getByKey(ExcelEnums.XFZB.getType());
-                ExcelDto excelDto = new ExcelDto(excelEnums.getFileName(), excelEnums.getSheetName(), excelEnums.getClassUrl(), excelEnums.getType());
-                String url = excelDto.getClassUrl();
-                Class<?> clz = Class.forName(url);
-                ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), null, clz, getToken(),
-                        getAppKey(), getProduct(), true);
-            }
-
-        } catch (Exception e) {
+//        try {
+//            // 判读机场服务是否在线
+//            ExcelEnums excelEnums;
+//            ResponseModel<String[]> result = jcsFeign.getEquipmentInfo(getAppKey(), getProduct(), getToken(), null, "getEquipCompany");
+//            if (200 == result.getStatus()) {
+//                excelEnums = ExcelEnums.getByKey(ExcelEnums.XFZB.getType());
+//                ExcelDto excelDto = new ExcelDto(excelEnums.getFileName(), excelEnums.getSheetName(), excelEnums.getClassUrl(), excelEnums.getType());
+//                String url = excelDto.getClassUrl();
+//                Class<?> clz = Class.forName(url);
+//                ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), null, clz, getToken(),
+//                        getAppKey(), getProduct(), true);
+//            }
+//
+//        } catch (Exception e) {
             ExcelEnums excelEnums = ExcelEnums.getByKey(ExcelEnums.XFZBSINGLE.getType());
             ExcelDto excelDto = new ExcelDto(excelEnums.getFileName(), excelEnums.getSheetName(), excelEnums.getClassUrl(), excelEnums.getType());
             String url = excelDto.getClassUrl();
             Class<?> clz = Class.forName(url);
             ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), null, clz, getToken(),
                     getAppKey(), getProduct(), true);
-        }
+       // }
     }
 
     /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/dto/EquipmentDetailExcelSingleTemplateDto.java

 package com.yeejoin.equipmanage.dto;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.yeejoin.equipmanage.utils.ExplicitConstraint;
+import com.yeejoin.equipmanage.utils.RoleNameExplicitConstraint;
 
 /**
  * @author litw
@@ -48,4 +50,14 @@ public class EquipmentDetailExcelSingleTemplateDto {
     //@Excel(name = "消防系统编码", width = 30, orderNum = "10")
     private String fightingSysCodes;
     
+    @ExplicitConstraint(indexNum = 10, sourceClass = RoleNameExplicitConstraint.class,method="getEquipFireTeam") //动态下拉内容
+    @ExcelProperty(value = "所属队伍", index = 10)
+    //@Excel(name = "所属队伍",width = 30,orderNum = "11")
+    private String fireTeam;
+
+    //动态下拉内容
+    @ExplicitConstraint(indexNum = 11, sourceClass = RoleNameExplicitConstraint.class,method="getEquipCompany") //动态下拉内容
+    @ExcelProperty(value = "所属单位", index = 11)
+    //@Excel(name = "所属单位",width = 30,orderNum = "12")
+    private String companyName;
 }