*）调整接口

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/java/com/yeejoin/amos/boot/module/elevator/api/mapper/ElevatorMapper.java

@@ -70,6 +70,4 @@ public interface ElevatorMapper extends BaseMapper<Elevator> {
     Map<String, Object> selectMainUnitMessage(String sequenceNbr);
 
     Map<String, Object> selectUseUnitByAlertId(String sequenceNbr);
-
-    List<Map<String, Object>> elevatorCountStat(@Param("regionCodes") List<String> regionCodes);
 }

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/resources/mapper/AlertCalledMapper.xml

@@ -148,6 +148,7 @@
 				LEFT JOIN cb_data_dictionary cdd ON ibjuj.USE_PLACE = cdd.sequence_nbr
 		WHERE
 			biz_org_code LIKE concat(#{regionCode}, '%')
+		  AND (tac.alarm_type_code = '960' or tac.alarm_type_code = '961')
 		  AND
 			ibjuj.USE_PLACE is NOT NULL
 		  AND	cdd.NAME is NOT NULL

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/resources/mapper/ElevatorMapper.xml

@@ -581,20 +581,4 @@
             ibjmri.SEQUENCE_NBR = #{sequenceNbr}
 
     </select>
-
-    <select id="elevatorCountStat" resultType="java.util.Map">
-        SELECT
-            district,
-            region_code as regionCode,
-            count(region_code) as total
-        FROM
-            tcb_elevator
-        WHERE
-            <if test="regionCodes != null">
-                <foreach collection="regionCodes" index="index" item="item" open="(" separator=" OR " close=")">
-                    tcb_elevator.region_code LIKE CONCAT('%', #{item}, '%')
-                </foreach>
-            </if>
-        GROUP BY region_code
-    </select>
 </mapper>

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/controller/DPStatisticsController.java

@@ -119,6 +119,16 @@ public class DPStatisticsController {
         return ResponseHelper.buildResponse(statisticsService.rankUnitByRescueTime(dpFilterParamDto));
     }
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "大屏-应急-各地市应急事件总数排名", notes = "大屏-应急-各地市应急事件总数排名")
+    @PostMapping(value = "/yj/regionEventRank")
+    public ResponseModel<JSONObject> regionEventRank(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) throws Exception {
+        List<FieldError> fieldErrors = result.getFieldErrors();
+        if (!fieldErrors.isEmpty()) {
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
+        }
+        return ResponseHelper.buildResponse(statisticsService.regionEventRank(dpFilterParamDto));
+    }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "大屏-应急-中间地图图列统计", notes = "大屏-应急-中间地图图列统计")

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/service/impl/DPStatisticsServiceImpl.java

@@ -12,6 +12,7 @@ import com.yeejoin.amos.boot.module.elevator.api.dto.AlertUseUnitStatisticsDto;
 import com.yeejoin.amos.boot.module.elevator.api.entity.AlertMaintenanceUnitStatistics;
 import com.yeejoin.amos.boot.module.elevator.api.entity.AlertRescueStatistics;
 import com.yeejoin.amos.boot.module.elevator.api.entity.AlertUseUnitStatistics;
+import com.yeejoin.amos.boot.module.elevator.api.entity.Elevator;
 import com.yeejoin.amos.boot.module.elevator.api.mapper.*;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
@@ -110,23 +111,21 @@ public class DPStatisticsServiceImpl {
     }
 
     public JSONObject elevatorCountStat(DPFilterParamDto dpFilterParamDto) throws Exception {
+        String regionCode = dpFilterParamDto.getCityCode();
         List<RegionModel> regionList = this.getRegionList(dpFilterParamDto);
-        List<String> regionCodes = regionList.stream().map(r -> r.getRegionCode().toString()).collect(Collectors.toList());
-        List<CompanyModel> companyList = Privilege.companyClient.queryListByCompanyCode(String.join(",", regionCodes)).getResult();
-        companyList = companyList.stream().sorted(Comparator.comparing(CompanyModel::getRegionSeq, Comparator.naturalOrder())).collect(Collectors.toList());
-        Map<String, RegionModel> regionMap = regionList.stream().collect(Collectors.toMap(r ->r.getRegionCode().toString(), r -> r));
-        List<Map<String, Object>> maps = elevatorMapper.elevatorCountStat(regionCodes);
-
-        Map<String, Object> map = maps.stream().collect(Collectors.toMap(
-                item -> (String) item.get("regionCode"),
-                item -> item.get("total")));
+        List<String> xdata = regionList.stream().map(r -> r.getRegionName().toString()).collect(Collectors.toList());
+        if (!regionCode.equals("610000")){
+            regionCode = "610000#" +  regionCode;
+        }
+        List<Integer> ydata = new ArrayList<>();
+        String finalRegionCode = regionCode;
+        regionList.stream().forEach(x -> {
+            LambdaQueryWrapper<Elevator> lambda = new QueryWrapper<Elevator>().lambda();
+            lambda.eq(Elevator::getRegionCode, finalRegionCode + "#" + x.getRegionCode());
+            ydata.add(elevatorMapper.selectCount(lambda));
+        });
 
-        List<String> xdata = new ArrayList<>();
-        List<String> ydata = new ArrayList<>();
         JSONObject jsonObject = new JSONObject();
-        companyList.stream().forEach(x -> {
-            xdata.add(x.getCompanyName());
-        });
         jsonObject.put("xdata", xdata);
         jsonObject.put("ydata", ydata);
         return jsonObject;
@@ -190,12 +189,39 @@ public class DPStatisticsServiceImpl {
 
         LambdaQueryWrapper<AlertMaintenanceUnitStatistics> lambda = new QueryWrapper<AlertMaintenanceUnitStatistics>().lambda();
         lambda.likeLeft(AlertMaintenanceUnitStatistics::getSupervisoryUnitOrgCode, orgCode);
-        lambda.eq(AlertMaintenanceUnitStatistics :: getStatisticsDate, "2023-12");
+        lambda.eq(AlertMaintenanceUnitStatistics :: getStatisticsDate, date);
         List<AlertMaintenanceUnitStatistics> alertMaintenanceUnitStatistics = alertMaintenanceUnitStatisticsMapper.selectList(lambda);
         List<AlertMaintenanceUnitStatisticsDto> models = Bean.toModels(alertMaintenanceUnitStatistics, AlertMaintenanceUnitStatisticsDto.class);
         return models;
     }
 
+    public JSONObject regionEventRank(DPFilterParamDto dpFilterParamDto) throws Exception {
+        List<RegionModel> childRegion = this.getRegionList(dpFilterParamDto);
+        JSONObject jsonObject = new JSONObject();
+
+        Map<String, Long> map = new HashMap<>();
+        childRegion.stream().forEach(x -> {
+            String orgCode = this.getAndSetOrgCode(x.getRegionCode().toString());
+            if (ValidationUtil.isEmpty(orgCode)) {
+                map.put(x.getRegionName(), 0L);
+            } else {
+                Long num = alertStatisticsMapper.countEmergencyEventsByOrgCodeAndDate(orgCode, dpFilterParamDto);
+                map.put(x.getRegionName(), num);
+            }
+        });
+
+        List<String> xdata = new ArrayList<>(map.keySet());
+        List<Long> ydata = new ArrayList<>();
+        xdata.sort(Comparator.comparingLong(map::get).reversed());
+
+        xdata.stream().forEach(x -> {
+            ydata.add(map.get(x));
+        });
+        jsonObject.put("xdata", xdata);
+        jsonObject.put("ydata", ydata);
+        return jsonObject;
+    }
+
     private List<RegionModel> getRegionList(DPFilterParamDto dpFilterParamDto) {
         try {
             if (regionChildRegionMap.get(dpFilterParamDto.getCityCode()) == null) {
@@ -218,6 +244,7 @@ public class DPStatisticsServiceImpl {
             List<RegionModel> independentRegions = ReginStepEnum.enum2RegionList("map");
             regionList.addAll(independentRegions);
         }
+        regionList = regionList.stream().sorted(Comparator.comparing(RegionModel::getRegionCode, Comparator.naturalOrder())).collect(Collectors.toList());
         return regionList;
     }
 
@@ -234,6 +261,18 @@ public class DPStatisticsServiceImpl {
         return orgCode;
     }
 
+    private String getAndSetOrgCode(String cityCode) {
+        String orgCode = regionCodeOrgCodeMap.get(cityCode);
+        if (orgCode == null) {
+            orgCode = yjBaseMapper.getOrgCodeByCompanyCode(cityCode);
+            if (orgCode == null) {
+                return "";
+            }
+            regionCodeOrgCodeMap.put(cityCode, orgCode);
+        }
+        return orgCode;
+    }
+
     /**
      * 获取两个时间段之间的每一天
      * @param startTime 开始时间
@@ -303,5 +342,4 @@ public class DPStatisticsServiceImpl {
             dpFilterParamDto.setEndDate(cn.hutool.core.date.DateUtil.today());
         }
     }
-
 }