diff --git a/README.md b/README.md index 614b0c5..4c78c9a 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,12 @@ -海威演示测温能源管理系统 +一、海威演示测温、阵列、能源管理系统 - -新疆昆仑工程轮胎有限责任公司 +二、 新疆昆仑工程轮胎有限责任公司 炼胶工区高压配电室母排及车间电机测温系统 1、服务器登录用户名：Administrator 密码：haiwei@2024 2、采集服务地址端口：服务器IP地址:5656 -3、SqlServer数据库用户名：sa 密码：haiwei@2024 \ No newline at end of file +3、SqlServer数据库用户名：sa 密码：haiwei@2024 + +三、沈阳赛轮 +数据库 ip地址是192.168.100.60 +SqlServer数据库用户名：sa 密码：abc@123 +采集服务地址：192.168.100.60:6001 \ No newline at end of file diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TVibrationsensorDataController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TVibrationsensorDataController.java index cd1ba54..4e995f2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TVibrationsensorDataController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TVibrationsensorDataController.java @@ -115,4 +115,27 @@ public class TVibrationsensorDataController extends BaseController { public AjaxResult remove(String ids) { return toAjax(tVibrationsensorDataService.deleteTVibrationsensorDataByIds(ids)); } + + + /** + * 实时监控页面 + * @return + */ + @GetMapping("realTimeMonitorView") + public String realTimeMonitorView() { + return prefix + "/RealTimeMonitor"; + } + + /** + * 振动传感器实时监控 + * @param tVibrationsensorData + * @return + */ + @PostMapping("/realTimeMonitor") + @ResponseBody + public AjaxResult realTimeMonitor(TVibrationsensorData tVibrationsensorData) { + List tVibrationsensorData1 = tVibrationsensorDataService.selectRealTimeMonitor(tVibrationsensorData); + return AjaxResult.success(tVibrationsensorData1); + } + } diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 1cd83f0..76a40c9 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -7,9 +7,9 @@ spring: # 主库数据源 master: # 海威环境 - url: jdbc:sqlserver://175.27.215.92:1433;SelectMethod=cursor;DatabaseName=hw_iot_ems + url: jdbc:sqlserver://119.45.202.115:1433;SelectMethod=cursor;DatabaseName=hw_iot_ems username: sa - password: Hawei@123 + password: haiwei@123 # 新疆库尔勒测温环境 # url: jdbc:sqlserver://localhost:1433;SelectMethod=cursor;DatabaseName=hw_iot_ems # username: sa diff --git a/ruoyi-admin/src/main/resources/templates/system/TVibrationsensorData/RealTimeMonitor.html b/ruoyi-admin/src/main/resources/templates/system/TVibrationsensorData/RealTimeMonitor.html new file mode 100644 index 0000000..3ece4dd --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/TVibrationsensorData/RealTimeMonitor.html @@ -0,0 +1,226 @@ + + + + + + + + + + +
+
+
+
+ 测控点信息 +
+
+ + + + +
+
+
+
+
+
+
+ +
+
+
+
+
+ +
+ +
+
+
+ +
+ + + + + + + + + + + 导出 + +
+
+
+
+
+
+
+ + + + + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TVibrationsensorDataMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TVibrationsensorDataMapper.java index 6b47165..60aafba 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TVibrationsensorDataMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TVibrationsensorDataMapper.java @@ -58,4 +58,7 @@ public interface TVibrationsensorDataMapper { * @return 结果 */ public int deleteTVibrationsensorDataByIds(String[] objIds); + + List selectRealTimeMonitor(TVibrationsensorData tVibrationsensorData); + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ITVibrationsensorDataService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ITVibrationsensorDataService.java index 80fb262..1a1808c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ITVibrationsensorDataService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ITVibrationsensorDataService.java @@ -58,4 +58,12 @@ public interface ITVibrationsensorDataService * @return 结果 */ public int deleteTVibrationsensorDataById(Long objId); + + /** + * 振动传感器实时监控 + * @param tVibrationsensorData + * @return + */ + public List selectRealTimeMonitor(TVibrationsensorData tVibrationsensorData); + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TVibrationsensorDataServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TVibrationsensorDataServiceImpl.java index 37f31d4..36024a7 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TVibrationsensorDataServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TVibrationsensorDataServiceImpl.java @@ -85,4 +85,9 @@ public class TVibrationsensorDataServiceImpl implements ITVibrationsensorDataSer public int deleteTVibrationsensorDataById(Long objId) { return tVibrationsensorDataMapper.deleteTVibrationsensorDataById(objId); } + + @Override + public List selectRealTimeMonitor(TVibrationsensorData tVibrationsensorData) { + return tVibrationsensorDataMapper.selectRealTimeMonitor(tVibrationsensorData); + } } diff --git a/ruoyi-system/src/main/resources/mapper/system/TVibrationsensorDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TVibrationsensorDataMapper.xml index 2a2aca2..6020439 100644 --- a/ruoyi-system/src/main/resources/mapper/system/TVibrationsensorDataMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/TVibrationsensorDataMapper.xml @@ -105,4 +105,20 @@ + +