From 8a46bc44542146b81a8e2f18883e03367bfc263c Mon Sep 17 00:00:00 2001 From: zy <82248909@qq.com> Date: Sat, 22 Nov 2025 16:19:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=A7=E5=B1=8F=E8=BF=90?= =?UTF-8?q?=E7=BB=B4=E5=88=86=E9=A1=B5=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BigScreenControllerP2.java | 25 ++++++++++++++++--- .../mapper/xml/SurvMaintainRecordMapper.xml | 6 +++++ .../mapper/xml/SurvDeviceDeployMapper.xml | 9 ++++--- .../common/entity/SurvMaintainRecord.java | 6 +++++ .../common/vo/params/StationMaintainPage.java | 9 +++++++ 5 files changed, 47 insertions(+), 8 deletions(-) create mode 100644 zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/vo/params/StationMaintainPage.java diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenControllerP2.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenControllerP2.java index 342f4fe..79f1968 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenControllerP2.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenControllerP2.java @@ -1,7 +1,9 @@ package org.jeecg.modules.appmana.controller; import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -10,16 +12,16 @@ import org.apache.commons.lang3.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.constant.enums.PollutionEnum; import org.jeecg.common.entity.SurvDeviceDeploy; +import org.jeecg.common.entity.SurvMaintainRecord; +import org.jeecg.common.vo.params.StationMaintainPage; import org.jeecg.modules.appmana.service.ISurvDeviceDeployService; +import org.jeecg.modules.appmana.service.ISurvMaintainRecordService; import org.jeecg.modules.appmana.service.impl.CommonServiceImpl; import org.jeecg.common.vo.VOBigScreenSurvQ; import org.jeecg.common.vo.VOHisFormResult; import org.jeecg.common.vo.VOHisResult; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.time.LocalDate; import java.time.LocalDateTime; @@ -38,6 +40,8 @@ public class BigScreenControllerP2 { private ISurvDeviceDeployService survDeviceDeployService; @Autowired private CommonServiceImpl commonService; + @Autowired + private ISurvMaintainRecordService maintainRecordService; @ApiOperationSupport(order = 1) @ApiOperation(value = "01. 查询设备下各检测项的历史数据", notes = "") @@ -78,4 +82,17 @@ public class BigScreenControllerP2 { return Result.OK(voHisResult); } + + @ApiOperationSupport(order = 2) + @ApiOperation(value = "02. 站点运维分页", notes = "") + @GetMapping(value = "/stationMaintainPage") + public Result> stationMaintainPage(StationMaintainPage stationMaintainPage) { + Page page = new Page(); + SurvMaintainRecord survMaintainRecord = new SurvMaintainRecord(); + survMaintainRecord.setBeginDate(stationMaintainPage.getStartTime()); + survMaintainRecord.setEndDate(stationMaintainPage.getEndTime()); + IPage records = maintainRecordService.pages(page,survMaintainRecord); + return Result.OK(records); + } + } diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvMaintainRecordMapper.xml b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvMaintainRecordMapper.xml index 0f15c54..962ff6e 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvMaintainRecordMapper.xml +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvMaintainRecordMapper.xml @@ -43,5 +43,11 @@ and DATE_FORMAT(MAINTAIN_TIME, '%Y-%m-%d') = DATE_FORMAT(#{param2.maintainTime},'%Y-%m-%d') + + and MAINTAIN_TIME >= CONCAT(#{query.beginDate}, ' 00:00:00') + + + and MAINTAIN_TIME <= CONCAT(#{query.endDate}, ' 23:59:59') + \ No newline at end of file diff --git a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvDeviceDeployMapper.xml b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvDeviceDeployMapper.xml index 8557b71..b6b5cbe 100644 --- a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvDeviceDeployMapper.xml +++ b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvDeviceDeployMapper.xml @@ -71,11 +71,11 @@ select from surv_device_deploy + AND IS_DEL = 0 and DEPLOY_TYPE IN diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvMaintainRecord.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvMaintainRecord.java index e8e91b1..c8b4c65 100644 --- a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvMaintainRecord.java +++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvMaintainRecord.java @@ -104,4 +104,10 @@ public class SurvMaintainRecord implements Serializable { @TableField(exist = false) private String omName; + + @TableField(exist = false) + private String beginDate; + + @TableField(exist = false) + private String endDate; } diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/vo/params/StationMaintainPage.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/vo/params/StationMaintainPage.java new file mode 100644 index 0000000..14c364c --- /dev/null +++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/vo/params/StationMaintainPage.java @@ -0,0 +1,9 @@ +package org.jeecg.common.vo.params; + +import lombok.Data; + +@Data +public class StationMaintainPage { + private String startTime; + private String endTime; +}