|
|
@@ -37,10 +37,10 @@ public class ProductGh {
|
|
|
mesDeviceTime.setProductCate("XT");
|
|
|
|
|
|
String[] states = new String[6];
|
|
|
- states[0] = "OP340"; // 恒温静置
|
|
|
- states[1] = "OP340A";
|
|
|
- states[2] = "OP370";
|
|
|
- states[3] = "OP370A";
|
|
|
+ states[0] = "OP320"; // 恒温静置
|
|
|
+ states[1] = "OP320A";
|
|
|
+ states[2] = "OP360";
|
|
|
+ states[3] = "OP360A";
|
|
|
states[4] = "OP410";
|
|
|
states[5] = "OP410A";
|
|
|
mesDeviceTime.getSqlMap().getWhere().and("oprno", QueryType.IN,states).and("interval",QueryType.EQ,0);
|
|
|
@@ -54,10 +54,10 @@ public class ProductGh {
|
|
|
Date now = new Date();
|
|
|
long differenceInMillis = now.getTime() - startDate.getTime();
|
|
|
String guHuatTime = "150";//默认设置为150分钟
|
|
|
- if (CommonUitl.formatOprno(deviceTime.getOprno()).equals("OP340")) {
|
|
|
- guHuatTime = Global.getConfig("OP340.guHuaTime");
|
|
|
+ if (CommonUitl.formatOprno(deviceTime.getOprno()).equals("OP320")) {
|
|
|
+ guHuatTime = Global.getConfig("OP320.guHuaTime");
|
|
|
} else if (CommonUitl.formatOprno(deviceTime.getOprno()).equals("OP370")) {
|
|
|
- guHuatTime = Global.getConfig("OP370.guHuaTime");
|
|
|
+ guHuatTime = Global.getConfig("OP360.guHuaTime");
|
|
|
} else if (CommonUitl.formatOprno(deviceTime.getOprno()).equals("OP410")) {
|
|
|
guHuatTime = Global.getConfig("OP410.guHuaTime");
|
|
|
}
|