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

fix:修复设备监控页面报错问题

Browse Source
This commit is contained in:
tuqiang
2024-06-14 09:37:38 +08:00
parent 62bf1f9ef4
commit b035da2cca
7 changed files with 37 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/rgv/RgvDeviceDriver.java
View File

@@ -183,18 +183,17 @@ public class RgvDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDr
} catch (Exception var17) { } catch (Exception var17) {
var17.printStackTrace(); var17.printStackTrace();
feedMessage = var17.getMessage();
logServer.deviceExecuteLog(this.device_code, "", "", "读取信号值时出现异常:" + var17.getMessage() + ",this.itemProtocol is null:" + ObjectUtil.isEmpty(this.itemProtocol)); logServer.deviceExecuteLog(this.device_code, "", "", "读取信号值时出现异常:" + var17.getMessage() + ",this.itemProtocol is null:" + ObjectUtil.isEmpty(this.itemProtocol));
} }
if (mode == 0) { if (mode == 0) {
this.setIsonline(false); this.setIsonline(false);
message = "未联机"; message = "universal_off-line";
//有报警 //有报警
} else if (error != 0) { } else if (error != 0) {
this.setIserror(true); this.setIserror(true);
message = "有报警"; message = "universal_message3";
//无报警 //无报警
} else { } else {
this.setIsonline(true); this.setIsonline(true);
@@ -218,13 +217,13 @@ public class RgvDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDr
remark = "universal_no"; remark = "universal_no";
} }
if (task != 0) { if (task != 0) {
remark = LangProcess.msg("universal_remark4"); remark = "universal_remark4";
if (ObjectUtil.isNotEmpty(this.inst)) { if (ObjectUtil.isNotEmpty(this.inst)) {
this.inst = null; this.inst = null;
} }
} }
if (requireSucess) { if (requireSucess) {
remark = LangProcess.msg("universal_remark5"); remark = "universal_remark5";
} }
this.setFeedMessage(remark); this.setFeedMessage(remark);
//} //}
@@ -278,14 +277,13 @@ public class RgvDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDr
} }
this.writing(map); this.writing(map);
logServer.deviceExecuteLog(this.device_code, "", "", "申请行架任务,返回参数:" + applyManipulatorActionResponse); logServer.deviceExecuteLog(this.device_code, "", "", "申请行架任务,返回参数:" + applyManipulatorActionResponse);
message = "申请行架任务成功"; message = "universal_message12";
requireSucess = true; requireSucess = true;
} else { } else {
message = applyManipulatorActionResponse.getMessage();
map.put("to_command", 99); map.put("to_command", 99);
this.writing(map); this.writing(map);
requireSucess = true; requireSucess = true;
message = "申请行架任务失败"; message = "universal_message13";
logServer.deviceExecuteLog(this.device_code, "", "", "申请行架任务反馈失败,返回参数:" + applyManipulatorActionResponse); logServer.deviceExecuteLog(this.device_code, "", "", "申请行架任务反馈失败,返回参数:" + applyManipulatorActionResponse);
} }
} }
@@ -367,10 +365,10 @@ public class RgvDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDr
map.put("isOnline", this.getIsonline()); map.put("isOnline", this.getIsonline());
map.put("error", ErrorUtil.getDictDetail("error_type", String.valueOf(this.getError()))); map.put("error", ErrorUtil.getDictDetail("error_type", String.valueOf(this.getError())));
map.put("isError", this.getIserror()); map.put("isError", this.getIserror());
map.put("message", message); map.put("message", LangProcess.msg(message));
/*jo.put("notCreateTaskMessage", notCreateTaskMessage); /*jo.put("notCreateTaskMessage", notCreateTaskMessage);
jo.put("notCreateInstMessage",notCreateInstMessage);*/ jo.put("notCreateInstMessage",notCreateInstMessage);*/
map.put("feedMessage", feedMessage); map.put("feedMessage", LangProcess.msg(feedMessage));
map.put("driver_type", "siemens_conveyor"); map.put("driver_type", "siemens_conveyor");
map.put("is_click", true); map.put("is_click", true);
JSONObject jo = new JSONObject(map); JSONObject jo = new JSONObject(map);

28
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/blank_manipulator/BlankManipulatorDeviceDriver.java
View File

@@ -278,13 +278,13 @@ public class BlankManipulatorDeviceDriver extends AbstractOpcDeviceDriver implem
feedMessage = "universal_feedMessage1"; feedMessage = "universal_feedMessage1";
} }
if (action != 5) { if (action != 5) {
feedMessage = feedMessage + "two_message4"; feedMessage = "two_message4";
} }
if (move != 1) { if (move != 1) {
feedMessage = feedMessage + "universal_feedMessage7"; feedMessage = "universal_feedMessage7";
} }
if (task == 0) { if (task == 0) {
feedMessage = feedMessage + "universal_feedMessage8"; feedMessage = "universal_feedMessage8";
} }
} }
@@ -312,7 +312,6 @@ public class BlankManipulatorDeviceDriver extends AbstractOpcDeviceDriver implem
} catch (Exception var17) { } catch (Exception var17) {
var17.printStackTrace(); var17.printStackTrace();
feedMessage = var17.getMessage();
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(device_code)
.content("读取信号值时出现异常:" + var17.getMessage() + ",this.itemProtocol is null:" + ObjectUtil.isEmpty(this.itemProtocol)) .content("读取信号值时出现异常:" + var17.getMessage() + ",this.itemProtocol is null:" + ObjectUtil.isEmpty(this.itemProtocol))
@@ -350,21 +349,21 @@ public class BlankManipulatorDeviceDriver extends AbstractOpcDeviceDriver implem
} else { } else {
if (mode == 2) { if (mode == 2) {
//if (!requireSucess) { //if (!requireSucess) {
String remark = "未查找任务原因为："; String remark = "universal_remark1";
if (mode != 2) { if (mode != 2) {
remark = remark + "工作模式(mode)不是待机状态"; remark = "universal_remark2";
} }
if (move != 0) { if (move != 0) {
remark = remark + "光电信号(move)为有货状态"; remark = "universal_remark3";
} }
if (task != 0) { if (task != 0) {
remark = remark + "当前上报任务号(task)应该为0"; remark = "universal_remark4";
if (ObjectUtil.isNotEmpty(this.inst)) { if (ObjectUtil.isNotEmpty(this.inst)) {
this.inst = null; this.inst = null;
} }
} }
if (requireSucess) { if (requireSucess) {
remark = remark + "右击该图标,将请求任务复位标记(requireSucess)改为否。"; remark ="universal_remark5";
} }
this.setNotCreateTaskMessage(remark); this.setNotCreateTaskMessage(remark);
//} //}
@@ -500,7 +499,7 @@ public class BlankManipulatorDeviceDriver extends AbstractOpcDeviceDriver implem
Device startDevice = deviceAppService.findDeviceByCode(instdto.getStart_device_code()); Device startDevice = deviceAppService.findDeviceByCode(instdto.getStart_device_code());
Device nextDevice = deviceAppService.findDeviceByCode(instdto.getNext_device_code()); Device nextDevice = deviceAppService.findDeviceByCode(instdto.getNext_device_code());
if (ObjectUtil.isEmpty(startDevice.getExtraValue().get("address"))) { if (ObjectUtil.isEmpty(startDevice.getExtraValue().get("address"))) {
notCreateInstMessage = startDevice.getDevice_code() + LangProcess.msg("universal_notCreateInstMessage1"); notCreateInstMessage ="universal_notCreateInstMessage1";
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(device_code)
.content(startDevice.getDevice_code() + LangProcess.msg("universal_notCreateInstMessage1")) .content(startDevice.getDevice_code() + LangProcess.msg("universal_notCreateInstMessage1"))
@@ -510,7 +509,7 @@ public class BlankManipulatorDeviceDriver extends AbstractOpcDeviceDriver implem
throw new BadRequestException(LangProcess.msg("device_checkAdd", startDevice.getDevice_code())); throw new BadRequestException(LangProcess.msg("device_checkAdd", startDevice.getDevice_code()));
} }
if (ObjectUtil.isEmpty(nextDevice.getExtraValue().get("address"))) { if (ObjectUtil.isEmpty(nextDevice.getExtraValue().get("address"))) {
notCreateInstMessage = nextDevice.getDevice_code() + LangProcess.msg("universal_notCreateInstMessage1"); notCreateInstMessage = "universal_notCreateInstMessage1";
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(device_code)
.content(nextDevice.getDevice_code() + LangProcess.msg("universal_notCreateInstMessage1")) .content(nextDevice.getDevice_code() + LangProcess.msg("universal_notCreateInstMessage1"))
@@ -523,7 +522,6 @@ public class BlankManipulatorDeviceDriver extends AbstractOpcDeviceDriver implem
try { try {
instructionService.create(instdto); instructionService.create(instdto);
} catch (Exception e) { } catch (Exception e) {
notCreateInstMessage = e.getMessage();
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(device_code)
.content(LangProcess.msg("universal_message9") + e.getMessage()) .content(LangProcess.msg("universal_message9") + e.getMessage())
@@ -569,7 +567,7 @@ public class BlankManipulatorDeviceDriver extends AbstractOpcDeviceDriver implem
notCreateInstMessage = ""; notCreateInstMessage = "";
notCreateTaskMessage = ""; notCreateTaskMessage = "";
} else { } else {
notCreateInstMessage = "未找到关联设备的任务，指令无法创建"; notCreateInstMessage = "universal_notCreateInstMessage";
} }
return true; return true;
} }
@@ -689,8 +687,8 @@ public class BlankManipulatorDeviceDriver extends AbstractOpcDeviceDriver implem
jo.put("error", ErrorUtil.getDictDetail("error_type", String.valueOf(this.getError()))); jo.put("error", ErrorUtil.getDictDetail("error_type", String.valueOf(this.getError())));
jo.put("isError", this.getIserror()); jo.put("isError", this.getIserror());
jo.put("message", LangProcess.msg(message)); jo.put("message", LangProcess.msg(message));
jo.put("notCreateTaskMessage", notCreateTaskMessage); jo.put("notCreateTaskMessage", LangProcess.msg(notCreateTaskMessage));
jo.put("notCreateInstMessage",notCreateInstMessage); jo.put("notCreateInstMessage",LangProcess.msg(notCreateInstMessage));
jo.put("feedMessage", LangProcess.msg(feedMessage)); jo.put("feedMessage", LangProcess.msg(feedMessage));
jo.put("driver_type", "siemens_conveyor"); jo.put("driver_type", "siemens_conveyor");
jo.put("is_click", true); jo.put("is_click", true);

16
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java
View File

@@ -224,10 +224,10 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl
remark = "universal_remark2"; remark = "universal_remark2";
} }
if (move1 != 0) { if (move1 != 0) {
remark = remark + "universal_remark6"; remark = "universal_remark6";
} }
if (move2 != 0) { if (move2 != 0) {
remark = remark + "universal_remark7"; remark = "universal_remark7";
} }
if (task != 0) { if (task != 0) {
remark = "universal_remark4"; remark = "universal_remark4";
@@ -292,19 +292,19 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl
feedMessage = "universal_feedMessage6"; feedMessage = "universal_feedMessage6";
} else { } else {
if (mode != 3) { if (mode != 3) {
feedMessage += "universal_feedMessage1"; feedMessage = "universal_feedMessage1";
} }
if (action != 9) { if (action != 9) {
feedMessage += "universal_feedMessage9"; feedMessage = "universal_feedMessage9";
} }
if (move1 != 0) { if (move1 != 0) {
feedMessage += "universal_feedMessage10"; feedMessage = "universal_feedMessage10";
} }
if (move2 != 0) { if (move2 != 0) {
feedMessage += "universal_feedMessage11"; feedMessage = "universal_feedMessage11";
} }
if (task == 0) { if (task == 0) {
feedMessage += "universal_feedMessage4"; feedMessage = "universal_feedMessage4";
} }
} }
} }
@@ -863,7 +863,7 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl
jo.put("message", message); jo.put("message", message);
jo.put("is_click", true); jo.put("is_click", true);
jo.put("driver_type", "slit_two_manipulator"); jo.put("driver_type", "slit_two_manipulator");
jo.put("notCreateTaskMessage", notCreateTaskMessage); jo.put("notCreateTaskMessage", LangProcess.msg(notCreateTaskMessage));
jo.put("notCreateInstMessage", LangProcess.msg(notCreateInstMessage)); jo.put("notCreateInstMessage", LangProcess.msg(notCreateInstMessage));
jo.put("feedMessage", LangProcess.msg(feedMessage)); jo.put("feedMessage", LangProcess.msg(feedMessage));
return jo; return jo;

2
acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal.properties
View File

@@ -35,6 +35,8 @@ universal_message8=\u8BFB\u53D6\u4FE1\u53F7\u503C\u65F6\u51FA\u73B0\u5F02\u5E38:
universal_message9=\u521B\u5EFA\u6307\u4EE4\u65F6\u51FA\u73B0\u5F02\u5E38: universal_message9=\u521B\u5EFA\u6307\u4EE4\u65F6\u51FA\u73B0\u5F02\u5E38:
universal_message10=\u4E0B\u53D1\u591A\u4E2A\u7535\u6C14\u4FE1\u53F7: universal_message10=\u4E0B\u53D1\u591A\u4E2A\u7535\u6C14\u4FE1\u53F7:
universal_message11=\u4FE1\u53F7\u8FDE\u63A5\u5F02\u5E38\uFF01 universal_message11=\u4FE1\u53F7\u8FDE\u63A5\u5F02\u5E38\uFF01
universal_message12=\u7533\u8BF7\u884C\u67B6\u4EFB\u52A1\u6210\u529F\uFF01
universal_message13=\u7533\u8BF7\u884C\u67B6\u4EFB\u52A1\u5931\u8D25\uFF01
universal_feedMessage1=\u5DE5\u4F5C\u6A21\u5F0F(mode)\u4E0D\u4E3A\u8FD0\u884C\u4E2D\u72B6\u6001 universal_feedMessage1=\u5DE5\u4F5C\u6A21\u5F0F(mode)\u4E0D\u4E3A\u8FD0\u884C\u4E2D\u72B6\u6001
universal_feedMessage2=\u52A8\u4F5C\u4FE1\u53F7(action)\u4E0D\u4E3A\u653E\u8D27\u5B8C\u6210\u72B6\u6001 universal_feedMessage2=\u52A8\u4F5C\u4FE1\u53F7(action)\u4E0D\u4E3A\u653E\u8D27\u5B8C\u6210\u72B6\u6001
universal_feedMessage3=\u5149\u7535\u4FE1\u53F7(move)\u4E0D\u4E3A\u65E0\u8D27\u72B6\u6001 universal_feedMessage3=\u5149\u7535\u4FE1\u53F7(move)\u4E0D\u4E3A\u65E0\u8D27\u72B6\u6001

2
acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal_en_US.properties
View File

@@ -33,6 +33,8 @@ universal_message8=An exception occurred when reading the signal value:
universal_message9=An exception occurred while creating the directive universal_message9=An exception occurred while creating the directive
universal_message10=Multiple electrical signals are issued universal_message10=Multiple electrical signals are issued
universal_message11=The signal connection is abnormal! universal_message11=The signal connection is abnormal!
universal_message12=Successfully applied for shelving task!
universal_message13=Application for shelving task failed!
universal_feedMessage1=mode is not in the running state universal_feedMessage1=mode is not in the running state
universal_feedMessage2=action signal (action signal) is not a release completed status universal_feedMessage2=action signal (action signal) is not a release completed status
universal_feedMessage3=Photoelectric signal (move) is not out of stock universal_feedMessage3=Photoelectric signal (move) is not out of stock

2
acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal_in_ID.properties
View File

@@ -32,6 +32,8 @@ universal_message7=Misi tercapai ...
universal_message8=Pengecualian terjadi saat membaca nilai sinyal: universal_message8=Pengecualian terjadi saat membaca nilai sinyal:
universal_message9=Pengecualian terjadi saat membuat direktif universal_message9=Pengecualian terjadi saat membuat direktif
universal_message10=Beberapa sinyal listrik dikeluarkan universal_message10=Beberapa sinyal listrik dikeluarkan
universal_message12=Aplikasi untuk tugas perancah berhasil!
universal_message13=Gagal melamar tugas memeras!
universal_message11=Koneksi sinyal tidak normal! universal_message11=Koneksi sinyal tidak normal!
universal_feedMessage1=Mode kerja tidak untuk mode dalam mode universal_feedMessage1=Mode kerja tidak untuk mode dalam mode
universal_feedMessage2=Sinyal aksi tidak lengkap untuk penempatan universal_feedMessage2=Sinyal aksi tidak lengkap untuk penempatan

2
acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal_zh_CN.properties
View File

@@ -33,6 +33,8 @@ universal_message8=\u8BFB\u53D6\u4FE1\u53F7\u503C\u65F6\u51FA\u73B0\u5F02\u5E38:
universal_message9=\u521B\u5EFA\u6307\u4EE4\u65F6\u51FA\u73B0\u5F02\u5E38: universal_message9=\u521B\u5EFA\u6307\u4EE4\u65F6\u51FA\u73B0\u5F02\u5E38:
universal_message10=\u4E0B\u53D1\u591A\u4E2A\u7535\u6C14\u4FE1\u53F7 universal_message10=\u4E0B\u53D1\u591A\u4E2A\u7535\u6C14\u4FE1\u53F7
universal_message11=\u4FE1\u53F7\u8FDE\u63A5\u5F02\u5E38\uFF01 universal_message11=\u4FE1\u53F7\u8FDE\u63A5\u5F02\u5E38\uFF01
universal_message12=\u7533\u8BF7\u884C\u67B6\u4EFB\u52A1\u6210\u529F\uFF01
universal_message13=\u7533\u8BF7\u884C\u67B6\u4EFB\u52A1\u5931\u8D25\uFF01
universal_feedMessage1=\u5DE5\u4F5C\u6A21\u5F0F(mode)\u4E0D\u4E3A\u8FD0\u884C\u4E2D\u72B6\u6001 universal_feedMessage1=\u5DE5\u4F5C\u6A21\u5F0F(mode)\u4E0D\u4E3A\u8FD0\u884C\u4E2D\u72B6\u6001
universal_feedMessage2=\u52A8\u4F5C\u4FE1\u53F7(action)\u4E0D\u4E3A\u653E\u8D27\u5B8C\u6210\u72B6\u6001 universal_feedMessage2=\u52A8\u4F5C\u4FE1\u53F7(action)\u4E0D\u4E3A\u653E\u8D27\u5B8C\u6210\u72B6\u6001
universal_feedMessage3=\u5149\u7535\u4FE1\u53F7(move)\u4E0D\u4E3A\u65E0\u8D27\u72B6\u6001 universal_feedMessage3=\u5149\u7535\u4FE1\u53F7(move)\u4E0D\u4E3A\u65E0\u8D27\u72B6\u6001