From 8f7f5201eae4f1ccb12659cfeb4b4e7d24eca121 Mon Sep 17 00:00:00 2001 From: zhaokai Date: Mon, 20 Jul 2026 14:10:13 +0800 Subject: [PATCH] =?UTF-8?q?feat(corp):=20=E4=B8=BA=E5=8F=AF=E8=A7=86?= =?UTF-8?q?=E5=8C=96=E5=A4=A7=E5=B1=8F=E4=BC=81=E4=B8=9A=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=B1=87=E6=80=BB=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=8F=82=E6=95=B0=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/info/web/CorpInfoController.java | 4 ++-- .../info/command/query/CorpInfoQueryExe.java | 5 +++-- .../info/service/CorpInfoServiceImpl.java | 4 ++-- .../basic/info/api/CorpInfoServiceI.java | 2 +- .../basic/info/dto/CorpUserStatisticQry.java | 8 ++++++++ .../basic/info/dto/CorpUserSummaryQry.java | 19 +++++++++++++++++++ .../persistence/mapper/CorpInfoMapper.java | 2 +- .../repository/CorpInfoRepository.java | 2 +- .../impl/CorpInfoRepositoryImpl.java | 4 ++-- .../main/resources/mapper/CorpInfoMapper.xml | 18 ++++++++++++++++++ 10 files changed, 57 insertions(+), 11 deletions(-) create mode 100644 web-client/src/main/java/com/zcloud/basic/info/dto/CorpUserSummaryQry.java diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/web/CorpInfoController.java b/web-adapter/src/main/java/com/zcloud/basic/info/web/CorpInfoController.java index e9fe3cee..76a003cc 100644 --- a/web-adapter/src/main/java/com/zcloud/basic/info/web/CorpInfoController.java +++ b/web-adapter/src/main/java/com/zcloud/basic/info/web/CorpInfoController.java @@ -165,8 +165,8 @@ public class CorpInfoController { @ApiOperation("可视化大屏-企业用户汇总") @PostMapping("/corpUserSummary") - public SingleResponse corpUserSummary() { - return SingleResponse.of(corpInfoService.corpUserSummary()); + public SingleResponse corpUserSummary(@Validated @RequestBody CorpUserSummaryQry qry) { + return SingleResponse.of(corpInfoService.corpUserSummary(qry)); } } diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/query/CorpInfoQueryExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/query/CorpInfoQueryExe.java index 07a30059..b6a433b1 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/query/CorpInfoQueryExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/query/CorpInfoQueryExe.java @@ -323,8 +323,9 @@ public class CorpInfoQueryExe { return PageResponse.of(list, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); } - public CorpUserSummaryCO corpUserSummary() { - CorpUserSummaryDO corpUserSummaryDO = corpInfoRepository.corpUserSummary(); + public CorpUserSummaryCO corpUserSummary(CorpUserSummaryQry qry) { + Map params = PageQueryHelper.toHashMap(qry); + CorpUserSummaryDO corpUserSummaryDO = corpInfoRepository.corpUserSummary(params); CorpUserSummaryCO corpUserSummaryCO = new CorpUserSummaryCO(); BeanUtils.copyProperties(corpUserSummaryDO, corpUserSummaryCO); return corpUserSummaryCO; diff --git a/web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoServiceImpl.java b/web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoServiceImpl.java index 04a3fb7e..b679dbaf 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoServiceImpl.java @@ -153,8 +153,8 @@ public class CorpInfoServiceImpl implements CorpInfoServiceI { } @Override - public CorpUserSummaryCO corpUserSummary() { - return corpInfoQueryExe.corpUserSummary(); + public CorpUserSummaryCO corpUserSummary(CorpUserSummaryQry qry) { + return corpInfoQueryExe.corpUserSummary(qry); } } diff --git a/web-client/src/main/java/com/zcloud/basic/info/api/CorpInfoServiceI.java b/web-client/src/main/java/com/zcloud/basic/info/api/CorpInfoServiceI.java index 6912c547..92f80921 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/api/CorpInfoServiceI.java +++ b/web-client/src/main/java/com/zcloud/basic/info/api/CorpInfoServiceI.java @@ -58,6 +58,6 @@ public interface CorpInfoServiceI { PageResponse corpUserStatisticPage(CorpUserStatisticQry qry); - CorpUserSummaryCO corpUserSummary(); + CorpUserSummaryCO corpUserSummary(CorpUserSummaryQry qry); } diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpUserStatisticQry.java b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpUserStatisticQry.java index ca248eec..986a6ba0 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpUserStatisticQry.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpUserStatisticQry.java @@ -1,6 +1,7 @@ package com.zcloud.basic.info.dto; import com.alibaba.cola.dto.PageQuery; +import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -20,4 +21,11 @@ public class CorpUserStatisticQry extends PageQuery { @ApiModelProperty(value = "企业类型1：监管 2：企业 3：相关方", name = "enterpriseType") private Integer enterpriseType; + + @JsonProperty("port_area") + @ApiModelProperty(value = "港区，1:秦皇岛港区,2:秦皇岛东,3:秦皇岛西", name = "port_area") + private Integer portArea; + + @ApiModelProperty(value = "企业id", name = "corpinfoId") + private Long corpinfoId; } diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpUserSummaryQry.java b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpUserSummaryQry.java new file mode 100644 index 00000000..7b27ff0a --- /dev/null +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpUserSummaryQry.java @@ -0,0 +1,19 @@ +package com.zcloud.basic.info.dto; + +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 可视化大屏企业用户汇总查询参数 + */ +@Data +public class CorpUserSummaryQry { + + @JsonProperty("port_area") + @ApiModelProperty(value = "港区，1:秦皇岛港区,2:秦皇岛东,3:秦皇岛西", name = "port_area") + private Integer portArea; + + @ApiModelProperty(value = "企业id", name = "corpinfoId") + private Long corpinfoId; +} diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/CorpInfoMapper.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/CorpInfoMapper.java index 2cb78589..3aefc3af 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/CorpInfoMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/CorpInfoMapper.java @@ -36,7 +36,7 @@ public interface CorpInfoMapper extends BaseMapper { IPage corpUserStatisticPage(IPage iPage, Map params); - CorpUserSummaryDO corpUserSummary(); + CorpUserSummaryDO corpUserSummary(Map params); } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/CorpInfoRepository.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/CorpInfoRepository.java index bade08e0..fde6f1d8 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/CorpInfoRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/CorpInfoRepository.java @@ -49,6 +49,6 @@ public interface CorpInfoRepository extends BaseRepository { PageResponse corpUserStatisticPage(Map parmas); - CorpUserSummaryDO corpUserSummary(); + CorpUserSummaryDO corpUserSummary(Map parmas); } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java index 05385d4e..8a994d5e 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java @@ -342,8 +342,8 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl params) { + return corpInfoMapper.corpUserSummary(params); } } diff --git a/web-infrastructure/src/main/resources/mapper/CorpInfoMapper.xml b/web-infrastructure/src/main/resources/mapper/CorpInfoMapper.xml index d098fc85..c4b5cff2 100644 --- a/web-infrastructure/src/main/resources/mapper/CorpInfoMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/CorpInfoMapper.xml @@ -99,6 +99,12 @@ AND c.corp_name like concat('%',#{params.likeCorpName},'%') + + AND c.port_area = #{params.portArea} + + + AND c.id = #{params.corpinfoId} + ORDER BY IFNULL(u.userCount, 0) DESC, IFNULL(d.departmentCount, 0) DESC, c.corp_order ASC, c.create_time DESC @@ -111,9 +117,21 @@ FROM user u INNER JOIN corp_info c ON c.id = u.corpinfo_id AND c.delete_enum = 'FALSE' WHERE u.delete_enum = 'FALSE' + + AND c.port_area = #{params.portArea} + + + AND c.id = #{params.corpinfoId} + ), 0) AS userCount FROM corp_info c WHERE c.delete_enum = 'FALSE' + + AND c.port_area = #{params.portArea} + + + AND c.id = #{params.corpinfoId} +