From 035a20f77f4c2498e10485c6560510bb6ae61409 Mon Sep 17 00:00:00 2001 From: zhangyue <82248909@qq.com> Date: Thu, 30 Jul 2026 11:58:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E9=87=8F=E8=AE=A1=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=8A=A0=E5=85=A5=E5=90=84=E7=B1=BB=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SurvHisdataFlowmeterController.java | 10 ++++++++++ .../SurvHisdataLivestockwaterController.java | 7 +++++++ .../SurvHisdataOrientwaterController.java | 8 ++++++++ .../SurvTransdataFlowmeterController.java | 9 +++++++++ .../SurvTransdataLivestockwaterController.java | 13 +++++++++++++ .../SurvTransdataOrientwaterController.java | 10 ++++++++++ .../jeecg/common/entity/SurvHisdataFlowmeter.java | 4 ++++ .../common/entity/SurvHisdataLivestockwater.java | 3 +++ .../jeecg/common/entity/SurvHisdataOrientwater.java | 3 +++ .../jeecg/common/entity/SurvTransdataFlowmeter.java | 4 ++++ .../common/entity/SurvTransdataLivestockwater.java | 3 +++ .../common/entity/SurvTransdataOrientwater.java | 3 +++ 12 files changed, 77 insertions(+) diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvHisdataFlowmeterController.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvHisdataFlowmeterController.java index ec4968a..149dfd0 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvHisdataFlowmeterController.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvHisdataFlowmeterController.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; @@ -19,6 +20,8 @@ import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.Arrays; /** @@ -53,6 +56,13 @@ public class SurvHisdataFlowmeterController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(survHisdataFlowmeter, req.getParameterMap()); Page page = new Page(pageNo, pageSize); + + if(StringUtils.isNotBlank(survHisdataFlowmeter.getStartTime())) { + LocalDateTime startTime = LocalDateTime.parse(survHisdataFlowmeter.getStartTime()+" 00:00:00", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); + LocalDateTime endTime = startTime.withHour(23).withMinute(59).withSecond(59).withNano(999999000); + queryWrapper.between("DATA_DATE_TIME", startTime,endTime); + } + IPage pageList = survHisdataFlowmeterService.page(page, queryWrapper); return Result.OK(pageList); } diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvHisdataLivestockwaterController.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvHisdataLivestockwaterController.java index 42a5e65..971e834 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvHisdataLivestockwaterController.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvHisdataLivestockwaterController.java @@ -23,6 +23,8 @@ import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -70,6 +72,11 @@ public class SurvHisdataLivestockwaterController extends JeecgController pageList = survHisdataLivestockwaterService.pages(page, survHisdataLivestockwater,deviceList); IPage pageList = survHisdataLivestockwaterService.page(page, queryWrapper); diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvHisdataOrientwaterController.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvHisdataOrientwaterController.java index 951b372..476cb98 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvHisdataOrientwaterController.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvHisdataOrientwaterController.java @@ -22,6 +22,8 @@ import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -71,6 +73,12 @@ public class SurvHisdataOrientwaterController extends JeecgController pageList = survHisdataOrientwaterService.pages(page, survHisdataOrientwater,deviceList); IPage pageList = survHisdataOrientwaterService.page(page, queryWrapper); diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvTransdataFlowmeterController.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvTransdataFlowmeterController.java index e6da2ca..a8ceea0 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvTransdataFlowmeterController.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvTransdataFlowmeterController.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; @@ -19,6 +20,8 @@ import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.Arrays; /** @@ -53,6 +56,12 @@ public class SurvTransdataFlowmeterController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(survTransdataFlowmeter, req.getParameterMap()); Page page = new Page(pageNo, pageSize); + if(StringUtils.isNotBlank(survTransdataFlowmeter.getStartTime())) { + LocalDateTime startTime = LocalDateTime.parse(survTransdataFlowmeter.getStartTime()+" 00:00:00", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); + LocalDateTime endTime = startTime.withHour(23).withMinute(59).withSecond(59).withNano(999999000); + queryWrapper.between("DATA_DATE_TIME", startTime,endTime); + } + IPage pageList = survTransdataFlowmeterService.page(page, queryWrapper); return Result.OK(pageList); } diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvTransdataLivestockwaterController.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvTransdataLivestockwaterController.java index 8996294..2ed6ca5 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvTransdataLivestockwaterController.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvTransdataLivestockwaterController.java @@ -20,6 +20,10 @@ import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -69,6 +73,15 @@ public class SurvTransdataLivestockwaterController extends JeecgController pageList = survTransdataLivestockwaterService.pages(page, survTransdataLivestockwater,deviceList); return Result.OK(pageList); } diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvTransdataOrientwaterController.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvTransdataOrientwaterController.java index a929bd5..2841ee5 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvTransdataOrientwaterController.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvTransdataOrientwaterController.java @@ -21,6 +21,8 @@ import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -73,6 +75,14 @@ public class SurvTransdataOrientwaterController extends JeecgController pageList = survTransdataOrientwaterService.pages(page, survTransdataOrientwater,deviceList); return Result.OK(pageList); } diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataFlowmeter.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataFlowmeter.java index a424910..1f9512d 100644 --- a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataFlowmeter.java +++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataFlowmeter.java @@ -1,6 +1,7 @@ package org.jeecg.common.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; @@ -129,4 +130,7 @@ public class SurvHisdataFlowmeter implements Serializable { @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "转储时间") private LocalDateTime transDate; + + @TableField(exist = false) + private String startTime; } diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataLivestockwater.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataLivestockwater.java index 4a9f2ca..9e7e14c 100644 --- a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataLivestockwater.java +++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataLivestockwater.java @@ -213,5 +213,8 @@ public class SurvHisdataLivestockwater implements Serializable { @TableField("data_type") private String dataType; + @TableField(exist = false) + private String startTime; + } diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataOrientwater.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataOrientwater.java index 630b1ec..34159cf 100644 --- a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataOrientwater.java +++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataOrientwater.java @@ -212,4 +212,7 @@ public class SurvHisdataOrientwater implements Serializable { */ @TableField("data_type") private String dataType; + + @TableField(exist = false) + private String startTime; } diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvTransdataFlowmeter.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvTransdataFlowmeter.java index 1415ba3..f99a116 100644 --- a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvTransdataFlowmeter.java +++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvTransdataFlowmeter.java @@ -1,6 +1,7 @@ package org.jeecg.common.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; @@ -123,4 +124,7 @@ public class SurvTransdataFlowmeter implements Serializable { @Excel(name = "设备名称", width = 15) @ApiModelProperty(value = "设备名称") private String deviceName; + + @TableField(exist = false) + private String startTime; } diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvTransdataLivestockwater.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvTransdataLivestockwater.java index dca487c..4150f0d 100644 --- a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvTransdataLivestockwater.java +++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvTransdataLivestockwater.java @@ -208,4 +208,7 @@ public class SurvTransdataLivestockwater implements Serializable { @TableField("DATA_TYPE") private String dataType; + @TableField(exist = false) + private String startTime; + } diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvTransdataOrientwater.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvTransdataOrientwater.java index 4da8988..74f4eb0 100644 --- a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvTransdataOrientwater.java +++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvTransdataOrientwater.java @@ -209,4 +209,7 @@ public class SurvTransdataOrientwater implements Serializable { */ @TableField("data_type") private String dataType; + + @TableField(exist = false) + private String startTime; }