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 b2d07467..a72e5d16 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 @@ -8,6 +8,7 @@ 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.response.EvalProjectOrgWaringCo; @@ -57,6 +58,13 @@ public class EvalProjectOrgWaringController implements Serializable { return Response.buildSuccess(); } + @PostMapping("/handle") + @ApiOperation("处理机构端-险预警") + public Response handle(@Validated @RequestBody EvalProjectOrgWaringHandleCmd evalProjectOrgWaringHandleCmd) { + evalProjectOrgWaringServiceI.handleEvalProjectOrgWaring(evalProjectOrgWaringHandleCmd); + return Response.buildSuccess(); + } + @DeleteMapping("/{id}") @ApiOperation("删除机构端-险预警(单个)") public Response deletedById(@PathVariable("id") Long id) { diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/waring/convertor/EvalProjectOrgWaringCmdConvertor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/waring/convertor/EvalProjectOrgWaringCmdConvertor.java index 84bde0ad..a243878f 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/waring/convertor/EvalProjectOrgWaringCmdConvertor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/waring/convertor/EvalProjectOrgWaringCmdConvertor.java @@ -3,6 +3,7 @@ package org.qinan.safetyeval.app.waring.convertor; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.qinan.safetyeval.client.waring.request.EvalProjectOrgWaringAddCmd; +import org.qinan.safetyeval.client.waring.request.EvalProjectOrgWaringHandleCmd; import org.qinan.safetyeval.client.waring.request.EvalProjectOrgWaringUpdateCmd; import org.qinan.safetyeval.domain.waring.model.EvalProjectOrgWaringE; @@ -31,4 +32,13 @@ public interface EvalProjectOrgWaringCmdConvertor { */ @Mapping(target = "evalProjectOrgWaringGateway", ignore = true) EvalProjectOrgWaringE convertCmdToE(EvalProjectOrgWaringUpdateCmd evalProjectOrgWaringUpdateCmd); + + /** + * cmd_handle转领域模型 + * + * @param evalProjectOrgWaringHandleCmd + * @return + */ + @Mapping(target = "evalProjectOrgWaringGateway", ignore = true) + EvalProjectOrgWaringE convertCmdToE(EvalProjectOrgWaringHandleCmd evalProjectOrgWaringHandleCmd); } diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/waring/executor/command/EvalProjectOrgWaringUpdateCmdExe.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/waring/executor/command/EvalProjectOrgWaringUpdateCmdExe.java index 31105a4a..7ec4df59 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/waring/executor/command/EvalProjectOrgWaringUpdateCmdExe.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/waring/executor/command/EvalProjectOrgWaringUpdateCmdExe.java @@ -3,6 +3,7 @@ package org.qinan.safetyeval.app.waring.executor.command; import com.alibaba.cola.exception.BizException; import lombok.AllArgsConstructor; import org.qinan.safetyeval.app.waring.convertor.EvalProjectOrgWaringCmdConvertor; +import org.qinan.safetyeval.client.waring.request.EvalProjectOrgWaringHandleCmd; import org.qinan.safetyeval.client.waring.request.EvalProjectOrgWaringUpdateCmd; import org.qinan.safetyeval.domain.waring.ability.EvalProjectOrgWaringAbility; import org.qinan.safetyeval.domain.waring.model.EvalProjectOrgWaringE; @@ -38,4 +39,21 @@ public class EvalProjectOrgWaringUpdateCmdExe { } return true; } + + /** + * 处理机构端-险预警 + * + * @param evalProjectOrgWaringHandleCmd 处理机构端-险预警对象 + * @return + */ + @Transactional(rollbackFor = Exception.class) + public boolean execute(EvalProjectOrgWaringHandleCmd evalProjectOrgWaringHandleCmd) { + EvalProjectOrgWaringE evalProjectOrgWaringE = evalProjectOrgWaringCmdConvertor.convertCmdToE(evalProjectOrgWaringHandleCmd); + evalProjectOrgWaringE.setHandleStatus("done"); + Boolean updateRes = evalProjectOrgWaringE.update(); + if (!updateRes) { + throw new BizException("数据已被更新,请刷新重试"); + } + return true; + } } 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 0544fad3..c6ba2823 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 @@ -2,6 +2,7 @@ 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.response.EvalProjectOrgWaringCo; @@ -61,5 +62,13 @@ public interface EvalProjectOrgWaringServiceI { */ boolean deletedEvalProjectOrgWaringByIds(Long[] ids); + /** + * 处理机构端-险预警 + * + * @param evalProjectOrgWaringHandleCmd 处理机构端-险预警对象 + * @return 结果 + */ + boolean handleEvalProjectOrgWaring(EvalProjectOrgWaringHandleCmd evalProjectOrgWaringHandleCmd); + } 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 e12f14a8..b5fc59fd 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 @@ -9,6 +9,7 @@ import org.qinan.safetyeval.app.waring.executor.query.EvalProjectOrgWaringListQu import org.qinan.safetyeval.app.waring.executor.query.EvalProjectOrgWaringPageQueryExe; 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.response.EvalProjectOrgWaringCo; @@ -60,4 +61,9 @@ public class EvalProjectOrgWaringServiceImpl implements EvalProjectOrgWaringServ return evalProjectOrgWaringDelCommandExe.execute(ids); } + @Override + public boolean handleEvalProjectOrgWaring(EvalProjectOrgWaringHandleCmd evalProjectOrgWaringHandleCmd) { + return evalProjectOrgWaringUpdateCommandExe.execute(evalProjectOrgWaringHandleCmd); + } + } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/waring/request/EvalProjectOrgWaringHandleCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/waring/request/EvalProjectOrgWaringHandleCmd.java new file mode 100644 index 00000000..8fc56750 --- /dev/null +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/waring/request/EvalProjectOrgWaringHandleCmd.java @@ -0,0 +1,39 @@ +package org.qinan.safetyeval.client.waring.request; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; +import java.io.Serializable; + +/** + * 机构端-险预警处理Cmd + * + * @Author: ltq + * @Date: 2026-08-13 15:49:16 + */ +@Data +public class EvalProjectOrgWaringHandleCmd implements Serializable { + private static final long serialVersionUID = 1L; + + @JsonFormat(shape = JsonFormat.Shape.STRING) + @NotNull(message = "id不能为空") + @ApiModelProperty(value = "主键id", required = true) + private Long id; + + /** + * 证明材料 + */ + @ApiModelProperty(value = "证明材料") + @Size(max = 512, message = "证明材料长度不能超过512") + private String evidenceFileUrl; + + /** + * 备注处理说明 + */ + @ApiModelProperty(value = "备注处理说明") + @Size(max = 255, message = "备注处理说明长度不能超过255") + private String remarks; +} diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/waring/response/EvalProjectOrgWaringCo.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/waring/response/EvalProjectOrgWaringCo.java index ef66dac7..b6be7a22 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/waring/response/EvalProjectOrgWaringCo.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/waring/response/EvalProjectOrgWaringCo.java @@ -41,6 +41,11 @@ public class EvalProjectOrgWaringCo extends ClientObject { */ @ApiModelProperty(value = "证明材料") private String evidenceFileUrl; + /** + * 备注处理说明 + */ + @ApiModelProperty(value = "备注处理说明") + private String remarks; /** * 环境 */ diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/waring/model/EvalProjectOrgWaringE.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/waring/model/EvalProjectOrgWaringE.java index 36b76dd4..6f9ba789 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/waring/model/EvalProjectOrgWaringE.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/waring/model/EvalProjectOrgWaringE.java @@ -40,6 +40,10 @@ public class EvalProjectOrgWaringE extends BaseE { * 证明材料 */ private String evidenceFileUrl; + /** + * 备注处理说明 + */ + private String remarks; /** * 环境 */ diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/EvalProjectOrgWaringDO.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/EvalProjectOrgWaringDO.java index b09eb8c6..7868d378 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/EvalProjectOrgWaringDO.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/EvalProjectOrgWaringDO.java @@ -37,6 +37,10 @@ public class EvalProjectOrgWaringDO extends BaseDO { * 证明材料 */ private String evidenceFileUrl; + /** + * 备注处理说明 + */ + private String remarks; /** * 环境 */