From 4e8d106e6c5de38eafd209cb41bf866dfe239f9f Mon Sep 17 00:00:00 2001 From: zhaokai Date: Thu, 23 Jul 2026 13:32:25 +0800 Subject: [PATCH] =?UTF-8?q?refactor(firebrigade):=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E9=98=9F=E5=91=98=E5=A4=A7=E5=B1=8F=E5=88=97=E8=A1=A8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=AD=97=E6=AE=B5=E6=98=A0=E5=B0=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/FireBrigadeMemberController.java | 2 +- .../service/FireBrigadeMemberServiceImpl.java | 7 +++---- .../dto/FireBrigadeScreenMemberQry.java | 2 +- .../FireBrigadeScreenMemberCO.java | 8 ++------ .../FireBrigadeScreenMemberRow.java | 3 +-- .../mapper/FireBrigadeUserMapper.java | 2 +- .../repository/FireBrigadeUserRepository.java | 2 +- .../impl/FireBrigadeUserRepositoryImpl.java | 4 ++-- .../mapper/FireBrigadeUserMapper.xml | 20 +++++++++---------- 9 files changed, 22 insertions(+), 28 deletions(-) diff --git a/web-adapter/src/main/java/com/zcloud/zcGbsServicer/web/FireBrigadeMemberController.java b/web-adapter/src/main/java/com/zcloud/zcGbsServicer/web/FireBrigadeMemberController.java index 9019906..5c63523 100644 --- a/web-adapter/src/main/java/com/zcloud/zcGbsServicer/web/FireBrigadeMemberController.java +++ b/web-adapter/src/main/java/com/zcloud/zcGbsServicer/web/FireBrigadeMemberController.java @@ -31,7 +31,7 @@ public class FireBrigadeMemberController { return fireBrigadeMemberService.currentMemberStatus(); } - @ApiOperation("大屏队员分页列表") + @ApiOperation("可视化大屏-大屏队员分页列表") @PostMapping("/screen/list") public PageResponse screenList(@RequestBody(required = false) FireBrigadeScreenMemberQry qry) { return fireBrigadeMemberService.listScreenMembers(qry == null ? new FireBrigadeScreenMemberQry() : qry); diff --git a/web-app/src/main/java/com/zcloud/zcGbsServicer/service/FireBrigadeMemberServiceImpl.java b/web-app/src/main/java/com/zcloud/zcGbsServicer/service/FireBrigadeMemberServiceImpl.java index aa481c2..41cb3c3 100644 --- a/web-app/src/main/java/com/zcloud/zcGbsServicer/service/FireBrigadeMemberServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/zcGbsServicer/service/FireBrigadeMemberServiceImpl.java @@ -68,14 +68,14 @@ public class FireBrigadeMemberServiceImpl extends FireAlarmServiceSupport implem @Override public PageResponse listScreenMembers(FireBrigadeScreenMemberQry qry) { FireBrigadeScreenMemberQry actualQry = qry == null ? new FireBrigadeScreenMemberQry() : qry; - String corpId = StrUtil.isBlank(actualQry.getCorpId()) ? null : actualQry.getCorpId().trim(); + Long corpinfoId = actualQry.getCorpinfoId(); Integer portArea = actualQry.getPortArea(); if (portArea != null && portArea != 1 && portArea != 2 && portArea != 3) { throw new BizException("港区参数无效"); } int pageIndex = actualQry.getPageIndex() <= 0 ? 1 : actualQry.getPageIndex(); int pageSize = actualQry.getPageSize() <= 0 ? 10 : actualQry.getPageSize(); - PageResponse page = fireBrigadeUserRepository.listScreenMembers(corpId, portArea, pageIndex, pageSize); + PageResponse page = fireBrigadeUserRepository.listScreenMembers(corpinfoId, portArea, pageIndex, pageSize); List data = page.getData() == null ? Collections.emptyList() : page.getData().stream() .map(this::toScreenMemberCO) .collect(Collectors.toList()); @@ -90,8 +90,7 @@ public class FireBrigadeMemberServiceImpl extends FireAlarmServiceSupport implem co.setUserId(row.getUserId()); co.setUserName(row.getUserName()); co.setAge(row.getAge()); - co.setCorpId(row.getCorpId()); - co.setOrgName(row.getOrgName()); + co.setBrigadeName(row.getBrigadeName()); co.setPhone(row.getPhone()); return co; } diff --git a/web-client/src/main/java/com/zcloud/zcGbsServicer/dto/FireBrigadeScreenMemberQry.java b/web-client/src/main/java/com/zcloud/zcGbsServicer/dto/FireBrigadeScreenMemberQry.java index 0c002de..e3aefe8 100644 --- a/web-client/src/main/java/com/zcloud/zcGbsServicer/dto/FireBrigadeScreenMemberQry.java +++ b/web-client/src/main/java/com/zcloud/zcGbsServicer/dto/FireBrigadeScreenMemberQry.java @@ -8,7 +8,7 @@ import lombok.Data; public class FireBrigadeScreenMemberQry extends PageQuery { @ApiModelProperty("机构ID，为空查全部") - private String corpId; + private Long corpinfoId; @ApiModelProperty("港区，1:港区 2:秦皇岛东 3:秦皇岛西，为空查全部") private Integer portArea; diff --git a/web-client/src/main/java/com/zcloud/zcGbsServicer/dto/clientobject/FireBrigadeScreenMemberCO.java b/web-client/src/main/java/com/zcloud/zcGbsServicer/dto/clientobject/FireBrigadeScreenMemberCO.java index 31bb592..76f5d62 100644 --- a/web-client/src/main/java/com/zcloud/zcGbsServicer/dto/clientobject/FireBrigadeScreenMemberCO.java +++ b/web-client/src/main/java/com/zcloud/zcGbsServicer/dto/clientobject/FireBrigadeScreenMemberCO.java @@ -7,19 +7,15 @@ import lombok.Data; @Data public class FireBrigadeScreenMemberCO extends ClientObject { - @JsonProperty("user_id") + private Long userId; - @JsonProperty("user_name") private String userName; private Integer age; - @JsonProperty("corp_id") - private String corpId; - @JsonProperty("org_name") - private String orgName; + private String brigadeName; private String phone; } diff --git a/web-infrastructure/src/main/java/com/zcloud/zcGbsServicer/persistence/dataobject/FireBrigadeScreenMemberRow.java b/web-infrastructure/src/main/java/com/zcloud/zcGbsServicer/persistence/dataobject/FireBrigadeScreenMemberRow.java index 4ca6cff..aa8ca89 100644 --- a/web-infrastructure/src/main/java/com/zcloud/zcGbsServicer/persistence/dataobject/FireBrigadeScreenMemberRow.java +++ b/web-infrastructure/src/main/java/com/zcloud/zcGbsServicer/persistence/dataobject/FireBrigadeScreenMemberRow.java @@ -8,7 +8,6 @@ public class FireBrigadeScreenMemberRow { private Long userId; private String userName; private Integer age; - private String corpId; - private String orgName; + private String brigadeName; private String phone; } diff --git a/web-infrastructure/src/main/java/com/zcloud/zcGbsServicer/persistence/mapper/FireBrigadeUserMapper.java b/web-infrastructure/src/main/java/com/zcloud/zcGbsServicer/persistence/mapper/FireBrigadeUserMapper.java index 7f3b134..00cd4d2 100644 --- a/web-infrastructure/src/main/java/com/zcloud/zcGbsServicer/persistence/mapper/FireBrigadeUserMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/zcGbsServicer/persistence/mapper/FireBrigadeUserMapper.java @@ -11,6 +11,6 @@ import org.apache.ibatis.annotations.Param; public interface FireBrigadeUserMapper extends BaseMapper { IPage listScreenMembers(IPage page, - @Param("corpId") String corpId, + @Param("corpinfoId") Long corpinfoId, @Param("portArea") Integer portArea); } diff --git a/web-infrastructure/src/main/java/com/zcloud/zcGbsServicer/persistence/repository/FireBrigadeUserRepository.java b/web-infrastructure/src/main/java/com/zcloud/zcGbsServicer/persistence/repository/FireBrigadeUserRepository.java index 10dee5f..0b7a7f3 100644 --- a/web-infrastructure/src/main/java/com/zcloud/zcGbsServicer/persistence/repository/FireBrigadeUserRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/zcGbsServicer/persistence/repository/FireBrigadeUserRepository.java @@ -25,5 +25,5 @@ public interface FireBrigadeUserRepository extends BaseRepository listScreenMembers(String corpId, Integer portArea, int pageIndex, int pageSize); + PageResponse listScreenMembers(Long corpinfoId, Integer portArea, int pageIndex, int pageSize); } diff --git a/web-infrastructure/src/main/java/com/zcloud/zcGbsServicer/persistence/repository/impl/FireBrigadeUserRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/zcGbsServicer/persistence/repository/impl/FireBrigadeUserRepositoryImpl.java index 2a78127..9bc6f72 100644 --- a/web-infrastructure/src/main/java/com/zcloud/zcGbsServicer/persistence/repository/impl/FireBrigadeUserRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/zcGbsServicer/persistence/repository/impl/FireBrigadeUserRepositoryImpl.java @@ -93,12 +93,12 @@ public class FireBrigadeUserRepositoryImpl extends BaseRepositoryImpl listScreenMembers(String corpId, Integer portArea, int pageIndex, int pageSize) { + public PageResponse listScreenMembers(Long corpinfoId, Integer portArea, int pageIndex, int pageSize) { Map params = new HashMap<>(); params.put("pageIndex", pageIndex <= 0 ? 1 : pageIndex); params.put("pageSize", pageSize <= 0 ? 10 : pageSize); IPage page = new Query().getPage(params); - IPage result = this.baseMapper.listScreenMembers(page, corpId, portArea); + IPage result = this.baseMapper.listScreenMembers(page, corpinfoId, portArea); return PageHelper.pageToResponse(result, result.getRecords()); } } diff --git a/web-infrastructure/src/main/resources/mapper/FireBrigadeUserMapper.xml b/web-infrastructure/src/main/resources/mapper/FireBrigadeUserMapper.xml index 80b14a6..88bd423 100644 --- a/web-infrastructure/src/main/resources/mapper/FireBrigadeUserMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/FireBrigadeUserMapper.xml @@ -7,20 +7,20 @@