简化重复代码

ruoyi-admin/src/main/java/com/ruoyi/schedule/plcRead/ssj/PlcSsjRead.java

@@ -6,6 +6,7 @@ import HslCommunication.Core.Types.OperateResult;
 import HslCommunication.Core.Types.OperateResultExOne;
 import HslCommunication.Profinet.Siemens.SiemensPLCS;
 import HslCommunication.Profinet.Siemens.SiemensS7Net;
+import com.ruoyi.common.domain.SendData;
 import com.ruoyi.device.ddj.domain.MsgDdj;
 import com.ruoyi.device.ssj.domain.DeviceSsj;
 import com.ruoyi.common.domain.HslRead;
@@ -207,6 +208,17 @@ public class PlcSsjRead implements Runnable {
         setIsConnect(false);
     }
 
+    public static int writeToSsj(String address, String taskNo, int qx) {
+
+        int jym = Tools.getJYM(Integer.parseInt(taskNo), qx, 1);
+        SendData taskNoSendData = new SendData(Tools.INT, taskNo);
+        SendData qxSendData = new SendData(Tools.INT, qx);
+        SendData completedSendData = new SendData(Tools.INT, 1);
+        SendData jymSendData = new SendData(Tools.INT, jym);
+        byte[] bytes = Tools.sendData(taskNoSendData, qxSendData, completedSendData, jymSendData);
+        return PlcSsjRead.WriteToSSJ(address, bytes);
+    }
+
 
 
 

ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor1/Floor1BothWayInSsjThread.java

@@ -10,7 +10,6 @@ import com.ruoyi.api.service.IApiService;
 import com.ruoyi.bas.cargospace.domain.BasCargoSpace;
 import com.ruoyi.bas.cargospace.service.IBasCargoSpaceService;
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.domain.SendData;
 import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.device.ssj.domain.DeviceSsj;
 import com.ruoyi.job.domain.MydoJob;
@@ -18,13 +17,13 @@ import com.ruoyi.job.service.IMydoJobService;
 import com.ruoyi.queue.ddj.domain.DdjDeviceExecutionQueue;
 import com.ruoyi.queue.ddj.service.IDdjDeviceExecutionQueueService;
 import com.ruoyi.schedule.plcRead.ssj.PlcSsjRead;
-import com.ruoyi.schedule.plcRead.util.Tools;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.*;
 
 import static com.ruoyi.common.TaskStatusCode.*;
 import static com.ruoyi.common.TaskType.DDJ_RWLX_3;
+import static com.ruoyi.schedule.plcRead.ssj.PlcSsjRead.writeToSsj;
 
 /**
  * 一楼双向线体入库线程   条码+到位+无出库作业 下发去向+任务号  有出库作业就下发退回
@@ -204,16 +203,5 @@ public class Floor1BothWayInSsjThread implements Runnable {
     }
 
 
-    private static int writeToSsj(String address, String taskNo, int qx) {
-
-        int jym = Tools.getJYM(Integer.parseInt(taskNo), qx, 1);
-        SendData taskNoSendData = new SendData(Tools.INT, taskNo);
-        SendData qxSendData = new SendData(Tools.INT, qx);
-        SendData completedSendData = new SendData(Tools.INT, 1);
-        SendData jymSendData = new SendData(Tools.INT, jym);
-        byte[] bytes = Tools.sendData(taskNoSendData, qxSendData, completedSendData, jymSendData);
-        return PlcSsjRead.WriteToSSJ(address, bytes);
-    }
-
 
 }

ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor2/Floor2InOutSsjThread.java

@@ -3,7 +3,6 @@ package com.ruoyi.schedule.scheduleTask.ssj.floor2;
 import cn.hutool.core.convert.Convert;
 import com.ruoyi.api.service.IApiService;
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.domain.SendData;
 import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.device.ssj.domain.DeviceSsj;
 import com.ruoyi.job.domain.JobCallBack;
@@ -13,7 +12,6 @@ import com.ruoyi.job.service.IMydoJobService;
 import com.ruoyi.queue.agv.domain.AgvQueue;
 import com.ruoyi.queue.agv.service.IAgvQueueService;
 import com.ruoyi.schedule.plcRead.ssj.PlcSsjRead;
-import com.ruoyi.schedule.plcRead.util.Tools;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.ArrayList;
@@ -22,6 +20,7 @@ import java.util.HashMap;
 import java.util.List;
 
 import static com.ruoyi.common.TaskStatusCode.TASK_EP_SSJ;
+import static com.ruoyi.schedule.plcRead.ssj.PlcSsjRead.writeToSsj;
 
 /**
  * 二楼出入口输送线线程
@@ -122,7 +121,7 @@ public class Floor2InOutSsjThread implements Runnable {
             if (!agvQueues.isEmpty()) {
                 int i = writeToSsj(inSsjDevice.getPlcDbWriteAddress(), agvQueues.get(0).getWmsTaskNo(), 1);
                 if (i == 1) {
-                    log.info(inSsjDevice.getDeviceCode() + "输送机下发任务号成功");
+                    log.info("输送机{}下发任务号{}成功", inSsjDevice.getDeviceCode(), agvQueues.get(0).getWmsTaskNo());
                     MydoJob mydoJob = mydoJobService.selectMydoJobByJobId(agvQueues.get(0).getTaskCode());
                     mydoJob.setExecutionPhase(TASK_EP_SSJ);
                     mydoJobService.updateMydoJob(mydoJob);
@@ -137,7 +136,7 @@ public class Floor2InOutSsjThread implements Runnable {
 
             MydoJob mydoJob = mydoJobService.selectMydoJobByTaskNo(Convert.toLong(inSsjDevice.getTaskNo()));
             if (mydoJob != null) {
-                log.info("设备：{}  位置：{}  任务号：{}  出库到位", inSsjDevice.getDeviceCode(), "输送线", mydoJob.getTaskNo());
+                log.info("设备：{}  位置：{}  任务号：{}  出库到位", "输送线", inSsjDevice.getDeviceCode(), mydoJob.getTaskNo());
                 mydoJobService.insertHistory(mydoJob.getJobId());
                 mydoJobService.deleteMydoJobByJobId(mydoJob.getJobId());
                 JobCallBack jobCallBack = new JobCallBack();
@@ -151,15 +150,6 @@ public class Floor2InOutSsjThread implements Runnable {
         }
     }
 
-    private static int writeToSsj(String address, String taskNo, int qx) {
 
-        int jym = Tools.getJYM(Integer.parseInt(taskNo), qx, 1);
-        SendData taskNoSendData = new SendData(Tools.INT, taskNo);
-        SendData qxSendData = new SendData(Tools.INT, qx);
-        SendData completedSendData = new SendData(Tools.INT, 1);
-        SendData jymSendData = new SendData(Tools.INT, jym);
-        byte[] bytes = Tools.sendData(taskNoSendData, qxSendData, completedSendData, jymSendData);
-        return PlcSsjRead.WriteToSSJ(address, bytes);
-    }
 
 }