From d51c2cd28a1c5a0d7eecde555af8fd1060affbb0 Mon Sep 17 00:00:00 2001 From: guosongrui <17737810342@163.com> Date: Wed, 22 May 2024 16:08:25 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=8A=95=E8=AF=89=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../problem/SupervisionUserComplaintParam.java | 7 +++++-- .../vo/problem/SupervisionUserComplaint.java | 7 +++++-- .../SupervisionUserComplaintController.java | 6 ++---- .../SupervisionUserComplaintServiceImpl.java | 18 ++---------------- 4 files changed, 14 insertions(+), 24 deletions(-) diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/problem/SupervisionUserComplaintParam.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/problem/SupervisionUserComplaintParam.java index 79b1b2298..861e232c9 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/problem/SupervisionUserComplaintParam.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/problem/SupervisionUserComplaintParam.java @@ -41,8 +41,11 @@ public class SupervisionUserComplaintParam { private String status; - @ApiModelProperty(value = "监测点ID") - private String monitorId; + @ApiModelProperty(value = "监测点编号") + private String monitorNumber; + + @ApiModelProperty(value = "监测点名称") + private String monitorName; @ApiModelProperty(value = "是否发起警告单(1：是；2：否)") private String initiateWarningFlag; diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/problem/SupervisionUserComplaint.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/problem/SupervisionUserComplaint.java index c407b9143..e97420139 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/problem/SupervisionUserComplaint.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/problem/SupervisionUserComplaint.java @@ -46,8 +46,11 @@ public class SupervisionUserComplaint { @ApiModelProperty(value = "是否实现检测(1：是 2：否)") private String status; - @ApiModelProperty(value = "监测点ID") - private String monitorId; + @ApiModelProperty(value = "监测点编号") + private String monitorNumber; + + @ApiModelProperty(value = "监测点名称") + private String monitorName; @ApiModelProperty(value = "是否发起警告单(1：是；2：否)") private String initiateWarningFlag; diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/problem/SupervisionUserComplaintController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/problem/SupervisionUserComplaintController.java index 65a22221d..18fd4fa80 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/problem/SupervisionUserComplaintController.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/problem/SupervisionUserComplaintController.java @@ -7,9 +7,6 @@ import com.njcn.common.pojo.enums.common.LogEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; -import com.njcn.supervision.pojo.param.device.QuitRunningDeviceParam; -import com.njcn.supervision.pojo.param.problem.SupervisionUserComplaintParam; -import com.njcn.supervision.pojo.vo.device.QuitRunningDeviceVO; import com.njcn.supervision.pojo.vo.problem.SupervisionUserComplaint; import com.njcn.supervision.service.problem.impl.SupervisionUserComplaintServiceImpl; import com.njcn.web.controller.BaseController; @@ -18,7 +15,6 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -57,4 +53,6 @@ public class SupervisionUserComplaintController extends BaseController { + + } diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/problem/impl/SupervisionUserComplaintServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/problem/impl/SupervisionUserComplaintServiceImpl.java index 04310548b..5db7bee8a 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/problem/impl/SupervisionUserComplaintServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/problem/impl/SupervisionUserComplaintServiceImpl.java @@ -15,28 +15,14 @@ public class SupervisionUserComplaintServiceImpl extends ServiceImpl getSupervisionUserComplaint(SupervisionUserComplaint.SupervisionUserComplaintQueryParam supervisionUserComplaintQueryParam) { QueryWrapper supervisionUserComplaintQueryWrapper = new QueryWrapper<>(); - Page page = this.page(new Page<>(PageFactory.getPageNum(supervisionUserComplaintQueryParam), PageFactory.getPageSize(supervisionUserComplaintQueryParam)), supervisionUserComplaintQueryWrapper); - return page; + return this.page(new Page<>(PageFactory.getPageNum(supervisionUserComplaintQueryParam), PageFactory.getPageSize(supervisionUserComplaintQueryParam)), supervisionUserComplaintQueryWrapper); }