From e5e36c3e19352997741e58b63ed4725ceafd0b89 Mon Sep 17 00:00:00 2001 From: "1049970895@qniao.cn" <1049970895> Date: Tue, 6 Sep 2022 11:49:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../machine/command/MachineOutputCommand.java | 8 ++++---- .../command/PowerOffMachineCommand.java | 8 ++++---- .../command/PowerOnMachineCommand.java | 8 ++++---- .../command/StartMachineWorkingCommand.java | 8 ++++---- .../command/StopMachineWorkingCommand.java | 8 ++++---- .../job/IotMachineEventGeneratorJob.java | 20 +++++++++---------- 6 files changed, 30 insertions(+), 30 deletions(-) diff --git a/iot-machine-data-command/src/main/java/com/qniao/iot/machine/command/MachineOutputCommand.java b/iot-machine-data-command/src/main/java/com/qniao/iot/machine/command/MachineOutputCommand.java index 22e74d5..3589028 100644 --- a/iot-machine-data-command/src/main/java/com/qniao/iot/machine/command/MachineOutputCommand.java +++ b/iot-machine-data-command/src/main/java/com/qniao/iot/machine/command/MachineOutputCommand.java @@ -43,14 +43,14 @@ public class MachineOutputCommand extends BaseCommand { private Integer dataSource; /** - * 当前产能（距离上次的工作生产数量） + * 当前工作产能（距离上次的工作生产数量） */ - private Long currCount; + private Long currJobCount; /** - * 当前时长（距离上次的作业时长，单位秒） + * 当前工作时长（距离上次的作业时长，单位秒） */ - private Long currDuration; + private Long currJobDuration; /** * 当前总产量 diff --git a/iot-machine-data-command/src/main/java/com/qniao/iot/machine/command/PowerOffMachineCommand.java b/iot-machine-data-command/src/main/java/com/qniao/iot/machine/command/PowerOffMachineCommand.java index 8b3a086..3be2633 100644 --- a/iot-machine-data-command/src/main/java/com/qniao/iot/machine/command/PowerOffMachineCommand.java +++ b/iot-machine-data-command/src/main/java/com/qniao/iot/machine/command/PowerOffMachineCommand.java @@ -33,14 +33,14 @@ public class PowerOffMachineCommand extends BaseCommand { private Integer dataSource; /** - * 当前产能（距离上次的工作生产数量） + * 当前工作产能（距离上次的工作生产数量） */ - private Long currCount; + private Long currJobCount; /** - * 当前时长（距离上次的作业时长，单位秒） + * 当前工作时长（距离上次的作业时长，单位秒） */ - private Long currDuration; + private Long currJobDuration; /** * 当前总产量 diff --git a/iot-machine-data-command/src/main/java/com/qniao/iot/machine/command/PowerOnMachineCommand.java b/iot-machine-data-command/src/main/java/com/qniao/iot/machine/command/PowerOnMachineCommand.java index 35db388..4249b8b 100644 --- a/iot-machine-data-command/src/main/java/com/qniao/iot/machine/command/PowerOnMachineCommand.java +++ b/iot-machine-data-command/src/main/java/com/qniao/iot/machine/command/PowerOnMachineCommand.java @@ -33,14 +33,14 @@ public class PowerOnMachineCommand extends BaseCommand { private Integer dataSource; /** - * 当前产能（距离上次的工作生产数量） + * 当前工作产能（距离上次的工作生产数量） */ - private Long currCount; + private Long currJobCount; /** - * 当前时长（距离上次的作业时长，单位秒） + * 当前工作时长（距离上次的作业时长，单位秒） */ - private Long currDuration; + private Long currJobDuration; /** * 当前总产量 diff --git a/iot-machine-data-command/src/main/java/com/qniao/iot/machine/command/StartMachineWorkingCommand.java b/iot-machine-data-command/src/main/java/com/qniao/iot/machine/command/StartMachineWorkingCommand.java index a5d13ae..4159d53 100644 --- a/iot-machine-data-command/src/main/java/com/qniao/iot/machine/command/StartMachineWorkingCommand.java +++ b/iot-machine-data-command/src/main/java/com/qniao/iot/machine/command/StartMachineWorkingCommand.java @@ -33,14 +33,14 @@ public class StartMachineWorkingCommand extends BaseCommand { private Integer dataSource; /** - * 当前产能（距离上次的工作生产数量） + * 当前工作产能（距离上次的工作生产数量） */ - private Long currCount; + private Long currJobCount; /** - * 当前时长（距离上次的作业时长，单位秒） + * 当前工作时长（距离上次的作业时长，单位秒） */ - private Long currDuration; + private Long currJobDuration; /** * 当前总产量 diff --git a/iot-machine-data-command/src/main/java/com/qniao/iot/machine/command/StopMachineWorkingCommand.java b/iot-machine-data-command/src/main/java/com/qniao/iot/machine/command/StopMachineWorkingCommand.java index 7c25823..46d337b 100644 --- a/iot-machine-data-command/src/main/java/com/qniao/iot/machine/command/StopMachineWorkingCommand.java +++ b/iot-machine-data-command/src/main/java/com/qniao/iot/machine/command/StopMachineWorkingCommand.java @@ -33,14 +33,14 @@ public class StopMachineWorkingCommand extends BaseCommand { private Integer dataSource; /** - * 当前产能（距离上次的工作生产数量） + * 当前工作产能（距离上次的工作生产数量） */ - private Long currCount; + private Long currJobCount; /** - * 当前时长（距离上次的作业时长，单位秒） + * 当前工作时长（距离上次的作业时长，单位秒） */ - private Long currDuration; + private Long currJobDuration; /** * 当前总产量 diff --git a/iot-machine-state-event-generator-job/src/main/java/com/qniao/iot/machine/event/generator/job/IotMachineEventGeneratorJob.java b/iot-machine-state-event-generator-job/src/main/java/com/qniao/iot/machine/event/generator/job/IotMachineEventGeneratorJob.java index 8a6a72c..b009317 100644 --- a/iot-machine-state-event-generator-job/src/main/java/com/qniao/iot/machine/event/generator/job/IotMachineEventGeneratorJob.java +++ b/iot-machine-state-event-generator-job/src/main/java/com/qniao/iot/machine/event/generator/job/IotMachineEventGeneratorJob.java @@ -515,8 +515,8 @@ public class IotMachineEventGeneratorJob { machineOutputCommand.setMachinePwrStat(pwrStat); machineOutputCommand.setMachineWorkingStat(workingStat); machineOutputCommand.setDataSource(dataSource); - machineOutputCommand.setCurrCount(currCount); - machineOutputCommand.setCurrDuration(currDuration); + machineOutputCommand.setCurrJobCount(currCount); + machineOutputCommand.setCurrJobDuration(currDuration); machineOutputCommand.setCurrTotalOutput(accJobCount); machineOutputCommand.setTimestamp(reportTime); @@ -526,8 +526,8 @@ public class IotMachineEventGeneratorJob { command.setId(machineId); command.setMac(machineIotMac); command.setDataSource(dataSource); - command.setCurrCount(currCount); - command.setCurrDuration(currDuration); + command.setCurrJobCount(currCount); + command.setCurrJobDuration(currDuration); command.setCurrTotalOutput(accJobCount); command.setTimestamp(reportTime); out.collect(command); @@ -538,8 +538,8 @@ public class IotMachineEventGeneratorJob { command.setId(machineId); command.setMac(machineIotMac); command.setDataSource(dataSource); - command.setCurrCount(currCount); - command.setCurrDuration(currDuration); + command.setCurrJobCount(currCount); + command.setCurrJobDuration(currDuration); command.setCurrTotalOutput(accJobCount); command.setTimestamp(reportTime); out.collect(command); @@ -550,8 +550,8 @@ public class IotMachineEventGeneratorJob { command.setId(machineId); command.setMac(machineIotMac); command.setDataSource(dataSource); - command.setCurrCount(currCount); - command.setCurrDuration(currDuration); + command.setCurrJobCount(currCount); + command.setCurrJobDuration(currDuration); command.setCurrTotalOutput(accJobCount); command.setTimestamp(reportTime); out.collect(command); @@ -562,8 +562,8 @@ public class IotMachineEventGeneratorJob { command.setId(machineId); command.setMac(machineIotMac); command.setDataSource(dataSource); - command.setCurrCount(currCount); - command.setCurrDuration(currDuration); + command.setCurrJobCount(currCount); + command.setCurrJobDuration(currDuration); command.setCurrTotalOutput(accJobCount); command.setTimestamp(reportTime); out.collect(command);