add:新增报警信息

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

@@ -263,15 +263,16 @@ public class StandardOrdinarySiteDeviceDriver extends AbstractDeviceDriver imple
             move = LangProcess.msg("universal_two_yes");
             jo.put("hasGoods", true);
         }
-        DeviceDto dto = deviceservice.findByCode(this.getDevice().getDevice_code());
+        jo.put("device_name", this.getDevice().getDevice_name());
-        jo.put("zh_device_name",dto.getZh_device_name());
+//        DeviceDto dto = deviceservice.findByCode(this.getDevice().getDevice_code());
-        jo.put("en_device_name",dto.getEn_device_name());
+//        jo.put("zh_device_name",dto.getZh_device_name());
-        jo.put("in_device_name",dto.getIn_device_name());
+//        jo.put("en_device_name",dto.getEn_device_name());
-        jo.put("mode", mode);
+//        jo.put("in_device_name",dto.getIn_device_name());
-        jo.put("move", move);
+//        jo.put("mode", mode);
-        jo.put("action", action);
+//        jo.put("move", move);
+//        jo.put("action", action);
         jo.put("isOnline", true);
-        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("option", option);
         jo.put("is_click", true);

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

@@ -337,7 +337,7 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv
                         message = "条码为空";
                     } else {
                         applyErrorHeight();
-                    }
+                     }
 
                 }
 

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/paper_tube_pick_site/PaperTubePickSiteDeviceDriver.java

@@ -345,7 +345,7 @@ public class PaperTubePickSiteDeviceDriver extends AbstractOpcDeviceDriver imple
         jo.put("mode", mode);
         jo.put("move", move);jo.put("action", action);
         jo.put("isOnline", true);
-        jo.put("error", ErrorUtil.getDictDetail("error_type", String.valueOf(this.getError())));
+        jo.put("error", ErrorUtil.getDictDetail("gxhj_error_type", String.valueOf(this.getError())));
         jo.put("isError", this.getIserror());
         return jo;
     }

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

@@ -387,7 +387,7 @@ public class RgvDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDr
         /*jo.put("task", task);*/
         /*jo.put("walk_y", this.walk_y);*/
         map.put("isOnline", this.getIsonline());
-        map.put("error", ErrorUtil.getDictDetail("error_type", String.valueOf(this.getError())));
+        map.put("error", ErrorUtil.getDictDetail("cbj_error_type", String.valueOf(this.getError())));
         map.put("isError", this.getIserror());
         map.put("message", LangProcess.msg(message));
         /*jo.put("notCreateTaskMessage", notCreateTaskMessage);

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/die_manipulator/DieManipulatorDriver.java

@@ -233,7 +233,7 @@ public class DieManipulatorDriver extends AbstractOpcDeviceDriver implements Dev
         map.put("move", move);
         map.put("action", action);
         map.put("isOnline", this.getIsonline());
-        map.put("error", ErrorUtil.getDictDetail("bhhj_error_type", String.valueOf(this.getError())));
+        map.put("error", ErrorUtil.getDictDetail("gxhj_error_type", String.valueOf(this.getError())));
         map.put("isError", this.getIserror());
         map.put("message", message);
         map.put("driver_type", "siemens_conveyor");

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/inflatable_shaft_library/InflatableShaftLibraryDeviceDriver.java

@@ -222,7 +222,7 @@ public class InflatableShaftLibraryDeviceDriver extends AbstractOpcDeviceDriver
         jo.put("action", action);
         jo.put("walk_y", walk_y);
         jo.put("isOnline", this.getIsonline());
-        jo.put("error", ErrorUtil.getDictDetail("error_type", String.valueOf(this.getError())));
+        jo.put("error", ErrorUtil.getDictDetail("cbj_error_type", String.valueOf(this.getError())));
         jo.put("isError", this.getIserror());
         jo.put("qty", this.getQty());
         jo.put("type", this.getType() == 3 ? "三寸": this.getType() == 6 ? "六寸" : "未知");

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

@@ -190,16 +190,16 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl
 //        } else
         if (mode == 0) {
             this.setIsonline(false);
-            message = LangProcess.msg("universal_off-line");
+            message = "universal_off-line";
             //有报警
         } else if (error != 0) {
             this.setIserror(true);
-            message = LangProcess.msg("universal_message3");
+            message = "universal_message3";
             //无报警
         } else {
             this.setIsonline(true);
             this.setIserror(false);
-            message = LangProcess.msg("universal_operation");
+            message = "universal_operation";
             switch (mode) {
                 case 1:
                     log.debug("设备运转模式:等待工作");
@@ -835,7 +835,7 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl
         }
         if (error == 0) {
             if (this.itemProtocol.isError) {
-                this.setMessage(LangProcess.msg("universal_message4"));
+                this.setMessage("universal_message4");
                 iserror = true;
             } else {
                 iserror = false;
@@ -845,7 +845,7 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl
         jo.put("mode", mode);
         jo.put("action", action);
         jo.put("walk_y", walk_y);
-        jo.put("error", ErrorUtil.getDictDetail("error_type", String.valueOf(this.getError())));
+        jo.put("error", ErrorUtil.getDictDetail("fqhj_error_type", String.valueOf(this.getError())));
         jo.put("task", this.getTask());
         jo.put("isOnline", this.getIsonline());
         jo.put("isError", this.getIserror());
@@ -856,7 +856,7 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl
         jo.put("requireSucess", requireSucess);
         jo.put("move_1", move_1);
         jo.put("move_2", move_2);
-        jo.put("message", message);
+        jo.put("message", LangProcess.msg(message));
         jo.put("notCreateTaskMessage", LangProcess.msg(notCreateTaskMessage));
         jo.put("notCreateInstMessage", LangProcess.msg(notCreateInstMessage));
         jo.put("feedMessage", LangProcess.msg(feedMessage));

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java

@@ -585,7 +585,15 @@ public class InstructionServiceImpl extends CommonServiceImpl<InstructionMapper,
             dto.setIs_send(task.getLink_num());
         }
 //        if (task.getTask_type().equals(CommonFinalParam.ONE) || task.getTask_type().equals("2")) {
-        dto.setInstruction_type(task.getTask_type());
+        if (StrUtil.isEmpty(task.getClass_type())){
+            dto.setInstruction_type(task.getTask_type());
+        }else {
+            if (ObjectUtil.isNotEmpty(task.getTask_type()) && task.getClass_type().length() == 2) {
+                dto.setInstruction_type(task.getClass_type());
+            } else {
+                dto.setInstruction_type(task.getTask_type());
+            }
+        }
 //        } else if (false) {
 //
 //        } else {
@@ -615,9 +623,9 @@ public class InstructionServiceImpl extends CommonServiceImpl<InstructionMapper,
         dto.setStart_parent_code(task.getStart_parent_code());
         dto.setNext_parent_code(task.getNext_parent_code());
 
-        if (ObjectUtil.isNotEmpty(task.getTask_type())) {
+//        if (ObjectUtil.isNotEmpty(task.getTask_type())) {
-            dto.setInstruction_type(task.getTask_type());
+//            dto.setInstruction_type(task.getTask_type());
-        }
+//        }
 
         DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class);
         Device startdevice = appService.findDeviceByCode(dto.getStart_device_code());

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/service/impl/LuceneServiceImpl.java

@@ -171,6 +171,18 @@ public class LuceneServiceImpl implements LuceneService {
                 Query rangeQuery = TermRangeQuery.newStringRange("method", null, null, false, false);
                 booleanQueryBuilder.add(rangeQuery, BooleanClause.Occur.MUST);
             }
+            if (whereJson.get("requestparam") != null){
+                WildcardQuery query = new  WildcardQuery(new Term("requestparam", "*"+(String) whereJson.get("requestparam")+"*"));
+                booleanQueryBuilder.add(query,BooleanClause.Occur.MUST);
+            }
+            if (whereJson.get("responseparam") != null){
+                WildcardQuery query = new  WildcardQuery(new Term("responseparam", "*"+(String) whereJson.get("responseparam")+"*"));
+                booleanQueryBuilder.add(query,BooleanClause.Occur.MUST);
+            }
+            if (whereJson.get("blurry") != null) {
+                WildcardQuery query = new  WildcardQuery(new Term("fieldContent", "*"+(String) whereJson.get("blurry")+"*"));
+                booleanQueryBuilder.add(query, BooleanClause.Occur.MUST);
+            }
             TopFieldCollector collector = TopFieldCollector.create(new Sort(new SortField("logTime", SortField.Type.LONG,true)), 20000, 0);
             searcher.search(booleanQueryBuilder.build(), collector);
             TopDocs topDocs = collector.topDocs(pageNum*pageSize, pageSize);

acs2/nladmin-ui/src/views/acs/history/instRecord/index.vue

@@ -143,6 +143,11 @@
         <el-table-column v-if="false" prop="instruction_id" label="指令标识" />
         <el-table-column prop="instruction_code" :label="$t('TaskRecord.table.Instruction_code')" :min-width="flexWidth('instruction_code',crud.data,$t('TaskRecord.table.Instruction_code'))" />
         <el-table-column prop="task_code" :label="$t('task.txt_box.Task_code')" :min-width="flexWidth('task_code',crud.data,$t('task.txt_box.Task_code'))" />
+        <el-table-column prop="instruction_type" :label="$t('Inst.table.instruction_type')" :min-width="flexWidth('instruction_type',crud.data,$t('Inst.table.instruction_type'))">
+          <template slot-scope="scope">
+            {{ dict.label.task_type[scope.row.instruction_type] }}
+          </template>
+        </el-table-column>
         <el-table-column prop="vehicle_code" :label="$t('task.txt_box.Vehicle_number')" :min-width="flexWidth('vehicle_code',crud.data,$t('task.txt_box.Vehicle_number'))" />
         <el-table-column prop="instruction_status" :label="$t('TaskRecord.table.Instruction_status')" :min-width="flexWidth('instruction_status',crud.data,$t('TaskRecord.table.Instruction_status'))">
           <template slot-scope="scope">

acs2/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue

@@ -125,7 +125,8 @@
         <el-table-column prop="vehicle_code" :label="$t('task.txt_box.Vehicle_number')" :min-width="flexWidth('vehicle_code',crud.data,$t('task.txt_box.Vehicle_number'))" />
         <el-table-column prop="task_type" :label="$t('task.txt_box.Task_type')" width="100px">
           <template slot-scope="scope">
-            {{ dict.label.task_type[scope.row.task_type] }}
+            <span v-if="scope.row.class_type!=null && scope.row.class_type.length===2">{{ dict.label.task_type[scope.row.class_type] }}</span>
+            <span v-else>{{ dict.label.task_type[scope.row.task_type] }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="task_status" :label="$t('TaskRecord.table.Status')" :min-width="flexWidth('task_status',crud.data,$t('TaskRecord.table.Status'))">