From ac132611a3b070d0fb24b1f60a21535b788de427 Mon Sep 17 00:00:00 2001 From: luotaiqian <1147642922@qq.com> Date: Fri, 14 Aug 2026 09:19:59 +0800 Subject: [PATCH] job --- .../EvalProjectOrgWaringController.java | 7 +++++++ .../service/EvalProjectOrgWaringServiceI.java | 8 +++++++ .../impl/EvalProjectOrgWaringServiceImpl.java | 8 +++++++ .../response/EvalProjectOrgWaringStatCo.java | 21 +++++++++++++++++++ .../mapper/EvalProjectOrgWaringMapper.java | 6 ++++++ .../mapper/EvalProjectOrgWaringMapper.xml | 11 ++++++++++ 6 files changed, 61 insertions(+) create mode 100644 safety-eval-client/src/main/java/org/qinan/safetyeval/client/waring/response/EvalProjectOrgWaringStatCo.java diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/institution/EvalProjectOrgWaringController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/institution/EvalProjectOrgWaringController.java index 78ea32a6..b2dada1c 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/institution/EvalProjectOrgWaringController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/institution/EvalProjectOrgWaringController.java @@ -12,6 +12,7 @@ import org.qinan.safetyeval.client.waring.request.EvalProjectOrgWaringListPageQr import org.qinan.safetyeval.client.waring.request.EvalProjectOrgWaringUpdateCmd; import org.qinan.safetyeval.client.waring.response.EvalProjectOrgWaringCo; import org.qinan.safetyeval.client.waring.response.EvalProjectOrgWaringListCo; +import org.qinan.safetyeval.client.waring.response.EvalProjectOrgWaringStatCo; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -53,6 +54,12 @@ public class EvalProjectOrgWaringController implements Serializable { return Response.buildSuccess(); } + @GetMapping("/org/stat") + @ApiOperation("机构端-险预警统计（总数、本周新增）") + public SingleResponse orgStat() { + return SingleResponse.of(evalProjectOrgWaringServiceI.statEvalProjectOrgWaring()); + } + @PostMapping("/handle") @ApiOperation("处理机构端-险预警") public Response handle(@Validated @RequestBody EvalProjectOrgWaringHandleCmd evalProjectOrgWaringHandleCmd) { diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/waring/service/EvalProjectOrgWaringServiceI.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/waring/service/EvalProjectOrgWaringServiceI.java index 29bcee22..c4e1524c 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/waring/service/EvalProjectOrgWaringServiceI.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/waring/service/EvalProjectOrgWaringServiceI.java @@ -4,6 +4,7 @@ import com.alibaba.cola.dto.PageResponse; import org.qinan.safetyeval.client.waring.request.*; import org.qinan.safetyeval.client.waring.response.EvalProjectOrgWaringCo; import org.qinan.safetyeval.client.waring.response.EvalProjectOrgWaringListCo; +import org.qinan.safetyeval.client.waring.response.EvalProjectOrgWaringStatCo; /** * 机构端-险预警 @@ -76,5 +77,12 @@ public interface EvalProjectOrgWaringServiceI { */ PageResponse listOrgWaringPage(EvalProjectOrgWaringListPageQry evalProjectOrgWaringListPageQry); + /** + * 机构端-险预警统计（总数、本周新增） + * + * @return 统计结果 + */ + EvalProjectOrgWaringStatCo statEvalProjectOrgWaring(); + } diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/waring/service/impl/EvalProjectOrgWaringServiceImpl.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/waring/service/impl/EvalProjectOrgWaringServiceImpl.java index 9aa99a16..b6dd0257 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/waring/service/impl/EvalProjectOrgWaringServiceImpl.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/waring/service/impl/EvalProjectOrgWaringServiceImpl.java @@ -18,6 +18,7 @@ import org.qinan.safetyeval.client.waring.request.EvalProjectOrgWaringPageQry; import org.qinan.safetyeval.client.waring.request.EvalProjectOrgWaringUpdateCmd; import org.qinan.safetyeval.client.waring.response.EvalProjectOrgWaringCo; import org.qinan.safetyeval.client.waring.response.EvalProjectOrgWaringListCo; +import org.qinan.safetyeval.client.waring.response.EvalProjectOrgWaringStatCo; import org.qinan.safetyeval.infrastructure.adapter.ThreadLocalUserInfoAdapter; import org.qinan.safetyeval.infrastructure.persistence.mapper.EvalProjectOrgWaringMapper; import org.springframework.stereotype.Service; @@ -82,4 +83,11 @@ public class EvalProjectOrgWaringServiceImpl implements EvalProjectOrgWaringServ return PageHelper.pageToResponse(result, result.getRecords()); } + @Override + public EvalProjectOrgWaringStatCo statEvalProjectOrgWaring() { + Long orgId = ThreadLocalUserInfoAdapter.getOrgId(); + EvalProjectOrgWaringStatCo co = evalProjectOrgWaringMapper.selectStat(orgId); + return co != null ? co : new EvalProjectOrgWaringStatCo(); + } + } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/waring/response/EvalProjectOrgWaringStatCo.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/waring/response/EvalProjectOrgWaringStatCo.java new file mode 100644 index 00000000..a6b3d1eb --- /dev/null +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/waring/response/EvalProjectOrgWaringStatCo.java @@ -0,0 +1,21 @@ +package org.qinan.safetyeval.client.waring.response; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * 机构端-险预警统计 + */ +@Data +public class EvalProjectOrgWaringStatCo implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("总数") + private Integer totalCount; + + @ApiModelProperty("本周新增数") + private Integer weekNewCount; +} diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/mapper/EvalProjectOrgWaringMapper.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/mapper/EvalProjectOrgWaringMapper.java index 8ad32ed5..6fbfeb60 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/mapper/EvalProjectOrgWaringMapper.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/mapper/EvalProjectOrgWaringMapper.java @@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.qinan.safetyeval.client.waring.request.EvalProjectOrgWaringListPageQry; import org.qinan.safetyeval.client.waring.response.EvalProjectOrgWaringListCo; +import org.qinan.safetyeval.client.waring.response.EvalProjectOrgWaringStatCo; import org.qinan.safetyeval.infrastructure.persistence.domainobject.EvalProjectOrgWaringDO; /** @@ -22,4 +23,9 @@ public interface EvalProjectOrgWaringMapper extends BaseMapper selectOrgWaringPage(IPage page, @Param("query") EvalProjectOrgWaringListPageQry query); + + /** + * 机构端-险预警统计（总数、本周新增），一条SQL完成 + */ + EvalProjectOrgWaringStatCo selectStat(@Param("orgId") Long orgId); } diff --git a/safety-eval-infrastructure/src/main/resources/mapper/EvalProjectOrgWaringMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/EvalProjectOrgWaringMapper.xml index a5c20a6d..0ab45747 100644 --- a/safety-eval-infrastructure/src/main/resources/mapper/EvalProjectOrgWaringMapper.xml +++ b/safety-eval-infrastructure/src/main/resources/mapper/EvalProjectOrgWaringMapper.xml @@ -60,4 +60,15 @@ ORDER BY epow.id DESC + + + \ No newline at end of file