From dd6ba355f9de8bb74a7cc3c312a74e5ef517cc55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=AF=E9=BE=99=20=E6=9B=B9?= <1805857645@QQ.com> Date: Thu, 29 Aug 2024 18:14:09 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=E4=BF=AE=E6=94=B9=E7=89=A9=E8=81=94?= =?UTF-8?q?=E7=BD=91=E6=B8=A9=E6=B9=BF=E5=BA=A6=E8=AE=BE=E5=A4=87=E5=AE=9E?= =?UTF-8?q?=E6=97=B6=E7=9B=91=E6=8E=A7=EF=BC=8C=E4=BA=94=E5=88=86=E9=92=9F?= =?UTF-8?q?=E8=8C=83=E5=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-druid.yml | 4 +- .../TWTempertureDataController.java | 46 ++++++++++++++++++- .../domain/EmsIOTInstantMonitorData.java | 28 +++++++++++ .../record/mapper/TWTempertureDataMapper.java | 7 +++ .../service/ITWTempertureDataService.java | 7 +++ .../impl/TWTempertureDataServiceImpl.java | 10 ++++ .../ems/record/TWTempertureDataMapper.xml | 8 ++++ 7 files changed, 107 insertions(+), 3 deletions(-) create mode 100644 os-ems/src/main/java/com/os/ems/record/domain/EmsIOTInstantMonitorData.java diff --git a/os-admin/src/main/resources/application-druid.yml b/os-admin/src/main/resources/application-druid.yml index 08ce39b..17a29de 100644 --- a/os-admin/src/main/resources/application-druid.yml +++ b/os-admin/src/main/resources/application-druid.yml @@ -6,9 +6,9 @@ spring: # 主库数据源 master: driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver - url: jdbc:sqlserver://175.27.215.92:1433;SelectMethod=cursor;DatabaseName=jdap_ems + url: jdbc:sqlserver://119.45.202.115:1433;SelectMethod=cursor;DatabaseName=jdap_ems username: sa - password: Hawei@123 + password: haiwei@123 # 从库数据源 slave: driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver diff --git a/os-ems/src/main/java/com/os/ems/record/controller/TWTempertureDataController.java b/os-ems/src/main/java/com/os/ems/record/controller/TWTempertureDataController.java index 5816cff..4d78e06 100644 --- a/os-ems/src/main/java/com/os/ems/record/controller/TWTempertureDataController.java +++ b/os-ems/src/main/java/com/os/ems/record/controller/TWTempertureDataController.java @@ -1,11 +1,15 @@ package com.os.ems.record.controller; -import java.util.List; +import java.text.SimpleDateFormat; +import java.util.*; import javax.servlet.http.HttpServletResponse; +import com.alibaba.fastjson2.JSONArray; +import com.os.common.utils.StringUtils; import com.os.ems.base.service.IEmsBaseEnergyTypeService; import com.os.ems.base.service.IEmsBaseMonitorInfoService; import com.os.ems.record.domain.EmsIOTData; +import com.os.ems.record.domain.EmsIOTInstantMonitorData; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -42,6 +46,8 @@ public class TWTempertureDataController extends BaseController @Autowired private IEmsBaseEnergyTypeService emsBaseEnergyTypeService; + private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + /** * 查询物联网实时数据列表 */ @@ -81,6 +87,44 @@ public class TWTempertureDataController extends BaseController return success(emsIOTData); } + /** + * 查询物联网设备实时监控数据 + * @param monitorCodeList + * @return + */ + @GetMapping("/iotInstantMonitoring") + public AjaxResult iotInstantMonitoring(String monitorCodeList){ + List list = new ArrayList(); + if(StringUtils.isNotEmpty(monitorCodeList)){ + String[] split = monitorCodeList.split(","); + for (String monitorId : split) { + + TWTempertureData tWTempertureData = new TWTempertureData(); + tWTempertureData.setMonitorId(monitorId); + Map params = new HashMap<>(); + + Calendar calendar = Calendar.getInstance(); + calendar.add(Calendar.MINUTE,-5); + Calendar startTime = (Calendar) calendar.clone(); + params.put("beginRecordTime",sdf.format(startTime.getTime())); + params.put("endRecordTime",sdf.format(new Date())); + tWTempertureData.setParams(params); + + List twTempertureData = tWTempertureDataService.selectIotInstantList(tWTempertureData); + if(twTempertureData.size()>0){ + Optional first = twTempertureData.stream().sorted(Comparator.comparing(TWTempertureData::getRecodeTime)).findFirst(); + + list.add(first.get()); + } + + + } + } + + System.out.println(JSONArray.toJSONString(list)); + return success(list); + } + /** * 导出物联网实时数据列表 */ diff --git a/os-ems/src/main/java/com/os/ems/record/domain/EmsIOTInstantMonitorData.java b/os-ems/src/main/java/com/os/ems/record/domain/EmsIOTInstantMonitorData.java new file mode 100644 index 0000000..7394ee3 --- /dev/null +++ b/os-ems/src/main/java/com/os/ems/record/domain/EmsIOTInstantMonitorData.java @@ -0,0 +1,28 @@ +package com.os.ems.record.domain; + +import java.util.List; + +public class EmsIOTInstantMonitorData { + private String monitorId; + private TWTempertureData data; + + public EmsIOTInstantMonitorData() { + + } + + public String getMonitorId() { + return monitorId; + } + + public void setMonitorId(String monitorId) { + this.monitorId = monitorId; + } + + public TWTempertureData getData() { + return data; + } + + public void setData(TWTempertureData data) { + this.data = data; + } +} diff --git a/os-ems/src/main/java/com/os/ems/record/mapper/TWTempertureDataMapper.java b/os-ems/src/main/java/com/os/ems/record/mapper/TWTempertureDataMapper.java index 1ca63e1..241ee83 100644 --- a/os-ems/src/main/java/com/os/ems/record/mapper/TWTempertureDataMapper.java +++ b/os-ems/src/main/java/com/os/ems/record/mapper/TWTempertureDataMapper.java @@ -65,4 +65,11 @@ public interface TWTempertureDataMapper * @return */ List selectIotInstantList(TWTempertureData tWTempertureData); + + /** + * 根据设备编号查询实时物联网设备监控数据 + * @param monitorId + * @return + */ + TWTempertureData selectIotInstantMinitoringData(String monitorId); } diff --git a/os-ems/src/main/java/com/os/ems/record/service/ITWTempertureDataService.java b/os-ems/src/main/java/com/os/ems/record/service/ITWTempertureDataService.java index 6ea431d..2ec9b04 100644 --- a/os-ems/src/main/java/com/os/ems/record/service/ITWTempertureDataService.java +++ b/os-ems/src/main/java/com/os/ems/record/service/ITWTempertureDataService.java @@ -65,4 +65,11 @@ public interface ITWTempertureDataService * @return */ List selectIotInstantList(TWTempertureData tWTempertureData); + + /** + * 根据设备编号查询实时物联网设备监控数据 + * @param monitorId + * @return + */ + TWTempertureData selectIotInstantMinitoringData(String monitorId); } diff --git a/os-ems/src/main/java/com/os/ems/record/service/impl/TWTempertureDataServiceImpl.java b/os-ems/src/main/java/com/os/ems/record/service/impl/TWTempertureDataServiceImpl.java index fde8b91..0790537 100644 --- a/os-ems/src/main/java/com/os/ems/record/service/impl/TWTempertureDataServiceImpl.java +++ b/os-ems/src/main/java/com/os/ems/record/service/impl/TWTempertureDataServiceImpl.java @@ -100,4 +100,14 @@ public class TWTempertureDataServiceImpl implements ITWTempertureDataService public List selectIotInstantList(TWTempertureData tWTempertureData) { return tWTempertureDataMapper.selectIotInstantList(tWTempertureData); } + + /** + * 根据设备编号查询实时物联网设备监控数据 + * @param monitorId + * @return + */ + @Override + public TWTempertureData selectIotInstantMinitoringData(String monitorId) { + return tWTempertureDataMapper.selectIotInstantMinitoringData(monitorId); + } } diff --git a/os-ems/src/main/resources/mapper/ems/record/TWTempertureDataMapper.xml b/os-ems/src/main/resources/mapper/ems/record/TWTempertureDataMapper.xml index 981573e..440e751 100644 --- a/os-ems/src/main/resources/mapper/ems/record/TWTempertureDataMapper.xml +++ b/os-ems/src/main/resources/mapper/ems/record/TWTempertureDataMapper.xml @@ -79,6 +79,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by twtd.collectTime + + insert into T_W_TempertureData