From c18aed04a5d3f8eb3aae493e37e611ec4871d30b Mon Sep 17 00:00:00 2001
From: whyclxw <http://whyclxw@118.89.139.230:10101/r/~whyclxw/IdeaTest.git>
Date: 星期一, 30 八月 2021 15:22:21 +0800
Subject: [PATCH] 修改
---
src/com/dev/lubrication/Water_comm.java | 24 ++++++------
src/com/modbus/data/MyModbusUtils.java | 2
src/com/dev/lubrication/Ups_comm.java | 20 +++++-----
src/com/dev/lubrication/Oil_comm.java | 24 ++++++------
4 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/src/com/dev/lubrication/Oil_comm.java b/src/com/dev/lubrication/Oil_comm.java
index da3f28c..af9e181 100644
--- a/src/com/dev/lubrication/Oil_comm.java
+++ b/src/com/dev/lubrication/Oil_comm.java
@@ -79,18 +79,18 @@
oil_eleMachine1 = MyModbusUtils.CreateSwitchRanDom();// '油站电机1故障',
oil_eleMachine2 = MyModbusUtils.CreateSwitchRanDom();// '油站电机1故障',
- oil_returnTmp = MyModbusUtils.CreateFloatRanDom(0,65535);// '油站回油温度',
- oil_outFlow = MyModbusUtils.CreateFloatRanDom(0,65535);// '润滑油出口流量',
- oil_pre1 = MyModbusUtils.CreateFloatRanDom(0,65535);// '润滑油压力1',
- oil_pre2 = MyModbusUtils.CreateFloatRanDom(0,65535);// '润滑油压力2',
- oil_outpre1 = MyModbusUtils.CreateFloatRanDom(0,65535);// '油站出口1压力',
- oil_outpre2 = MyModbusUtils.CreateFloatRanDom(0,65535);// '油站出口2压力',
- oil_outpre3 = MyModbusUtils.CreateFloatRanDom(0,65535);// '油站出口3压力',
- oil_outpre4 = MyModbusUtils.CreateFloatRanDom(0,65535);// '油站出口4压力',
- oil_returnFlow = MyModbusUtils.CreateFloatRanDom(0,65535);// '润滑油回油流量',
- oil_coolpre = MyModbusUtils.CreateFloatRanDom(0,65535);// '油站冷却水压力',
- oil_coolTmp = MyModbusUtils.CreateFloatRanDom(0,65535);// '油站冷却水回水温度',
- oil_outTmp = MyModbusUtils.CreateFloatRanDom(0,65535);// '油站出油温度',
+ oil_returnTmp = MyModbusUtils.CreateFloatRanDom(0,1000);// '油站回油温度',
+ oil_outFlow = MyModbusUtils.CreateFloatRanDom(0,1000);// '润滑油出口流量',
+ oil_pre1 = MyModbusUtils.CreateFloatRanDom(0,1000);// '润滑油压力1',
+ oil_pre2 = MyModbusUtils.CreateFloatRanDom(0,1000);// '润滑油压力2',
+ oil_outpre1 = MyModbusUtils.CreateFloatRanDom(0,1000);// '油站出口1压力',
+ oil_outpre2 = MyModbusUtils.CreateFloatRanDom(0,1000);// '油站出口2压力',
+ oil_outpre3 = MyModbusUtils.CreateFloatRanDom(0,1000);// '油站出口3压力',
+ oil_outpre4 = MyModbusUtils.CreateFloatRanDom(0,1000);// '油站出口4压力',
+ oil_returnFlow = MyModbusUtils.CreateFloatRanDom(0,1000);// '润滑油回油流量',
+ oil_coolpre = MyModbusUtils.CreateFloatRanDom(0,1000);// '油站冷却水压力',
+ oil_coolTmp = MyModbusUtils.CreateFloatRanDom(0,1000);// '油站冷却水回水温度',
+ oil_outTmp = MyModbusUtils.CreateFloatRanDom(0,1000);// '油站出油温度',
}
diff --git a/src/com/dev/lubrication/Ups_comm.java b/src/com/dev/lubrication/Ups_comm.java
index ef9d2bb..38c9ca4 100644
--- a/src/com/dev/lubrication/Ups_comm.java
+++ b/src/com/dev/lubrication/Ups_comm.java
@@ -55,16 +55,16 @@
* 生成随机数
*/
public void randomData() {
- input_vol = MyModbusUtils.CreateFloatRanDom(0, 65535);// '水站回水温度',
- input_rate = MyModbusUtils.CreateFloatRanDom(0, 65535);;// '冷冻水出口流量',
- output_vol = MyModbusUtils.CreateFloatRanDom(0, 65535);;// '冷冻水压力1',
- output_rate = MyModbusUtils.CreateFloatRanDom(0, 65535);;// '冷冻水压力2',
- load_cap = MyModbusUtils.CreateFloatRanDom(0, 65535);;// '水站出口1压力',
- load_curr = MyModbusUtils.CreateFloatRanDom(0, 65535);;// '水站出口2压力',
- ups_inTmp = MyModbusUtils.CreateFloatRanDom(0, 65535);;// '水站出口3压力',
- batt_vol = MyModbusUtils.CreateFloatRanDom(0, 65535);;// '水站出口4压力',
- batt_cap = MyModbusUtils.CreateFloatRanDom(0, 65535);;// '冷冻水回水流量',
- rest_time = MyModbusUtils.CreateFloatRanDom(0, 65535);;// '水站冷却水压力',
+ input_vol = MyModbusUtils.CreateFloatRanDom(0, 1000);// '水站回水温度',
+ input_rate = MyModbusUtils.CreateFloatRanDom(0, 1000);;// '冷冻水出口流量',
+ output_vol = MyModbusUtils.CreateFloatRanDom(0, 1000);;// '冷冻水压力1',
+ output_rate = MyModbusUtils.CreateFloatRanDom(0, 1000);;// '冷冻水压力2',
+ load_cap = MyModbusUtils.CreateFloatRanDom(0, 1000);;// '水站出口1压力',
+ load_curr = MyModbusUtils.CreateFloatRanDom(0, 1000);;// '水站出口2压力',
+ ups_inTmp = MyModbusUtils.CreateFloatRanDom(0, 1000);;// '水站出口3压力',
+ batt_vol = MyModbusUtils.CreateFloatRanDom(0, 1000);;// '水站出口4压力',
+ batt_cap = MyModbusUtils.CreateFloatRanDom(0, 1000);;// '冷冻水回水流量',
+ rest_time = MyModbusUtils.CreateFloatRanDom(0, 1000);;// '水站冷却水压力',
}
diff --git a/src/com/dev/lubrication/Water_comm.java b/src/com/dev/lubrication/Water_comm.java
index 5a4d987..bf7557b 100644
--- a/src/com/dev/lubrication/Water_comm.java
+++ b/src/com/dev/lubrication/Water_comm.java
@@ -82,18 +82,18 @@
water_eleMachine2 = MyModbusUtils.CreateSwitchRanDom();// '水站电机2故障',
compressor_state = MyModbusUtils.CreateSwitchRanDom();//压缩机状态
- water_returnTmp = MyModbusUtils.CreateFloatRanDom(0, 65535);// '水站回水温度',
- water_outFlow = MyModbusUtils.CreateFloatRanDom(0, 65535);;// '冷冻水出口流量',
- water_pre1 = MyModbusUtils.CreateFloatRanDom(0, 65535);;// '冷冻水压力1',
- water_pre2 = MyModbusUtils.CreateFloatRanDom(0, 65535);;// '冷冻水压力2',
- water_outpre1 = MyModbusUtils.CreateFloatRanDom(0, 65535);;// '水站出口1压力',
- water_outpre2 = MyModbusUtils.CreateFloatRanDom(0, 65535);;// '水站出口2压力',
- water_outpre3 = MyModbusUtils.CreateFloatRanDom(0, 65535);;// '水站出口3压力',
- water_outpre4 = MyModbusUtils.CreateFloatRanDom(0, 65535);;// '水站出口4压力',
- water_returnFlow = MyModbusUtils.CreateFloatRanDom(0, 65535);;// '冷冻水回水流量',
- water_coolpre = MyModbusUtils.CreateFloatRanDom(0, 65535);;// '水站冷却水压力',
- water_coolTmp = MyModbusUtils.CreateFloatRanDom(0, 65535);;// '水站冷却水回水温度',
- water_outTmp = MyModbusUtils.CreateFloatRanDom(0, 65535);;// '水站出水温度',
+ water_returnTmp = MyModbusUtils.CreateFloatRanDom(0, 1000);// '水站回水温度',
+ water_outFlow = MyModbusUtils.CreateFloatRanDom(0, 1000);;// '冷冻水出口流量',
+ water_pre1 = MyModbusUtils.CreateFloatRanDom(0, 1000);;// '冷冻水压力1',
+ water_pre2 = MyModbusUtils.CreateFloatRanDom(0, 1000);;// '冷冻水压力2',
+ water_outpre1 = MyModbusUtils.CreateFloatRanDom(0, 1000);;// '水站出口1压力',
+ water_outpre2 = MyModbusUtils.CreateFloatRanDom(0, 1000);;// '水站出口2压力',
+ water_outpre3 = MyModbusUtils.CreateFloatRanDom(0, 1000);;// '水站出口3压力',
+ water_outpre4 = MyModbusUtils.CreateFloatRanDom(0, 1000);;// '水站出口4压力',
+ water_returnFlow = MyModbusUtils.CreateFloatRanDom(0, 1000);;// '冷冻水回水流量',
+ water_coolpre = MyModbusUtils.CreateFloatRanDom(0, 1000);;// '水站冷却水压力',
+ water_coolTmp = MyModbusUtils.CreateFloatRanDom(0, 1000);;// '水站冷却水回水温度',
+ water_outTmp = MyModbusUtils.CreateFloatRanDom(0, 1000);;// '水站出水温度',
}
diff --git a/src/com/modbus/data/MyModbusUtils.java b/src/com/modbus/data/MyModbusUtils.java
index e72b882..39f65aa 100644
--- a/src/com/modbus/data/MyModbusUtils.java
+++ b/src/com/modbus/data/MyModbusUtils.java
@@ -429,7 +429,7 @@
* @return
*/
public static int CreateSwitchRanDom() {
- return new BigDecimal(Math.random()).setScale(0, BigDecimal.ROUND_HALF_UP).intValue();
+ return new BigDecimal(Math.random()).setScale(0, BigDecimal.ROUND_HALF_DOWN).intValue();
}
/**
--
Gitblit v1.9.1