修改bug

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

@@ -531,7 +531,7 @@ public class EquipmentDetailController extends AbstractBaseController {
         try {
             // 判读机场服务是否在线
             ExcelEnums excelEnums;
-            ResponseModel<String[]> result = jcsFeign.getEquipmentInfo(getAppKey(), getProduct(), getToken(), null, "getCompany");
+            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());

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

@@ -52,13 +52,13 @@ public class EquipmentDetailExcelTemplateDto implements Serializable {
     //@Excel(name = "消防系统编码", width = 30, orderNum = "10")
     private String fightingSysCodes;
 
-    @ExplicitConstraint(indexNum = 10, sourceClass = RoleNameExplicitConstraint.class,method="getFireTeam") //动态下拉内容
+    @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="getCompany") //动态下拉内容
+    @ExplicitConstraint(indexNum = 11, sourceClass = RoleNameExplicitConstraint.class,method="getEquipCompany") //动态下拉内容
     @ExcelProperty(value = "所属单位", index = 11)
     //@Excel(name = "所属单位",width = 30,orderNum = "12")
     private String companyName;

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/DataSourcesImpl.java

@@ -162,6 +162,15 @@ public class DataSourcesImpl implements DataSources {
                 case "getEquipDefinition":
                     str = getEquipDefinition();
                     break;
+                case "getEquipCompany":
+                    str = getEquipCompany();
+                    break;
+                case "getWaterCompanyList":
+                    str = getWaterCompanyList();
+                    break;
+                case "getEquipFireTeam()":
+                    str =  getEquipFireTeam();
+                    break;
             }
         }
         return str;
@@ -195,6 +204,23 @@ public class DataSourcesImpl implements DataSources {
         return str;
     }
 
+    private String[] getEquipFireTeam() {
+//			Page<FireTeamCardDto> pageBean = new Page<>(0, Integer.MAX_VALUE);
+//		IPage<FireTeamCardDto> fireTeamCardDtoIPage = fireTeamService.listFireTeamByPage(pageBean,
+//				new FireTeamListDto());
+//		List<FireTeamCardDto> records = fireTeamCardDtoIPage.getRecords();
+        // 导出模板增加权限
+        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+        // 权限处理
+        PermissionInterceptorContext.setDataAuthRule("fire_equip_info");
+        List<FireTeam> records = fireTeamService.getFireTeamList(reginParams.getPersonIdentity().getBizOrgCode());
+        List<String> names = records.stream().map(item -> {
+            return item.getName() + "@" + item.getSequenceNbr();
+        }).collect(Collectors.toList());
+        String[] str = names.toArray(new String[names.size()]);
+        return str;
+    }
+
     private String[] getBizCompanyList() throws Exception {
         // 导出模板增加权限
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
@@ -417,6 +443,26 @@ public class DataSourcesImpl implements DataSources {
         return str;
     }
 
+    /**
+     * 消防队员模板获取所属部门
+     *
+     * @return
+     */
+    private String[] getEquipCompany() {
+
+        //List<OrgMenuDto> menus = OrgUsrServiceImpl.buildTreeParallel(iOrgUsrService.selectCompanyDepartmentMsg());
+        // 导出模板增加权限
+        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+        // 权限处理
+        PermissionInterceptorContext.setDataAuthRule("fire_equip_info");
+        List<OrgUsr> menus = iOrgUsrService.companyTreeByUserAndTypeNoTree(reginParams, null);
+        List<String> names = menus.stream().map(item -> {
+            return item.getBizOrgName() + "@" + item.getSequenceNbr() + "@" + item.getBizOrgCode();
+        }).collect(Collectors.toList());
+        String[] str = names.toArray(new String[names.size()]);
+        return str;
+    }
+
 
 
     /**