lhq/FT546-WCS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

下发充电任务 断电任务

Browse Source
This commit is contained in:
liuhanqing
2025-12-01 11:03:48 +08:00
parent b484605c9c
commit d765c0a8cb
1 changed files with 45 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/cdz/CdzThread.java
View File

@@ -94,9 +94,10 @@ public class CdzThread implements Runnable {
if (CollUtil.isNotEmpty(srgvChargingJobs)) { if (CollUtil.isNotEmpty(srgvChargingJobs)) {
for (SrgvChargingJob srgvChargingJob : srgvChargingJobs) { for (SrgvChargingJob srgvChargingJob : srgvChargingJobs) {
if ("0".equals(srgvChargingJob.getChargingStatus())) {
int i = PlcCdzRead.WriteToCdz("", null); int i = PlcCdzRead.WriteToCdz("", null);
if (i == 1) { if (i == 1) {
srgvChargingJob.setChargingStatus("1"); srgvChargingJob.setChargingStatus("2");
srgvChargingJob.setChargingDate(DateUtil.formatDateTime(DateUtil.date())); srgvChargingJob.setChargingDate(DateUtil.formatDateTime(DateUtil.date()));
chargingJobService.updateSrgvChargingJob(srgvChargingJob); chargingJobService.updateSrgvChargingJob(srgvChargingJob);
} }
@@ -104,6 +105,8 @@ public class CdzThread implements Runnable {
} }
}
//生成断电任务 有任务且电量大于50 //生成断电任务 有任务且电量大于50
WcsSrgvQueue wcsSrgvQueueParam = new WcsSrgvQueue(); WcsSrgvQueue wcsSrgvQueueParam = new WcsSrgvQueue();
@@ -127,6 +130,7 @@ public class CdzThread implements Runnable {
if (deviceSrgv.getBattery() >= 50) { if (deviceSrgv.getBattery() >= 50) {
//生成断电任务 //生成断电任务
createChargingOutJob(deviceSrgv, deviceCdz); createChargingOutJob(deviceSrgv, deviceCdz);
break;
} }
} }
} }
@@ -142,7 +146,8 @@ public class CdzThread implements Runnable {
List<SrgvChargingJob> srgvChargingJobDds = chargingJobService.selectSrgvChargingJobList(srgvChargingJobDdParam); List<SrgvChargingJob> srgvChargingJobDds = chargingJobService.selectSrgvChargingJobList(srgvChargingJobDdParam);
if (CollUtil.isNotEmpty(srgvChargingJobDds)) { if (CollUtil.isNotEmpty(srgvChargingJobDds)) {
for (SrgvChargingJob srgvChargingJob : srgvChargingJobDds) { for (SrgvChargingJob srgvChargingJob : srgvChargingJobs) {
if ("0".equals(srgvChargingJob.getChargingStatus())) {
int i = PlcCdzRead.WriteToCdz("", null); int i = PlcCdzRead.WriteToCdz("", null);
if (i == 1) { if (i == 1) {
srgvChargingJob.setChargingStatus("1"); srgvChargingJob.setChargingStatus("1");
@@ -155,8 +160,11 @@ public class CdzThread implements Runnable {
} }
}
/** /**
* 创建充电任务 * 创建充电任务
*
* @param srgvList * @param srgvList
*/ */
private void createChargingInJob(List<DeviceSrgv> srgvList) { private void createChargingInJob(List<DeviceSrgv> srgvList) {
@@ -212,20 +220,14 @@ public class CdzThread implements Runnable {
* @param deviceSrgv * @param deviceSrgv
*/ */
private void createChargingOutJob(DeviceSrgv deviceSrgv, DeviceCdz cdz) { private void createChargingOutJob(DeviceSrgv deviceSrgv, DeviceCdz cdz) {
SrgvChargingJob wcsChargingJob = new SrgvChargingJob();
wcsChargingJob.setJobType("2");
wcsChargingJob.setAgvId(deviceSrgv.getDeviceId().toString());
List<SrgvChargingJob> srgvChargingJobs = chargingJobService.selectSrgvChargingJobList(wcsChargingJob);
if (CollUtil.isEmpty(srgvChargingJobs)) {
//生成充电任务
SrgvChargingJob srgvChargingJobParam = new SrgvChargingJob(); SrgvChargingJob srgvChargingJobParam = new SrgvChargingJob();
srgvChargingJobParam.setAgvId(deviceSrgv.getDeviceId().toString()); srgvChargingJobParam.setAgvId(deviceSrgv.getDeviceId().toString());
srgvChargingJobParam.setChargingSite(cdz.getSiteId()); srgvChargingJobParam.setChargingSite(cdz.getSiteId());
srgvChargingJobParam.setChargingId(cdz.getId().toString()); srgvChargingJobParam.setChargingId(cdz.getId().toString());
List<SrgvChargingJob> wcsChargingJobs = chargingJobService.selectSrgvChargingJobList(srgvChargingJobParam); List<SrgvChargingJob> srgvChargingJobs = chargingJobService.selectSrgvChargingJobList(srgvChargingJobParam);
if (CollUtil.isEmpty(wcsChargingJobs)) { if (CollUtil.isNotEmpty(srgvChargingJobs)) {
SrgvChargingJob scj = new SrgvChargingJob(); SrgvChargingJob scj = srgvChargingJobs.get(0);
scj.setGuid(IdUtil.fastSimpleUUID()); //scj.setGuid(IdUtil.fastSimpleUUID());
scj.setChargingSite(cdz.getSiteId()); scj.setChargingSite(cdz.getSiteId());
scj.setJobStatus("1"); scj.setJobStatus("1");
scj.setChargingStatus("0"); scj.setChargingStatus("0");
@@ -236,6 +238,5 @@ public class CdzThread implements Runnable {
chargingJobService.insertSrgvChargingJob(scj); chargingJobService.insertSrgvChargingJob(scj);
} }
} }
}
} }