diff --git a/hd/nladmin-system/pom.xml b/hd/nladmin-system/pom.xml index e13ce6e..3c8acb0 100644 --- a/hd/nladmin-system/pom.xml +++ b/hd/nladmin-system/pom.xml @@ -19,15 +19,37 @@ + + net.sf.json-lib + json-lib + 2.4 + jdk15 + + + net.sourceforge.jexcelapi + jxl + 2.6.12 + net.dreamlu mica-ip2region 2.5.6 + + org.bouncycastle + bcprov-jdk15on + 1.70 + org.openscada.utgard org.openscada.opc.lib 1.5.0 + + + org.bouncycastle + bcprov-jdk15on + + com.squareup.okhttp3 diff --git a/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/AgvServiceImpl.java b/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/AgvServiceImpl.java index 7b5fe77..8fc4a18 100644 --- a/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/AgvServiceImpl.java +++ b/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/AgvServiceImpl.java @@ -570,7 +570,7 @@ public class AgvServiceImpl implements AgvService { .execute(); log.info("查询agv状态:{}", result.body()); System.out.println("查询agv状态数据:" + result.body()); - if (200 == 200) { + if (result.getStatus() == 200) { com.alibaba.fastjson.JSONObject body = com.alibaba.fastjson.JSONObject.parseObject(result.body()); com.alibaba.fastjson.JSONArray ja = body.getJSONArray("report"); com.alibaba.fastjson.JSONObject alarms = body.getJSONObject("alarms");