新增单位名、companyId列表接口

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/BaseCompanyController.java

@@ -225,5 +225,14 @@ public class BaseCompanyController {
         return ApiResult.success(baseCompanyService.companySelect(companyIdList));
     }
 
+    /**
+     * 获取单位名称和单位编号列表
+     *
+     * @return
+     */
+    @GetMapping("/companyNameList")
+    public ApiResult<List<Map<String, String>>> baseStreetTownList() {
+        return ApiResult.success(baseCompanyService.baseCompanyList());
+    }
 }
 

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/BaseCompanyService.java

@@ -149,4 +149,9 @@ public interface BaseCompanyService extends CrudService<BaseCompany> {
      * @return List<BaseCompanyLonLatVO>
      */
     List<BaseCompanyLonLatVO> getLonLat();
+
+    /**
+     * 建筑信息-列表查询
+     */
+    List<Map<String, String>> baseCompanyList();
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/BaseCompanyServiceImpl.java

@@ -2,7 +2,6 @@ package com.usky.fire.service.impl;
 
 import com.baomidou.mybatisplus.autoconfigure.MybatisPlusProperties;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
@@ -1160,6 +1159,24 @@ public class BaseCompanyServiceImpl extends AbstractCrudService<BaseCompanyMappe
                 })
                 .collect(Collectors.toList());
     }
+
+    @Override
+    public List<Map<String, String>> baseCompanyList() {
+        return baseMapper.selectList(
+                        Wrappers.<BaseCompany>lambdaQuery()
+                                .select(BaseCompany::getCompanyId, BaseCompany::getCompanyName)
+                                .eq(BaseCompany::getCompanyType, "1")
+                                .eq(BaseCompany::getEnable, 0)
+                ).stream()
+                .map(c -> {
+                    Map<String, String> map = new HashMap<>(2);
+                    map.put("companyId", c.getCompanyId());
+                    map.put("companyName", c.getCompanyName());
+                    return map;
+                })
+                .collect(Collectors.toList());
+    }
+
 }