root/lanzhouhailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
pangshenghao
2023-06-07 17:55:20 +08:00
parent f82cdee8fb
commit a66792724e
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/device_status/DeviceStatusDeviceDriver.java
View File

@@ -74,7 +74,6 @@ public class DeviceStatusDeviceDriver extends AbstractOpcDeviceDriver implements
String load = "";
String alarm = "";
String task_id = "";
String floor ="";
Boolean iserror = false;
Boolean hasGoods = false;
@@ -111,7 +110,6 @@ public class DeviceStatusDeviceDriver extends AbstractOpcDeviceDriver implements
jo.put("load", load);
jo.put("alarm", alarm);
jo.put("task_id", task_id);
jo.put("floor",floor);
jo.put("isOnline", this.getIsonline());
jo.put("isError",this.getIserror());
jo.put("hasGoods", this.getHasGoods());

10
acs/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryLKDeviceStatus.java
View File

@@ -1,5 +1,6 @@
package org.nl.modules.quartz.task;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONArray;
import lombok.extern.slf4j.Slf4j;
import org.nl.acs.device_driver.basedriver.device_status.DeviceStatusDeviceDriver;
@@ -10,6 +11,7 @@ import org.nl.acs.ext.wms.liKuData.Resp;
import org.nl.acs.ext.wms.service.AcsToLiKuService;
import org.nl.acs.opc.Device;
import org.nl.acs.opc.DeviceAppService;
import org.nl.modules.common.utils.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -46,6 +48,7 @@ public class QueryLKDeviceStatus {
DeviceStatusData deviceStatusData=deviceStatusDataList.get(i);
String deviceId="LK" + deviceStatusData.getDeviceId();
PackageDriver(deviceStatusData, deviceId);
}
//提升机
Resp<DeviceStatusResponse> tsjResp = acsToLiKuService.queryTsjDeviceStatus(deviceStatusRequest);
@@ -64,13 +67,16 @@ public class QueryLKDeviceStatus {
deviceStatusDeviceDriver.setDevice_id(deviceId);
deviceStatusDeviceDriver.setX(deviceStatusData.getX());
deviceStatusDeviceDriver.setY(deviceStatusData.getY());
deviceStatusDeviceDriver.setMap_id(deviceStatusData.getMapId());
if(!ObjectUtil.isEmpty(deviceStatusData.getMapId())) {
deviceStatusDeviceDriver.setMap_id(deviceStatusData.getMapId());
}else if (!ObjectUtil.isEmpty(deviceStatusData.getFloor())){
deviceStatusDeviceDriver.setMap_id(deviceStatusData.getFloor());
}
deviceStatusDeviceDriver.setPower(deviceStatusData.getPower());
deviceStatusDeviceDriver.setPallet(deviceStatusData.getPallet());
deviceStatusDeviceDriver.setLoad(deviceStatusData.getLoad());
deviceStatusDeviceDriver.setAlarm(deviceStatusData.getAlarm());
deviceStatusDeviceDriver.setTask_id(deviceStatusData.getTaskId());
deviceStatusDeviceDriver.setFloor(deviceStatusData.getFloor());
deviceStatusDeviceDriver.setIsonline(true);
if(!"0".equals(deviceStatusData.getAlarm())) {
deviceStatusDeviceDriver.setIserror(true);

3
acs/nladmin-ui/src/views/system/monitor/device/index.vue
View File

@@ -608,9 +608,6 @@ export default {
} else if (val === 'task_id') {
const obj = { name: '任务号', value: data[val] }
this.arr.push(obj)
} else if (val === 'floor') {
const obj = { name: '楼层', value: data[val] }
this.arr.push(obj)
}
}
}