fix: 日志修改

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java

@@ -422,7 +422,7 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements
                 } else {
                     LuceneLogDto logDto2 = LuceneLogDto.builder()
                             .device_code(device_code)
-                            .content("申请空托盘出入库,返回参数:" + jo.getString("body"))
+                            .content("申请空托盘出入库,返回参数:" + response)
                             .build();
                     logDto2.setLog_level(4);
                     luceneExecuteLogService.deviceExecuteLog(logDto2);

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_storage_out_conveyor/BoxStorageOutConveyorDeviceDriver.java

@@ -189,14 +189,8 @@ public class BoxStorageOutConveyorDeviceDriver extends AbstractOpcDeviceDriver i
             heartbeat = this.itemProtocol.getHeartbeat();
             material_barcode = this.itemProtocol.getMaterialBarcode();
             if (mode != last_mode) {
-                JSONObject param = new JSONObject();
-                param.put("device_code", this.device_code);
-                param.put("mode", Math.min(mode, 3));
-                param.put("device_name", this.getDevice().getDevice_name());
-                param.put("device_type", CommonFinalParam.ONE);
                 requireSucess = false;
-                logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode + "复位请求标记:" + requireSucess);
+
-                logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode);
             }
 
             if (move != 0 && task > 0) {

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_subvolumes_conveyor/BoxSubvolumesConveyorDeviceDriver.java

@@ -187,14 +187,8 @@ public class BoxSubvolumesConveyorDeviceDriver extends AbstractOpcDeviceDriver i
 
             // 更新指令状态
             if (mode != last_mode) {
-                JSONObject param = new JSONObject();
+
-                param.put("device_code", this.device_code);
-                param.put("mode", Math.min(mode, 3));
-                param.put("device_name", this.getDevice().getDevice_name());
-                param.put("device_type", CommonFinalParam.ONE);
                 requireSucess = false;
-                logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode + "复位请求标记:" + requireSucess);
-                logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode);
             }
             if (move != 0 && task > 0) {
                 if (null!=inst) {
@@ -333,6 +327,7 @@ public class BoxSubvolumesConveyorDeviceDriver extends AbstractOpcDeviceDriver i
                             .device_code(device_code)
                             .content("申请AGV任务,请求参数:" + apply)
                             .build();
+                    logDto.setLog_level(4);
                     luceneExecuteLogService.deviceExecuteLog(logDto);
                     String str = acsToWmsService.applySendOutTwo(apply);
                     JSONObject jo = JSON.parseObject(str);
@@ -340,6 +335,7 @@ public class BoxSubvolumesConveyorDeviceDriver extends AbstractOpcDeviceDriver i
                             .device_code(device_code)
                             .content("申请AGV任务,参数,接口返回:" + jo)
                             .build();
+                    logDto2.setLog_level(4);
                     luceneExecuteLogService.deviceExecuteLog(logDto2);
                     message = "申请AGV任务,参数,接口返回:" + jo;
 
@@ -352,7 +348,7 @@ public class BoxSubvolumesConveyorDeviceDriver extends AbstractOpcDeviceDriver i
                         this.writing(list1);
                         LuceneLogDto logDto1 = LuceneLogDto.builder()
                                 .device_code(device_code)
-                                .content("申请AGV任务,返回参数:" + jo.getString("body"))
+                                .content("申请AGV任务,返回参数:" + str)
                                 .build();
                         logDto1.setLog_level(4);
                         luceneExecuteLogService.deviceExecuteLog(logDto1);
@@ -369,6 +365,7 @@ public class BoxSubvolumesConveyorDeviceDriver extends AbstractOpcDeviceDriver i
                         .device_code(device_code)
                         .content("申请AGV任务,请求参数:" + apply)
                         .build();
+                logDto.setLog_level(4);
                 luceneExecuteLogService.deviceExecuteLog(logDto);
                 String str = acsToWmsService.applySendOutTwo(apply);
                 logServer.deviceExecuteLog(this.device_code, "", "", "申请AGV任务,请求参数:" + apply + ",响应参数");
@@ -378,6 +375,7 @@ public class BoxSubvolumesConveyorDeviceDriver extends AbstractOpcDeviceDriver i
                         .device_code(device_code)
                         .content("申请AGV任务,参数,接口返回:" + jo)
                         .build();
+                logDto2.setLog_level(4);
                 luceneExecuteLogService.deviceExecuteLog(logDto2);
                 message = "申请AGV任务,参数,接口返回:" + jo;
                 if (jo.getInteger("status") == 200) {

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/finished_product_out_with_bind_lable_conveyor/FinishedProductOutBindLableDeviceDriver.java

@@ -371,7 +371,7 @@ public class FinishedProductOutBindLableDeviceDriver extends AbstractOpcDeviceDr
             } else {
                 LuceneLogDto logDto2 = LuceneLogDto.builder()
                         .device_code(device_code)
-                        .content("申请捆扎失败,接口返回:" + jo.getString("body"))
+                        .content("申请捆扎失败,接口返回:" + response)
                         .build();
                 logDto2.setLog_level(4);
                 luceneExecuteLogService.deviceExecuteLog(logDto2);

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/fold_disc_site/FoldDiscSiteDeviceDriver.java

@@ -189,14 +189,9 @@ public class FoldDiscSiteDeviceDriver extends AbstractOpcDeviceDriver implements
             container_type = this.itemProtocol.getContainer_type();
             carrier_direction = this.itemProtocol.getCarrier_direction();
             if (mode != last_mode) {
-                JSONObject param = new JSONObject();
+
-                param.put("device_code", this.device_code);
-                param.put("mode", Math.min(mode, 3));
-                param.put("device_name", this.getDevice().getDevice_name());
-                param.put("device_type", CommonFinalParam.ONE);
                 requireSucess = false;
-                logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode + "复位请求标记:" + requireSucess);
+
-                logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode);
             }
             // 更新指令状态
             if (move != 0 && task > 0) {
@@ -617,7 +612,7 @@ public class FoldDiscSiteDeviceDriver extends AbstractOpcDeviceDriver implements
                 } else {
                     LuceneLogDto logDto2 = LuceneLogDto.builder()
                             .device_code(device_code)
-                            .content("申请空托盘出入库,返回参数:" + jo.getString("body"))
+                            .content("申请空托盘出入库,返回参数:" + response)
                             .build();
                     logDto2.setLog_level(4);
                     luceneExecuteLogService.deviceExecuteLog(logDto2);

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java

@@ -446,7 +446,7 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv
                 } else {
                     LuceneLogDto logDto2 = LuceneLogDto.builder()
                             .device_code(device_code)
-                            .content("申请高度等级,返回参数:" + jo.getString("body"))
+                            .content("申请高度等级,返回参数:" + response)
                             .build();
                     logDto2.setLog_level(4);
                     luceneExecuteLogService.deviceExecuteLog(logDto2);
@@ -506,7 +506,7 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv
                 } else {
                     LuceneLogDto logDto2 = LuceneLogDto.builder()
                             .device_code(device_code)
-                            .content("申请退货入库,返回参数:" + jo.getString("body"))
+                            .content("申请退货入库,返回参数:" + response)
                             .build();
                     logDto2.setLog_level(4);
                     luceneExecuteLogService.deviceExecuteLog(logDto2);
@@ -615,7 +615,7 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv
                 } else {
                     LuceneLogDto logDto2 = LuceneLogDto.builder()
                             .device_code(device_code)
-                            .content("申请空托盘出入库,返回参数:" + jo.getString("body"))
+                            .content("申请空托盘出入库,返回参数:" + response)
                             .build();
                     logDto2.setLog_level(4);
                     luceneExecuteLogService.deviceExecuteLog(logDto2);
@@ -677,7 +677,7 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv
                 } else {
                     LuceneLogDto logDto2 = LuceneLogDto.builder()
                             .device_code(device_code)
-                            .content("木箱、子卷入库申请入库任务,返回参数:" + jo.getString("body"))
+                            .content("木箱、子卷入库申请入库任务,返回参数:" + response)
                             .build();
                     logDto2.setLog_level(4);
                     luceneExecuteLogService.deviceExecuteLog(logDto2);

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java

@@ -365,7 +365,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
             count = 0;
         }
 
-        if (mode == 0) {
+        if (mode == 0 || command == 9) {
             this.setIsonline(false);
             message = "universal_off";
         }else {
@@ -711,7 +711,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
             luceneExecuteLogService.deviceExecuteLog(logDto1);
             String response = acsToWmsService.applyUpdatePointCode(param);
             JSONObject jo = JSON.parseObject(response);
-            if (StrUtil.isNotEmpty(jo.getString("body")) || jo.getInteger("status") == 200) {
+            if ( jo.getInteger("status") == 200) {
                 try {
                     //清警
                     cleanErro();
@@ -761,7 +761,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
             } else {
                 LuceneLogDto logDto2 = LuceneLogDto.builder()
                         .device_code(device_code)
-                        .content("申请更新点位,返回参数:" + jo.getString("body"))
+                        .content("申请更新点位,返回参数:" + jo)
                         .build();
                 logDto2.setLog_level(4);
                 luceneExecuteLogService.deviceExecuteLog(logDto2);
@@ -1254,12 +1254,12 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
         //监控大屏下发作业命令清警-5、召回-7、急停-8
         Integer toCommand = data.getInteger("toCommand");
         if (toCommand != null) {
-            HashMap map1 = new HashMap();
+            List list = new ArrayList<>();
-            List<Object> list = new ArrayList<>();
+            Map map4 = new HashMap<>();
-            map1.put("code", "to_command");
+            map4.put("code", "to_command");
-            map1.put("value", toCommand);
+            map4.put("value", toCommand);
-            list.add(map1);
+            list.add(map4);
-            this.writing(map1);
+            writing(list);
         }
         //ACS监控大屏设置禁止入库、禁止出库、停止接收任务
         Boolean prohibitInWarehouse = data.getBoolean("prohibitInWarehouse");