From bfd09db38798a1055821f21e2b84e6c1bb80bb68 Mon Sep 17 00:00:00 2001 From: hxh Date: Sun, 9 Mar 2025 16:37:55 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=85=BB=E6=8A=A4=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../df/controller/v2/DfYhV2Controller.java | 57 +++++++++++++++++++ .../kms/yxgh/df/dto/v2/DfProblemV2Dto.java | 2 +- .../kms/yxgh/df/dto/v2/DfYhDetailV2Dto.java | 52 +++++++++++++++++ .../com/kms/yxgh/df/dto/v2/DfYhListV2Dto.java | 54 ++++++++++++++++++ 4 files changed, 164 insertions(+), 1 deletion(-) create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/controller/v2/DfYhV2Controller.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfYhDetailV2Dto.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfYhListV2Dto.java diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/controller/v2/DfYhV2Controller.java b/shuili-system/src/main/java/com/kms/yxgh/df/controller/v2/DfYhV2Controller.java new file mode 100644 index 00000000..93ce6ea7 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/controller/v2/DfYhV2Controller.java @@ -0,0 +1,57 @@ +package com.kms.yxgh.df.controller.v2; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.kms.yxgh.base.Response; +import com.kms.yxgh.base.UpdateGroup; +import com.kms.yxgh.df.dto.v2.DfRecordDetailV2Dto; +import com.kms.yxgh.df.dto.v2.DfRecordSearchV2Dto; +import com.kms.yxgh.df.dto.v2.DfYhDetailV2Dto; +import com.kms.yxgh.df.dto.v2.DfYhListV2Dto; +import com.shuili.common.annotation.Log; +import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + + +@RestController +@AllArgsConstructor +@RequestMapping("/run/df/v2/yh") +@Api(tags = "堤防养护v2") +public class DfYhV2Controller { + + + @PostMapping("/list") + @ApiOperation("堤防养护列表v2") + public IPage list(@RequestBody SearchParam sp) { + return new Page<>(); + } + + + @ApiOperation("堤防养护详情v2") + @GetMapping(value = "/{id}") + public Response getInfo(@PathVariable("id") String id) { + return Response.ok(); + } + + @ApiOperation("堤防养护新增或修改v2") + @Log(title = "堤防养护新增或修改v2", businessType = BusinessType.UPDATE) + @PostMapping("/{commit}") + public Response edit(@Validated(UpdateGroup.class) + @RequestBody DfRecordDetailV2Dto dfYh, + @PathVariable("commit") Boolean commit) { + return Response.ok(); + } + + @ApiOperation("堤防养护删除v2") + @Log(title = "堤防养护删除v2", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public Response remove(@PathVariable("ids") String[] ids) { + return Response.ok(); + } + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfProblemV2Dto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfProblemV2Dto.java index 72ddbdd4..cc0b8644 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfProblemV2Dto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfProblemV2Dto.java @@ -11,7 +11,7 @@ import javax.validation.constraints.NotNull; import java.util.Date; @Data -@ApiModel("堤防巡视检查记录详情v2") +@ApiModel("堤防巡查问题v2") public class DfProblemV2Dto { @ApiModelProperty("问题Id") diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfYhDetailV2Dto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfYhDetailV2Dto.java new file mode 100644 index 00000000..b1a080eb --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfYhDetailV2Dto.java @@ -0,0 +1,52 @@ +package com.kms.yxgh.df.dto.v2; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.AddGroup; +import com.kms.yxgh.base.UpdateGroup; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.util.Date; +import java.util.List; + +@Data +@ApiModel("堤防巡视检查记录详情v2") +public class DfYhDetailV2Dto { + + @NotBlank(message = "巡查养护记录ID不能为空", groups = {UpdateGroup.class}) + @ApiModelProperty("巡查维养记录") + private String id; + + @ApiModelProperty("问题id") + private String problemId; + + @ApiModelProperty("巡查记录id") + private String recordId; + + @NotBlank(message = "巡查项目ID不能为空", groups = {AddGroup.class, UpdateGroup.class}) + @ApiModelProperty("巡查项目ID") + private String checkingId; + + @NotNull(message = "开始时间", groups = {AddGroup.class, UpdateGroup.class}) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiModelProperty("开始时间") + private Date startDate; + + @NotNull(message = "结束时间", groups = {AddGroup.class, UpdateGroup.class}) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiModelProperty("结束时间") + private Date endDate; + + @ApiModelProperty("维养详情") + private String content; + + @ApiModelProperty("图片") + private List images; + + @ApiModelProperty("巡查责任人") + private String dutyHolder; + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfYhListV2Dto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfYhListV2Dto.java new file mode 100644 index 00000000..419e0a1a --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfYhListV2Dto.java @@ -0,0 +1,54 @@ +package com.kms.yxgh.df.dto.v2; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.AddGroup; +import com.kms.yxgh.base.UpdateGroup; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.Date; + +@Data +@ApiModel("堤防巡查养护列表v2") +public class DfYhListV2Dto { + + @ApiModelProperty("主键") + private String id; + + @ApiModelProperty("问题Id") + private String problemId; + + @ApiModelProperty("巡查项目ID") + private String checkingId; + + @ApiModelProperty("记录id") + private String recordId; + + @ApiModelProperty("巡查项目名称") + private String checkingName; + + @ApiModelProperty("状态") + private String status; + + @ApiModelProperty("巡查类型") + private String type; + + @ApiModelProperty("巡查类别") + private String category; + + @NotNull(message = "开始时间", groups = {AddGroup.class, UpdateGroup.class}) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiModelProperty("开始时间") + private Date startDate; + + @NotNull(message = "结束时间", groups = {AddGroup.class, UpdateGroup.class}) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiModelProperty("结束时间") + private Date endDate; + + @ApiModelProperty("巡查责任人") + private String dutyHolder; + +}