#指令日志更新

zjj

2023-11-21 ee81afd33e786beb38c9074113ccafa997c8c1d0

#指令日志更新

 src/main/java/com/zy/asrs/entity/CommandInfoLog.java

@@ -187,5 +187,30 @@
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.completeTime);
    }

    /**
     * 获取持续时间
     */
    public String getDurationTime() {
        if (Cools.isEmpty(this.startTime)) {
            return "";
        }

        Date endDate = new Date();
        if (!Cools.isEmpty(this.completeTime)) {
            endDate = this.completeTime;
        }

        //用来获取两个时间相差的毫秒数
        long l = this.startTime.getTime() - endDate.getTime();

        //分别计算相差的天、小时、分、秒
        long day = l / (24 * 60 * 60 * 1000);
        long hour = (l / (60 * 60 * 1000) - day * 24);
        long min = ((l / (60 * 1000)) - day * 24 * 60 - hour * 60);
        long s = (l / 1000 - day * 24 * 60 * 60 - hour * 60 * 60 - min * 60);

        return Math.abs(day) + "天" + Math.abs(hour) + "小时" + Math.abs(min) + "分" + Math.abs(s) + "秒";
    }


}

 src/main/java/com/zy/core/thread/SiemensDevpThread.java

@@ -9,6 +9,7 @@
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
import com.core.exception.CoolException;
import com.zy.asrs.domain.enums.TaskStatusType;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.CommandInfo;
import com.zy.asrs.entity.CommandInfoLog;
@@ -319,8 +320,22 @@
        CommandInfoLogService commandInfoLogService = SpringUtils.getBean(CommandInfoLogService.class);
        CommandInfoService commandInfoService = SpringUtils.getBean(CommandInfoService.class);
        CommandInfo commandInfo = commandInfoService.selectById(staProtocol.getCommandId());
        CommandInfoLog commandInfoLog = JSON.parseObject(JSON.toJSONString(commandInfo), CommandInfoLog.class);
        commandInfoLog.setId(null);
        CommandInfoLog commandInfoLog = new CommandInfoLog();
        if (commandInfo != null) {
            commandInfoLog = JSON.parseObject(JSON.toJSONString(commandInfo), CommandInfoLog.class);
            commandInfoLog.setId(null);
        }else {
            Date now = new Date();
            commandInfoLog.setCommand(JSON.toJSONString(staProtocol));
            commandInfoLog.setCommandStatus(3);
            commandInfoLog.setStartTime(now);
            commandInfoLog.setExecuteTime(now);
            commandInfoLog.setCompleteTime(now);
            commandInfoLog.setDevice(SlaveType.Devp.toString());
            commandInfoLog.setWrkNo(9999);
            commandInfoLog.setTaskNo("9999");
            commandInfoLog.setCommandDesc("手动命令");
        }

        OperateResult writeResult;
        //任务下发次数

 src/main/resources/application-prod.yml

@@ -196,7 +196,7 @@
      devpPlcId: ${wcs-slave.devp[0].id}
  devp[0]: #输送线
    id: 1
    ip: 192.168.4.250
    ip: 172.17.91.36
    rack: 0
    port: 102
    slot: 0
@@ -252,7 +252,7 @@
      staNo: 122
  devp[1]: #输送线
    id: 2
    ip: 10.10.10.30
    ip: 172.17.91.45
    rack: 0
    port: 102
    slot: 0

 src/main/resources/application.yml

@@ -8,7 +8,7 @@
    name: @pom.build.finalName@
  datasource:
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
    url: jdbc:sqlserver://192.168.4.15:1433;databasename=ghtzasrs
    url: jdbc:sqlserver://localhost:1433;databasename=ghtzasrs
    username: sa
    password: sa@123
  mvc: