获取首页地图统计更改

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/lease/controller/TLeaseBankController.java

@@ -89,10 +89,9 @@ public class TLeaseBankController extends SuperController {
         return baseResponse;
     }
 
-
     @ApiOperation(value = "获取首页地图统计 ", notes = "Get TLeaseBank By Id")
-    @GetMapping(value = "/getHomeStatistics")
-    public BaseResponse<List<HomeStatistics>> getHomeStatistics(String orgId) {
+    @GetMapping(value = "/getHomeStatisticsOther")
+    public BaseResponse<List<HomeStatistics>> getHomeStatisticsOther(String orgId) {
         BaseResponse<List<HomeStatistics>> baseResponse = new BaseResponse<>();
 
         if (StringHelper.isEmpty(orgId)) {
@@ -144,6 +143,58 @@ public class TLeaseBankController extends SuperController {
     }
 
 
+    @ApiOperation(value = "获取首页地图统计 ", notes = "Get TLeaseBank By Id")
+    @GetMapping(value = "/getHomeStatistics")
+    public BaseResponse<List<HomeStatistics>> getHomeStatistics(String orgId) {
+        BaseResponse<List<HomeStatistics>> baseResponse = new BaseResponse<>();
+
+        if (StringHelper.isEmpty(orgId)) {
+            // 当前登录用户的组织机构id
+            orgId = ContextUtils.getLoginUser().getOrgId();
+        }
+        // 获取当前的子机构
+        List<SysOrg> orgList = sysOrgService.list(new QueryWrapper<SysOrg>()
+                .like(SysOrg.PARENT_ID, orgId)
+                .eq(SysOrg.IS_DEPT, "0")
+                .ne(SysOrg.STATUS, BizConstants.STATUS_DELETE)
+        );
+        List<HomeStatistics> homeStatistics = new ArrayList<>();
+        for (SysOrg sysOrg : orgList) {
+            String orgId1 = sysOrg.getOrgId();
+            HomeStatistics statistics = new HomeStatistics();
+            // 获取危险源统计
+            SourceOfDanger sourceOfDanger = getHomeRiskSource(orgId1).getData();
+            // 获取隐患数量统计
+            HiddenDanger hiddenDanger = getHiddenDanger(orgId1).getData();
+            // 获取地图粮库数量
+            GrainBlank grainBlank = getHomeGrain(orgId1).getData();
+            //机构信息
+            statistics.setLatitude(sysOrg.getLatitude());
+            statistics.setLongitude(sysOrg.getLongitude());
+            statistics.setOrgId(sysOrg.getOrgId());
+            statistics.setOrgName(sysOrg.getOrgName());
+            // 危险源
+            statistics.setMajor(sourceOfDanger.getMajor());
+            statistics.setRiskRourceNum(sourceOfDanger.getRiskRourceNum());
+            statistics.setRiskPoint(sourceOfDanger.getRiskPoint());
+
+            // 隐患
+            statistics.setGeneral(hiddenDanger.getGeneral());
+            statistics.setGreate(hiddenDanger.getGreate());
+            statistics.setHiddenDangerCount(hiddenDanger.getHiddenDangerCount());
+
+            // 粮库
+            statistics.setFundsBankNum(grainBlank.getFundsBankNum());
+            statistics.setBusinessDeptNum(grainBlank.getBusinessDeptNum());
+            statistics.setTLeaseBankNUm(grainBlank.getTLeaseBankNUm());
+            statistics.setCount(grainBlank.getCount());
+            homeStatistics.add(statistics);
+        }
+        baseResponse.setData(homeStatistics);
+        return baseResponse;
+    }
+
+
     @ApiOperation(value = "首页地图危险源数量统计 ", notes = "Get TLeaseBank By Id")
     @GetMapping(value = "/getHomeRiskSource")
     public BaseResponse<SourceOfDanger> getHomeRiskSource(String orgId) {