Administrator
/
FenXiNspJavaMain
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

流量计增加加入各类接口

This commit is contained in:
zhangyue 2026-07-30 11:58:29 +08:00
parent d8e7198307
commit 035a20f77f
12 changed files with 77 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvHisdataFlowmeterController.java
View File

@ -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<SurvHisdataF
HttpServletRequest req) {
QueryWrapper<SurvHisdataFlowmeter> queryWrapper = QueryGenerator.initQueryWrapper(survHisdataFlowmeter, req.getParameterMap());
Page<SurvHisdataFlowmeter> page = new Page<SurvHisdataFlowmeter>(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<SurvHisdataFlowmeter> pageList = survHisdataFlowmeterService.page(page, queryWrapper);
return Result.OK(pageList);
}

7
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvHisdataLivestockwaterController.java
View File

@ -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<SurvHis
return Result.OK(emptyPage);
}
}
if(StringUtils.isNotBlank(survHisdataLivestockwater.getStartTime())) {
LocalDateTime startTime = LocalDateTime.parse(survHisdataLivestockwater.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);
}
queryWrapper.lambda().in(deviceList!=null && !deviceList.isEmpty(), SurvHisdataLivestockwater::getDeployCode, deviceList);
// IPage<SurvHisdataLivestockwater> pageList = survHisdataLivestockwaterService.pages(page, survHisdataLivestockwater,deviceList);
IPage<SurvHisdataLivestockwater> pageList = survHisdataLivestockwaterService.page(page, queryWrapper);

8
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvHisdataOrientwaterController.java
View File

@ -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<SurvHisdat
return Result.OK(emptyPage);
}
}
if(StringUtils.isNotBlank(survHisdataOrientwater.getStartTime())) {
LocalDateTime startTime = LocalDateTime.parse(survHisdataOrientwater.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);
}
queryWrapper.lambda().in(deviceList!=null && !deviceList.isEmpty(), SurvHisdataOrientwater::getDeployCode, deviceList);
// IPage<SurvHisdataOrientwater> pageList = survHisdataOrientwaterService.pages(page, survHisdataOrientwater,deviceList);
IPage<SurvHisdataOrientwater> pageList = survHisdataOrientwaterService.page(page, queryWrapper);

9
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvTransdataFlowmeterController.java
View File

@ -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<SurvTransd
HttpServletRequest req) {
QueryWrapper<SurvTransdataFlowmeter> queryWrapper = QueryGenerator.initQueryWrapper(survTransdataFlowmeter, req.getParameterMap());
Page<SurvTransdataFlowmeter> page = new Page<SurvTransdataFlowmeter>(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<SurvTransdataFlowmeter> pageList = survTransdataFlowmeterService.page(page, queryWrapper);
return Result.OK(pageList);
}

13
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvTransdataLivestockwaterController.java
View File

@ -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<SurvT
return Result.OK(emptyPage);
}
}
if(StringUtils.isNotBlank(survTransdataLivestockwater.getStartTime())) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
try {
survTransdataLivestockwater.setDataDateTime(sdf.parse(survTransdataLivestockwater.getStartTime()));
} catch (ParseException e) {
throw new RuntimeException(e);
}
}
IPage<SurvTransdataLivestockwater> pageList = survTransdataLivestockwaterService.pages(page, survTransdataLivestockwater,deviceList);
return Result.OK(pageList);
}

10
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvTransdataOrientwaterController.java
View File

@ -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<SurvTran
return Result.OK(emptyPage);
}
}
if(StringUtils.isNotBlank(survTransdataOrientwater.getStartTime())) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
try {
survTransdataOrientwater.setDataDateTime(sdf.parse(survTransdataOrientwater.getStartTime()));
} catch (ParseException e) {
throw new RuntimeException(e);
}
}
IPage<SurvTransdataOrientwater> pageList = survTransdataOrientwaterService.pages(page, survTransdataOrientwater,deviceList);
return Result.OK(pageList);
}

4
zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataFlowmeter.java
View File

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

3
zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataLivestockwater.java
View File

@ -213,5 +213,8 @@ public class SurvHisdataLivestockwater implements Serializable {
@TableField("data_type")
private String dataType;
@TableField(exist = false)
private String startTime;
}

3
zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataOrientwater.java
View File

@ -212,4 +212,7 @@ public class SurvHisdataOrientwater implements Serializable {
*/
@TableField("data_type")
private String dataType;
@TableField(exist = false)
private String startTime;
}

4
zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvTransdataFlowmeter.java
View File

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

3
zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvTransdataLivestockwater.java
View File

@ -208,4 +208,7 @@ public class SurvTransdataLivestockwater implements Serializable {
@TableField("DATA_TYPE")
private String dataType;
@TableField(exist = false)
private String startTime;
}

3
zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvTransdataOrientwater.java
View File

@ -209,4 +209,7 @@ public class SurvTransdataOrientwater implements Serializable {
*/
@TableField("data_type")
private String dataType;
@TableField(exist = false)
private String startTime;
}