From f9665e573dcf115ded7ac6aaeeb58907388f961d Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期六, 14 九月 2024 17:03:07 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/RgvController.java | 35 +++++++++++++++++++++++++++++++----
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 3 ++-
src/main/resources/application.yml | 16 ++++++++--------
3 files changed, 41 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/RgvController.java b/src/main/java/com/zy/asrs/controller/RgvController.java
index 4cc777b..96e7bac 100644
--- a/src/main/java/com/zy/asrs/controller/RgvController.java
+++ b/src/main/java/com/zy/asrs/controller/RgvController.java
@@ -22,12 +22,14 @@
import com.zy.core.enums.RgvModeType;
import com.zy.core.enums.RgvTaskModeType;
import com.zy.core.enums.SlaveType;
+import com.zy.core.model.DevpSlave;
import com.zy.core.model.RgvSlave;
import com.zy.core.model.Task;
import com.zy.core.model.command.RgvCommand;
import com.zy.core.model.protocol.RgvProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.RgvThread;
+import com.zy.core.thread.SiemensDevpThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
@@ -383,10 +385,35 @@
// @ManagerAuth(memo = "杞ㄩ亾PLC鐘舵�佷俊鎭�")
public R wnergyGatheringRingParamTrack(){
List<EnergyGatheringRingParam> result = new ArrayList<>();
- EnergyGatheringRingParam energyGatheringRingParam = new EnergyGatheringRingParam();
- energyGatheringRingParam.setTrackColor("rgba(0, 230, 118, 0.5)");
- energyGatheringRingParam.setRadiationColor("rgba(0, 230, 118, 0.5)");
- result.add(energyGatheringRingParam);
+ try{
+ for (DevpSlave devp : slaveProperties.getDevp()) {
+ SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
+ if (devpThread.isResult()){
+ if (true){
+ EnergyGatheringRingParam energyGatheringRingParam = new EnergyGatheringRingParam();
+ energyGatheringRingParam.setTrackColor("rgba(0, 230, 118, 0.5)");
+ energyGatheringRingParam.setRadiationColor("rgba(0, 230, 118, 0.5)");
+ result.add(energyGatheringRingParam);
+ } else {
+ EnergyGatheringRingParam energyGatheringRingParam = new EnergyGatheringRingParam();
+ energyGatheringRingParam.setTrackColor("rgba(0, 230, 118, 0.5)");
+ energyGatheringRingParam.setRadiationColor("rgba(0, 230, 118, 0.5)");
+ result.add(energyGatheringRingParam);
+ }
+ }
+ }
+ if (result.isEmpty()){
+ EnergyGatheringRingParam energyGatheringRingParam = new EnergyGatheringRingParam();
+ energyGatheringRingParam.setTrackColor("rgba(0, 0, 0, 81)");
+ energyGatheringRingParam.setRadiationColor("rgba(0, 0, 0, 81)");
+ result.add(energyGatheringRingParam);
+ }
+ } catch (Exception e){
+ EnergyGatheringRingParam energyGatheringRingParam = new EnergyGatheringRingParam();
+ energyGatheringRingParam.setTrackColor("rgba(0, 0, 0, 81)");
+ energyGatheringRingParam.setRadiationColor("rgba(0, 0, 0, 81)");
+ result.add(energyGatheringRingParam);
+ }
return R.ok().add(result);
}
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index d2c5ffb..6acaa03 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -46,6 +46,7 @@
public boolean charge0; //璇锋眰鍏呯數
public boolean charge1; //璇锋眰鍏呯數
private short heartBeatVal = 1;
+ private boolean result = false;
public static final ArrayList<Integer> staNos1 = new ArrayList<Integer>() {{
add(100);add(101);add(102);add(103);add(104);add(105);add(106);add(107);
add(108);add(109);add(110);add(111);add(112);add(113);add(114);add(115);
@@ -198,7 +199,7 @@
@Override
public boolean connect() {
- boolean result = false;
+ result = false;
siemensS7Net = new SiemensS7Net(SiemensPLCS.S1200, slave.getIp());
siemensS7Net.setRack(slave.getRack().byteValue());
siemensS7Net.setSlot(slave.getSlot().byteValue());
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 8d63695..f081729 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -38,16 +38,16 @@
devp[0]:
id: 1
ip: 192.168.4.250
- port: 102
+ port: 502
rack: 0
slot: 0
- # 杈撻�佺嚎
- devp[1]:
- id: 2
- ip: 192.168.4.250
- port: 102
- rack: 0
- slot: 0
+# # 杈撻�佺嚎
+# devp[1]:
+# id: 2
+# ip: 192.168.4.250
+# port: 102
+# rack: 0
+# slot: 0
# RGV绌挎杞�1
rgv[0]:
id: 1
--
Gitblit v1.9.1