From 87b4645da0ecd94059035a2fe9e9bcb3ddc15d2e Mon Sep 17 00:00:00 2001 From: lld <15027638633@163.com> Date: Sun, 28 Dec 2025 21:41:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B8=A9=E5=BA=A6=E6=9F=A5?= =?UTF-8?q?=E6=9C=80=E5=90=8E=E4=B8=80=E6=9D=A1=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/agri/common/utils/sql/SqlUtil.java | 2 +- .../controller/SysDtuDataController.java | 11 ++++++++++ .../com/agri/system/domain/SysDtuData.java | 2 +- .../agri/system/mapper/SysDtuDataMapper.java | 2 ++ .../system/service/ISysDtuDataService.java | 7 +++++++ .../service/impl/SysDtuDataServiceImpl.java | 7 +++++++ .../mapper/system/SysDtuDataMapper.xml | 20 +++++++++++++++++++ 7 files changed, 49 insertions(+), 2 deletions(-) diff --git a/agri-common/src/main/java/com/agri/common/utils/sql/SqlUtil.java b/agri-common/src/main/java/com/agri/common/utils/sql/SqlUtil.java index 80718c0..ea50935 100644 --- a/agri-common/src/main/java/com/agri/common/utils/sql/SqlUtil.java +++ b/agri-common/src/main/java/com/agri/common/utils/sql/SqlUtil.java @@ -13,7 +13,7 @@ public class SqlUtil /** * 定义常用的 sql关键字 */ - public static String SQL_REGEX = "\u000B|and |extractvalue|updatexml|sleep|information_schema|exec |insert |select |delete |update |drop |count |chr |mid |master |truncate |char |declare |or |union |like |+|/*|user()"; + public static String SQL_REGEX = "\u000B|and |extractvalue|updatexml|sleep|information_schema|exec |insert |select |delete |drop |count |chr |mid |master |truncate |char |declare |or |union |like |+|/*|user()"; /** * 仅支持字母、数字、下划线、空格、逗号、小数点（支持多个字段排序） diff --git a/agri-system/src/main/java/com/agri/system/controller/SysDtuDataController.java b/agri-system/src/main/java/com/agri/system/controller/SysDtuDataController.java index 13fbd91..6746c2c 100644 --- a/agri-system/src/main/java/com/agri/system/controller/SysDtuDataController.java +++ b/agri-system/src/main/java/com/agri/system/controller/SysDtuDataController.java @@ -46,6 +46,17 @@ public class SysDtuDataController extends BaseController return getDataTable(list); } + /** + * 查询DTU温湿度上报数据列表 + */ + @GetMapping("/findDtuDataByInfo") + public AjaxResult findDtuDataByInfo(SysDtuData sysDtuData) + { + SysDtuData dtuData = sysDtuDataService.findDtuDataByInfo(sysDtuData); + return AjaxResult.success(dtuData); + } + + /** * 导出DTU温湿度上报数据列表 */ diff --git a/agri-system/src/main/java/com/agri/system/domain/SysDtuData.java b/agri-system/src/main/java/com/agri/system/domain/SysDtuData.java index 8d3dd79..053a084 100644 --- a/agri-system/src/main/java/com/agri/system/domain/SysDtuData.java +++ b/agri-system/src/main/java/com/agri/system/domain/SysDtuData.java @@ -30,7 +30,7 @@ public class SysDtuData extends BaseEntity private Long ts; /** ts转换后的正常时间(由服务端转换入库) */ - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "ts转换后的正常时间(由服务端转换入库)", width = 30, dateFormat = "yyyy-MM-dd") private Date time; diff --git a/agri-system/src/main/java/com/agri/system/mapper/SysDtuDataMapper.java b/agri-system/src/main/java/com/agri/system/mapper/SysDtuDataMapper.java index 4d8afd3..752d31b 100644 --- a/agri-system/src/main/java/com/agri/system/mapper/SysDtuDataMapper.java +++ b/agri-system/src/main/java/com/agri/system/mapper/SysDtuDataMapper.java @@ -27,6 +27,8 @@ public interface SysDtuDataMapper */ public List selectSysDtuDataList(SysDtuData sysDtuData); + SysDtuData findDtuDataByInfo(SysDtuData sysDtuData); + /** * 新增DTU温湿度上报数据 * diff --git a/agri-system/src/main/java/com/agri/system/service/ISysDtuDataService.java b/agri-system/src/main/java/com/agri/system/service/ISysDtuDataService.java index ca5992f..b8cbc8a 100644 --- a/agri-system/src/main/java/com/agri/system/service/ISysDtuDataService.java +++ b/agri-system/src/main/java/com/agri/system/service/ISysDtuDataService.java @@ -27,6 +27,13 @@ public interface ISysDtuDataService */ public List selectSysDtuDataList(SysDtuData sysDtuData); + /** + * 根据某个信息查询对应数据 + * @param sysDtuData + * @return + */ + SysDtuData findDtuDataByInfo(SysDtuData sysDtuData); + /** * 新增DTU温湿度上报数据 * diff --git a/agri-system/src/main/java/com/agri/system/service/impl/SysDtuDataServiceImpl.java b/agri-system/src/main/java/com/agri/system/service/impl/SysDtuDataServiceImpl.java index 7bd0d83..ea19c57 100644 --- a/agri-system/src/main/java/com/agri/system/service/impl/SysDtuDataServiceImpl.java +++ b/agri-system/src/main/java/com/agri/system/service/impl/SysDtuDataServiceImpl.java @@ -44,6 +44,13 @@ public class SysDtuDataServiceImpl implements ISysDtuDataService return sysDtuDataMapper.selectSysDtuDataList(sysDtuData); } + @Override + public SysDtuData findDtuDataByInfo(SysDtuData sysDtuData) + { + return sysDtuDataMapper.findDtuDataByInfo(sysDtuData); + } + + /** * 新增DTU温湿度上报数据 * diff --git a/agri-system/src/main/resources/mapper/system/SysDtuDataMapper.xml b/agri-system/src/main/resources/mapper/system/SysDtuDataMapper.xml index 5da14aa..078c51a 100644 --- a/agri-system/src/main/resources/mapper/system/SysDtuDataMapper.xml +++ b/agri-system/src/main/resources/mapper/system/SysDtuDataMapper.xml @@ -116,4 +116,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} + + + \ No newline at end of file