From 4bf82db05a80ea8caed536f4caeee7043e8338f1 Mon Sep 17 00:00:00 2001 From: shenzhidan Date: Mon, 27 Jul 2026 18:10:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BF=9C=E7=AB=AF=E5=90=88?= =?UTF-8?q?=E5=B9=B6=E5=90=8E=E7=9A=84=E6=95=B0=E6=8D=AE=E8=AE=BF=E9=97=AE?= =?UTF-8?q?=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 补齐告警记录查询的Repository、Mapper与XML链路，并修复BI查询合并后遗留的JdbcTemplate依赖。 --- .../command/query/AlarmRecordQueryExe.java | 1 + .../query/PersonnelPositioningBiQueryExe.java | 9 +++++--- .../persistence/mapper/AlarmRecordMapper.java | 5 +++++ .../repository/AlarmRecordRepository.java | 4 ++++ .../impl/AlarmRecordRepositoryImpl.java | 10 +++++++++ .../resources/mapper/AlarmRecordMapper.xml | 22 +++++++++++++++++++ 6 files changed, 48 insertions(+), 3 deletions(-) diff --git a/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/AlarmRecordQueryExe.java b/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/AlarmRecordQueryExe.java index 7ba9728..0eb2721 100644 --- a/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/AlarmRecordQueryExe.java +++ b/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/AlarmRecordQueryExe.java @@ -25,6 +25,7 @@ import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; import org.springframework.util.StringUtils; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.LinkedHashMap; diff --git a/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/PersonnelPositioningBiQueryExe.java b/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/PersonnelPositioningBiQueryExe.java index ac8e7e6..420e5ca 100644 --- a/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/PersonnelPositioningBiQueryExe.java +++ b/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/PersonnelPositioningBiQueryExe.java @@ -24,10 +24,14 @@ import com.zcloud.personnel.positioning.dto.clientobject.BiPersonTraceCO; import com.zcloud.personnel.positioning.dto.clientobject.BiPortStatCO; import com.zcloud.personnel.positioning.integration.finds.FindsOpenApiClient; import com.zcloud.personnel.positioning.persistence.dataobject.AreaDO; +import com.zcloud.personnel.positioning.persistence.dataobject.BiAreaSnapshotDO; +import com.zcloud.personnel.positioning.persistence.dataobject.BiCompanyAlarmCountDO; +import com.zcloud.personnel.positioning.persistence.dataobject.BiCorpInfoDO; import com.zcloud.personnel.positioning.persistence.dataobject.BiPersonPositionUserDO; import com.zcloud.personnel.positioning.persistence.dataobject.FenceDO; import com.zcloud.personnel.positioning.persistence.repository.AreaRepository; import com.zcloud.personnel.positioning.persistence.repository.FenceRepository; +import com.zcloud.personnel.positioning.persistence.repository.PersonnelPositioningBiRepository; import com.zcloud.personnel.positioning.persistence.repository.UserRepository; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; @@ -69,7 +73,7 @@ public class PersonnelPositioningBiQueryExe { private final FindsOpenApiClient findsOpenApiClient; private final ObjectMapper objectMapper; - private final JdbcTemplate jdbcTemplate; + private final PersonnelPositioningBiRepository biRepository; private final AreaRepository areaRepository; private final FenceRepository fenceRepository; private final UserRepository userRepository; @@ -1406,8 +1410,7 @@ public class PersonnelPositioningBiQueryExe { if (corpinfoId == null) { return null; } - return queryFirstCorpInfo(CORP_INFO_SELECT - + " AND CAST(id AS CHAR) = CAST(? AS CHAR) LIMIT 1", corpinfoId); + return mapCorpInfo(biRepository.findCorpById(corpinfoId)); } private CorpInfoView mapCorpInfo(BiCorpInfoDO row) { diff --git a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/mapper/AlarmRecordMapper.java b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/mapper/AlarmRecordMapper.java index 1178596..eab717b 100644 --- a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/mapper/AlarmRecordMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/mapper/AlarmRecordMapper.java @@ -8,6 +8,7 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** * web-infrastructure @@ -21,4 +22,8 @@ public interface AlarmRecordMapper extends BaseMapper { @Param("portArea") Integer portArea); List selectBiAlarmTypeList(@Param("corpinfoId") String corpinfoId); + + List listCompanyOptions(@Param("params") Map params); + + String findCorpinfoName(@Param("corpinfoId") String corpinfoId); } diff --git a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/repository/AlarmRecordRepository.java b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/repository/AlarmRecordRepository.java index f4c40fe..534979a 100644 --- a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/repository/AlarmRecordRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/repository/AlarmRecordRepository.java @@ -21,4 +21,8 @@ public interface AlarmRecordRepository extends BaseRepository { List listBiAlarm(String corpinfoId, Integer portArea); List listBiAlarmType(String corpinfoId); + + List listCompanyOptions(Map params); + + String findCorpinfoName(String corpinfoId); } diff --git a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/repository/impl/AlarmRecordRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/repository/impl/AlarmRecordRepositoryImpl.java index 40a1f24..fbaea2a 100644 --- a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/repository/impl/AlarmRecordRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/repository/impl/AlarmRecordRepositoryImpl.java @@ -48,4 +48,14 @@ public class AlarmRecordRepositoryImpl extends BaseRepositoryImpl listBiAlarmType(String corpinfoId) { return alarmRecordMapper.selectBiAlarmTypeList(corpinfoId); } + + @Override + public List listCompanyOptions(Map params) { + return alarmRecordMapper.listCompanyOptions(params); + } + + @Override + public String findCorpinfoName(String corpinfoId) { + return alarmRecordMapper.findCorpinfoName(corpinfoId); + } } diff --git a/web-infrastructure/src/main/resources/mapper/AlarmRecordMapper.xml b/web-infrastructure/src/main/resources/mapper/AlarmRecordMapper.xml index 722b22f..a1daa1f 100644 --- a/web-infrastructure/src/main/resources/mapper/AlarmRecordMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/AlarmRecordMapper.xml @@ -77,4 +77,26 @@ GROUP BY ar.alarm_code ORDER BY alarmCount DESC, ar.alarm_code ASC + + + +