fix--现场专项改造地图接口

src/main/java/com/biutag/supervision/controller/datav/DataVSupervisionNotifyController.java

@@ -65,6 +65,13 @@ public class DataVSupervisionNotifyController {
     }
 
 
+    @Operation(summary = "获取现场专项地图数据")
+    @PostMapping("/getSupervisionNotifyMap")
+    public Result<JSONObject> getSupervisionNotifyMap(@RequestBody DataVRequest request) {
+        return datavService.getSupervisionNotifyMap(request);
+    }
+
+
 
     /**
      * 地图小卡片

src/main/java/com/biutag/supervision/mapper/NegativeMapper.java

@@ -1083,5 +1083,12 @@ public interface NegativeMapper extends BaseMapper<Negative> {
     List<Negative> getChangedRank(String id, Date beginTime, Date endTime);
 
 
+    List<Negative> getNegativeListData(
+            @Param("id") String id,
+            @Param("beginTime") Date beginTime,
+            @Param("endTime") Date endTime,
+            @Param("codes") List<String> codes
+    );
+
     // endregion
 }

src/main/java/com/biutag/supervision/service/datav/DatavService.java

@@ -228,4 +228,11 @@ public interface DatavService {
      * @return
      */
     Result<SupervisionNotifyOverView> getSupervisionNotifyCount(DataVRequest request);
+
+    /**
+     * 现场专项地图
+     * @param request
+     * @return
+     */
+    Result<JSONObject> getSupervisionNotifyMap(DataVRequest request);
 }

src/main/java/com/biutag/supervision/service/datav/DatavServiceImpl.java

@@ -1216,16 +1216,16 @@ public class DatavServiceImpl implements DatavService {
         List<Negative> processingList = negatives.stream().filter(item -> ProcessingStatusEnum.processing.name().equals(item.getProcessingStatus())).toList();
 
         LambdaQueryWrapper<SuperviseReport> superviseReportLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        UserAuth user = UserContextHolder.getCurrentUser();
+//        UserAuth user = UserContextHolder.getCurrentUser();
-        // 权限
+//        // 权限
-        if (!AppConstants.USER_TYPE_SUPER.equals(user.getUserType()) && !user.getRoleCodes().contains(RoleCodeEnum.FIRST_ADMIN.getCode())) {
+//        if (!AppConstants.USER_TYPE_SUPER.equals(user.getUserType()) && !user.getRoleCodes().contains(RoleCodeEnum.FIRST_ADMIN.getCode())) {
-            if (user.getAuthDepartIds().isEmpty() || user.getRoleCodes().isEmpty()) {
+//            if (user.getAuthDepartIds().isEmpty() || user.getRoleCodes().isEmpty()) {
-                //特殊处理
+//                //特殊处理
-                overView.setReportNumber(0L);
+//                overView.setReportNumber(0L);
-            }
+//            }
-            List<String> orgIds = supDepartService.getAllNodeIds(user.getAuthDepartIds());
+//            List<String> orgIds = supDepartService.getAllNodeIds(user.getAuthDepartIds());
-            superviseReportLambdaQueryWrapper.in(SuperviseReport::getCrtDepartId, orgIds);
+//            superviseReportLambdaQueryWrapper.in(SuperviseReport::getCrtDepartId, orgIds);
-        }
+//        }
         superviseReportLambdaQueryWrapper.between(SuperviseReport::getCrtTime, request.getBeginTime(), request.getEndTime());
         superviseReportLambdaQueryWrapper.eq(SuperviseReport::getType, "1");
         List<SuperviseReport> superviseReportList = superviseReportService.list(superviseReportLambdaQueryWrapper);
@@ -1262,6 +1262,57 @@ public class DatavServiceImpl implements DatavService {
         return Result.success(overView);
     }
 
+    @Override
+    public Result<JSONObject> getSupervisionNotifyMap(DataVRequest request) {
+        List<SuperviseMapIconVo> superviseTempMapVoList = new ArrayList<>();
+        SupDepartQueryParam supDepartQueryParam = new SupDepartQueryParam();
+        supDepartQueryParam.setStatisticsGroupId(DepartGroupEnum.COUNTY_CITY_BUREAUS.getId());
+        List<SupDepart> fxsjDw = supDepartResourceService.query(supDepartQueryParam);
+        List<String> proCode = List.of(XCDC.getValue(), LMGZ.getValue(), ZXDC.getValue());
+
+        for (SupDepart fxsj : fxsjDw) {
+            SuperviseMapIconVo superviseMapIconVo = new SuperviseMapIconVo();
+
+            List<Negative> negatives = negativeMapper.getNegativeListData(fxsj.getId(), request.getBeginTime(), request.getEndTime(), proCode);
+            List<Negative> completedList = negatives.stream().filter(item -> ProcessingStatusEnum.completed.name().equals(item.getProcessingStatus())).toList();
+            List<Negative> processingList = negatives.stream().filter(item -> ProcessingStatusEnum.processing.name().equals(item.getProcessingStatus())).toList();
+            // 暂不用通报期数
+//            LambdaQueryWrapper<SuperviseReport> superviseReportLambdaQueryWrapper = new LambdaQueryWrapper<>();
+//            superviseReportLambdaQueryWrapper.between(SuperviseReport::getCrtTime, request.getBeginTime(), request.getEndTime());
+//            superviseReportLambdaQueryWrapper.eq(SuperviseReport::getType, "1");
+//            List<SuperviseReport> superviseReportList = superviseReportService.list(superviseReportLambdaQueryWrapper);
+            List<String> negativeIds = negatives.stream().filter(one -> CheckStatusEnum.TRUE_SET.contains(one.getCheckStatusCode()) || CheckStatusEnum.PART_TRUE_SET.contains(one.getCheckStatusCode())).map(Negative::getId).toList();
+            CompletableFuture.allOf(
+                    CompletableFutureUtil.runSyncObject(() -> {
+                        long personNumber = negativeIds.isEmpty() ? 0 : negativeBlameService.count(new LambdaQueryWrapper<NegativeBlame>().in(NegativeBlame::getNegativeId, negativeIds)
+                                .eq(NegativeBlame::getType, "personal")
+                                .isNotNull(NegativeBlame::getBlameName)
+                                .ne(NegativeBlame::getBlameName, "")
+                                .ne(NegativeBlame::getHandleResultName, "不予追责")
+                                .isNotNull(NegativeBlame::getHandleResultName)
+                                .ne(NegativeBlame::getHandleResultName, ""));
+                        superviseMapIconVo.setPersonNum(String.valueOf(personNumber));
+                    }),
+                    CompletableFutureUtil.runSyncObject(() -> {
+                        long departNumber = negativeIds.isEmpty() ? 0 : negativeBlameService.count(new LambdaQueryWrapper<NegativeBlame>().in(NegativeBlame::getNegativeId, negativeIds)
+                                .eq(NegativeBlame::getType, "department")
+                                .ne(NegativeBlame::getHandleResultName, "不予追责")
+                                .isNotNull(NegativeBlame::getHandleResultName)
+                                .ne(NegativeBlame::getHandleResultName, ""));
+                        superviseMapIconVo.setRelationOrg(String.valueOf(departNumber));
+                    })
+            ).join();
+            superviseMapIconVo.setDepartId(fxsj.getId());
+            superviseMapIconVo.setName(fxsj.getShortName());
+            superviseMapIconVo.setTotalPro(negatives.size());
+            superviseMapIconVo.setProcessingNumber(processingList.size());
+            superviseMapIconVo.setCompletedNumber(completedList.size());
+            superviseTempMapVoList.add(superviseMapIconVo);
+        }
+        JSONObject data = new JSONObject().fluentPut("superviseTempMapVoList", superviseTempMapVoList);
+        return Result.success(data);
+    }
+
     public Result<JSONObject> getSubOneMailMapIcon() {
 
         // ✅ 注意：这里的 name 必须和地图 geojson 区域名一致（一般是“xx街道/园区”）

src/main/resources/mapper/SupTaskProblemMapper.xml

@@ -122,4 +122,21 @@
     </select>
 
 
+    <!-- 根据部门ID、时间范围和问题来源编码查询问题列表 -->
+    <select id="getNegativeListData" resultType="com.biutag.supervision.pojo.entity.Negative">
+            select ng.*
+            from negative ng
+            LEFT JOIN sup_depart sd on ng.involveDepartId = sd.id
+            LEFT JOIN sup_depart sdd on sd.pid = sdd.id
+            LEFT JOIN sup_depart sddd on sdd.pid = sddd.id
+            where ng.problemSourcesCode in
+            <foreach collection='codes' item='code' open='(' separator=',' close=')'>
+                #{code}
+            </foreach>
+            and ng.crtTime >= #{beginTime}
+            and ng.crtTime &lt;= #{endTime}
+            AND (sd.id = #{id} OR sdd.id = #{id} OR sddd.id = #{id})
+    </select>
+
+
 </mapper>