dev-tmp1
luotaiqian 2026-08-13 16:28:51 +08:00
parent 899e59de0e
commit c7be019024
9 changed files with 103 additions and 0 deletions

View File

@ -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) {

View File

@ -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);
}

View File

@ -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;
}
}

View File

@ -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);
}

View File

@ -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);
}
}

View File

@ -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;
}

View File

@ -41,6 +41,11 @@ public class EvalProjectOrgWaringCo extends ClientObject {
*/
@ApiModelProperty(value = "证明材料")
private String evidenceFileUrl;
/**
*
*/
@ApiModelProperty(value = "备注处理说明")
private String remarks;
/**
*
*/

View File

@ -40,6 +40,10 @@ public class EvalProjectOrgWaringE extends BaseE {
*
*/
private String evidenceFileUrl;
/**
*
*/
private String remarks;
/**
*
*/

View File

@ -37,6 +37,10 @@ public class EvalProjectOrgWaringDO extends BaseDO {
*
*/
private String evidenceFileUrl;
/**
*
*/
private String remarks;
/**
*
*/