diff --git a/business/src/main/java/com/fizz/business/comm/OPC/MessageReceiveSchedule.java b/business/src/main/java/com/fizz/business/comm/OPC/MessageReceiveSchedule.java index 1b2bfc8..0fddfe1 100644 --- a/business/src/main/java/com/fizz/business/comm/OPC/MessageReceiveSchedule.java +++ b/business/src/main/java/com/fizz/business/comm/OPC/MessageReceiveSchedule.java @@ -48,7 +48,7 @@ public class MessageReceiveSchedule extends BaseSchedule { writeMessage(fur,furLineMeasureIds); AppMeasureExitMessage exit = new AppMeasureExitMessage(); - writeMessage(exit,exitMeasureIds); + writeMessage(exit,exitLineMeasureIds); AppMeasureMessage msg = new AppMeasureMessage(); msg.setAppMeasureEntryMessage(entry); diff --git a/business/src/main/java/com/fizz/business/service/manager/OpcMessageIdsManager.java b/business/src/main/java/com/fizz/business/service/manager/OpcMessageIdsManager.java index a2d2e0d..a455779 100644 --- a/business/src/main/java/com/fizz/business/service/manager/OpcMessageIdsManager.java +++ b/business/src/main/java/com/fizz/business/service/manager/OpcMessageIdsManager.java @@ -144,12 +144,12 @@ public class OpcMessageIdsManager { } public static void loadFurLineMeasureIds() { - furLineMeasureIds.put("ns=2;s=通道 1.PLCLine.FurLineMeasure.entryCoilId", "entryCoilId"); - furLineMeasureIds.put("ns=2;s=通道 1.PLCLine.FurLineMeasure.stripLocation", "stripLocation"); - furLineMeasureIds.put("ns=2;s=通道 1.PLCLine.FurLineMeasure.phFurnaceTemperatureActual", "phFurnaceTemperatureActual"); - furLineMeasureIds.put("ns=2;s=通道 1.PLCLine.FurLineMeasure.nof1FurnaceTemperatureActual", "nof1FurnaceTemperatureActual"); - furLineMeasureIds.put("ns=2;s=通道 1.PLCLine.FurLineMeasure.nof1FurnaceTemperatureSet", "nof1FurnaceTemperatureSet"); - furLineMeasureIds.put("ns=2;s=通道 1.PLCLine.FurLineMeasure.nof1FurnaceTemperatureControlOutput", "nof1FurnaceTemperatureControlOutput"); + furLineMeasureIds.put("ns=2;s=通道 1.PLCFur.FurLineMeasure.entryCoilId", "entryCoilId"); +// furLineMeasureIds.put("ns=2;s=通道 1.PLCFur.FurLineMeasure.stripLocation", "stripLocation"); + furLineMeasureIds.put("ns=2;s=通道 1.PLCFur.FurLineMeasure.phFurnaceTemperatureActual", "phFurnaceTemperatureActual"); + furLineMeasureIds.put("ns=2;s=通道 1.PLCFur.FurLineMeasure.nof1FurnaceTemperatureActual", "nof1FurnaceTemperatureActual"); + furLineMeasureIds.put("ns=2;s=通道 1.PLCFur.FurLineMeasure.nof1FurnaceTemperatureSet", "nof1FurnaceTemperatureSet"); + furLineMeasureIds.put("ns=2;s=通道 1.PLCFur.FurLineMeasure.nof1FurnaceTemperatureControlOutput", "nof1FurnaceTemperatureControlOutput"); // furLineMeasureIds.put("ns=2;s=通道 1.PLCLine.FurLineMeasure.nof1GasFlowActual", "nof1GasFlowActual"); // furLineMeasureIds.put("ns=2;s=通道 1.PLCLine.FurLineMeasure.nof1GasFlowSet", "nof1GasFlowSet"); // furLineMeasureIds.put("ns=2;s=通道 1.PLCLine.FurLineMeasure.nof1GasFlowControlOutput", "nof1GasFlowControlOutput"); @@ -322,8 +322,8 @@ public class OpcMessageIdsManager { exitLineMeasureIds.put("ns=2;s=通道 1.PLCLine.ExitLineMeasure.stripLocation", "stripLocation"); exitLineMeasureIds.put("ns=2;s=通道 1.PLCLine.ExitLineMeasure.tensionBr8Br9", "tensionBr8Br9"); exitLineMeasureIds.put("ns=2;s=通道 1.PLCLine.ExitLineMeasure.cxlLength", "cxlLength"); - exitLineMeasureIds.put("ns=2;s=通道 1.PLCLine.ExitLineMeasure.cxlCapacity", "cxlCapacity"); - exitLineMeasureIds.put("ns=2;s=通道 1.PLCLine.ExitLineMeasure.tensionCxl", "tensionCxl"); + exitLineMeasureIds.put("ns=2;s=通道 1.PLCLine.ExitLineMeasure.cxlPercent", "cxlCapacity"); +// exitLineMeasureIds.put("ns=2;s=通道 1.PLCLine.ExitLineMeasure.tensionCxl", "tensionCxl"); exitLineMeasureIds.put("ns=2;s=通道 1.PLCLine.ExitLineMeasure.oilingFlag", "oilingFlag"); exitLineMeasureIds.put("ns=2;s=通道 1.PLCLine.ExitLineMeasure.oilingAmountTop", "oilingAmountTop"); exitLineMeasureIds.put("ns=2;s=通道 1.PLCLine.ExitLineMeasure.oilingAmountBottom", "oilingAmountBottom"); diff --git a/ruoyi-admin/src/main/resources/logback.xml b/ruoyi-admin/src/main/resources/logback.xml index 281dc14..9998c41 100644 --- a/ruoyi-admin/src/main/resources/logback.xml +++ b/ruoyi-admin/src/main/resources/logback.xml @@ -1,7 +1,7 @@ - + @@ -20,7 +20,7 @@ ${log.path}/sys-info.%d{yyyy-MM-dd}.log - 7 + 3 ${log.pattern}