From 1a30de09d3ade9c85b864ef49698d1a288b61443 Mon Sep 17 00:00:00 2001 From: luotaiqian <1147642922@qq.com> Date: Thu, 13 Aug 2026 16:44:27 +0800 Subject: [PATCH] waring --- .../EvalProjectOrgWaringController.java | 12 ++-- .../service/EvalProjectOrgWaringServiceI.java | 14 +++-- .../impl/EvalProjectOrgWaringServiceImpl.java | 16 ++++++ .../EvalProjectOrgWaringListPageQry.java | 27 +++++++++ .../response/EvalProjectOrgWaringListCo.java | 55 +++++++++++++++++++ .../mapper/EvalProjectOrgWaringMapper.java | 10 ++++ .../mapper/EvalProjectOrgWaringMapper.xml | 30 ++++++++++ 7 files changed, 156 insertions(+), 8 deletions(-) create mode 100644 safety-eval-client/src/main/java/org/qinan/safetyeval/client/waring/request/EvalProjectOrgWaringListPageQry.java create mode 100644 safety-eval-client/src/main/java/org/qinan/safetyeval/client/waring/response/EvalProjectOrgWaringListCo.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 a72e5d16..63b803b4 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 @@ -7,11 +7,9 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.qinan.safetyeval.app.waring.service.EvalProjectOrgWaringServiceI; -import org.qinan.safetyeval.client.waring.request.EvalProjectOrgWaringAddCmd; -import org.qinan.safetyeval.client.waring.request.EvalProjectOrgWaringHandleCmd; -import org.qinan.safetyeval.client.waring.request.EvalProjectOrgWaringPageQry; -import org.qinan.safetyeval.client.waring.request.EvalProjectOrgWaringUpdateCmd; +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.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -38,6 +36,12 @@ public class EvalProjectOrgWaringController implements Serializable { return evalProjectOrgWaringServiceI.listEvalProjectOrgWaringPage(qry); } + @GetMapping("/page") + @ApiOperation("查询机构端-险预警列表-分页（关联项目、客户）") + public PageResponse pageList(@Validated EvalProjectOrgWaringListPageQry qry) { + return evalProjectOrgWaringServiceI.listOrgWaringPage(qry); + } + @GetMapping("/{id}") @ApiOperation("查询机构端-险预警详情页面") public SingleResponse getInfo(@PathVariable("id") Long id) { 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 c6ba2823..29bcee22 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 @@ -1,11 +1,9 @@ package org.qinan.safetyeval.app.waring.service; import com.alibaba.cola.dto.PageResponse; -import org.qinan.safetyeval.client.waring.request.EvalProjectOrgWaringAddCmd; -import org.qinan.safetyeval.client.waring.request.EvalProjectOrgWaringHandleCmd; -import org.qinan.safetyeval.client.waring.request.EvalProjectOrgWaringPageQry; -import org.qinan.safetyeval.client.waring.request.EvalProjectOrgWaringUpdateCmd; +import org.qinan.safetyeval.client.waring.request.*; import org.qinan.safetyeval.client.waring.response.EvalProjectOrgWaringCo; +import org.qinan.safetyeval.client.waring.response.EvalProjectOrgWaringListCo; /** * 机构端-险预警 @@ -70,5 +68,13 @@ public interface EvalProjectOrgWaringServiceI { */ boolean handleEvalProjectOrgWaring(EvalProjectOrgWaringHandleCmd evalProjectOrgWaringHandleCmd); + /** + * 机构端-险预警分页查询（关联项目、客户） + * + * @param evalProjectOrgWaringListPageQry 查询条件 + * @return 结果集 + */ + PageResponse listOrgWaringPage(EvalProjectOrgWaringListPageQry evalProjectOrgWaringListPageQry); + } 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 b5fc59fd..d991cd0e 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 @@ -1,6 +1,9 @@ package org.qinan.safetyeval.app.waring.service.impl; import com.alibaba.cola.dto.PageResponse; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jjb.saas.framework.repository.common.PageHelper; import lombok.AllArgsConstructor; import org.qinan.safetyeval.app.waring.executor.command.EvalProjectOrgWaringAddCmdExe; import org.qinan.safetyeval.app.waring.executor.command.EvalProjectOrgWaringDelCmdExe; @@ -10,9 +13,13 @@ import org.qinan.safetyeval.app.waring.executor.query.EvalProjectOrgWaringPageQu import org.qinan.safetyeval.app.waring.service.EvalProjectOrgWaringServiceI; import org.qinan.safetyeval.client.waring.request.EvalProjectOrgWaringAddCmd; import org.qinan.safetyeval.client.waring.request.EvalProjectOrgWaringHandleCmd; +import org.qinan.safetyeval.client.waring.request.EvalProjectOrgWaringListPageQry; 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.infrastructure.adapter.ThreadLocalUserInfoAdapter; +import org.qinan.safetyeval.infrastructure.persistence.mapper.EvalProjectOrgWaringMapper; import org.springframework.stereotype.Service; /** @@ -30,6 +37,7 @@ public class EvalProjectOrgWaringServiceImpl implements EvalProjectOrgWaringServ private final EvalProjectOrgWaringAddCmdExe evalProjectOrgWaringAddCommandExe; private final EvalProjectOrgWaringDelCmdExe evalProjectOrgWaringDelCommandExe; private final EvalProjectOrgWaringPageQueryExe evalProjectOrgWaringPageQueryExe; + private final EvalProjectOrgWaringMapper evalProjectOrgWaringMapper; @Override public PageResponse listEvalProjectOrgWaringPage(EvalProjectOrgWaringPageQry evalProjectOrgWaringPageQry) { @@ -66,4 +74,12 @@ public class EvalProjectOrgWaringServiceImpl implements EvalProjectOrgWaringServ return evalProjectOrgWaringUpdateCommandExe.execute(evalProjectOrgWaringHandleCmd); } + @Override + public PageResponse listOrgWaringPage(EvalProjectOrgWaringListPageQry evalProjectOrgWaringListPageQry) { + evalProjectOrgWaringListPageQry.setOrgId(ThreadLocalUserInfoAdapter.getOrgId()); + Page page = new Page<>(evalProjectOrgWaringListPageQry.getCurrent(), evalProjectOrgWaringListPageQry.getSize()); + IPage result = evalProjectOrgWaringMapper.selectOrgWaringPage(page, evalProjectOrgWaringListPageQry); + return PageHelper.pageToResponse(result, result.getRecords()); + } + } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/waring/request/EvalProjectOrgWaringListPageQry.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/waring/request/EvalProjectOrgWaringListPageQry.java new file mode 100644 index 00000000..a4c05481 --- /dev/null +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/waring/request/EvalProjectOrgWaringListPageQry.java @@ -0,0 +1,27 @@ +package org.qinan.safetyeval.client.waring.request; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.qinan.safetyeval.client.dto.BasePageQuery; + +import java.io.Serializable; + +/** + * 机构端-险预警分页查询（关联项目、客户） + * + * @Author: ltq + * @Date: 2026-08-13 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class EvalProjectOrgWaringListPageQry extends BasePageQuery implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("预警类型") + private String warningType; + + @ApiModelProperty(hidden = true) + private Long orgId; +} diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/waring/response/EvalProjectOrgWaringListCo.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/waring/response/EvalProjectOrgWaringListCo.java new file mode 100644 index 00000000..b9b45b32 --- /dev/null +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/waring/response/EvalProjectOrgWaringListCo.java @@ -0,0 +1,55 @@ +package org.qinan.safetyeval.client.waring.response; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + * 机构端-险预警列表项（关联项目、客户） + * + * @Author: ltq + * @Date: 2026-08-13 + */ +@Data +public class EvalProjectOrgWaringListCo implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("预警id") + @JsonFormat(shape = JsonFormat.Shape.STRING) + private Long id; + + @ApiModelProperty("项目名称") + private String projectName; + + @ApiModelProperty("客户名称") + private String customerName; + + @ApiModelProperty("项目编号") + private String projectNo; + + @ApiModelProperty("预警类型") + private String warningType; + + @ApiModelProperty("触发条件") + private String triggerCondition; + + @ApiModelProperty("业务负责人") + private String projectLeaderName; + + @ApiModelProperty("创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private LocalDateTime createTime; + + @ApiModelProperty("处理状态") + private String handleStatus; + + @ApiModelProperty("证明材料") + private String evidenceFileUrl; + + @ApiModelProperty("备注处理说明") + private String remarks; +} 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 631f3519..8ad32ed5 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 @@ -1,7 +1,11 @@ package org.qinan.safetyeval.infrastructure.persistence.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; 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.infrastructure.persistence.domainobject.EvalProjectOrgWaringDO; /** @@ -12,4 +16,10 @@ import org.qinan.safetyeval.infrastructure.persistence.domainobject.EvalProjectO */ @Mapper public interface EvalProjectOrgWaringMapper extends BaseMapper { + + /** + * 机构端-险预警分页查询（关联 eval_project、eval_customer） + */ + IPage selectOrgWaringPage(IPage page, + @Param("query") EvalProjectOrgWaringListPageQry query); } diff --git a/safety-eval-infrastructure/src/main/resources/mapper/EvalProjectOrgWaringMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/EvalProjectOrgWaringMapper.xml index 7edd6d5e..a5c20a6d 100644 --- a/safety-eval-infrastructure/src/main/resources/mapper/EvalProjectOrgWaringMapper.xml +++ b/safety-eval-infrastructure/src/main/resources/mapper/EvalProjectOrgWaringMapper.xml @@ -30,4 +30,34 @@ remarks, create_name, update_name, tenant_id, version, create_time, update_time, create_id, update_id, env from eval_project_org_waring + + + \ No newline at end of file