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

add: 新增lucene日志检索

Browse Source
This commit is contained in:
jiaoliming
2023-04-25 19:26:16 +08:00
parent 351995334e
commit 49016a2bd6
12 changed files with 225 additions and 701 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
acs/nladmin-system/pom.xml
View File

@@ -409,16 +409,6 @@
</dependency>
<!-- Lucence核心包 -->
<!--<dependency>
<groupId>com.alone</groupId>
<artifactId>embedded-lucene-core</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>com.alone</groupId>
<artifactId>embedded-lucene-spring-boot-starter</artifactId>
<version>1.0.0</version>
</dependency>-->
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-core</artifactId>
@@ -450,7 +440,7 @@
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-queryparser</artifactId>
<version>8.2.0</version>
<version>${lucene.version}</version>
</dependency>

24
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/xg_agv/XgagvDeviceDriver.java
View File

@@ -172,11 +172,13 @@ public class XgagvDeviceDriver extends AbstractOpcDeviceDriver implements Device
stop = this.itemProtocol.getStop();
if (home_relocation != last_home_relocation) {
LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code)
.content("信号" + this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.device_code + "." + ItemProtocol.to_home_relocation + "变更从" + this.last_home_relocation + "->" + this.home_relocation)
.build();
luceneExecuteLogService.deviceExecuteLog(logDto);
// LuceneLogDto logDto = LuceneLogDto.builder()
// .device_code(device_code)
// .content("信号" + this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.device_code + "." + ItemProtocol.to_home_relocation + "变更从" + this.last_home_relocation + "->" + this.home_relocation)
// .build();
// luceneExecuteLogService.deviceExecuteLog(logDto);
luceneExecuteLogService.deviceExecuteLog(
new LuceneLogDto(this.getDevice().getOpc_server_code(),this.getDevice().getOpc_plc_code(),this.device_code,ItemProtocol.to_home_relocation,this.last_home_relocation,this.home_relocation));
}
if (stop != last_stop) {
@@ -389,7 +391,7 @@ public class XgagvDeviceDriver extends AbstractOpcDeviceDriver implements Device
LuceneLogDto resplogDto = LuceneLogDto.builder()
.device_code(device_code)
.content("返回参数:"+resp.body())
.requestparam("返回参数:"+resp.body())
.responseparam("返回参数:"+resp.body())
.method("feedAgvTaskStatus")
.status_code(String.valueOf(resp.getStatus()))
.build();
@@ -430,7 +432,7 @@ public class XgagvDeviceDriver extends AbstractOpcDeviceDriver implements Device
LuceneLogDto resplogDto = LuceneLogDto.builder()
.device_code(device_code)
.content("返回参数:"+resp.body())
.requestparam("返回参数:"+resp.body())
.responseparam("返回参数:"+resp.body())
.method("feedAgvTaskStatus")
.status_code(String.valueOf(resp.getStatus()))
.build();
@@ -467,7 +469,7 @@ public class XgagvDeviceDriver extends AbstractOpcDeviceDriver implements Device
LuceneLogDto resplogDto = LuceneLogDto.builder()
.device_code(device_code)
.content("返回参数:"+resp.body())
.requestparam("返回参数:"+resp.body())
.responseparam("返回参数:"+resp.body())
.method("feedAgvTaskStatus")
.status_code(String.valueOf(resp.getStatus()))
.build();
@@ -502,7 +504,7 @@ public class XgagvDeviceDriver extends AbstractOpcDeviceDriver implements Device
LuceneLogDto resplogDto = LuceneLogDto.builder()
.device_code(device_code)
.content("返回参数:"+resp.body())
.requestparam("返回参数:"+resp.body())
.responseparam("返回参数:"+resp.body())
.method("feedAgvTaskStatus")
.status_code(String.valueOf(resp.getStatus()))
.build();
@@ -532,7 +534,7 @@ public class XgagvDeviceDriver extends AbstractOpcDeviceDriver implements Device
LuceneLogDto resplogDto = LuceneLogDto.builder()
.device_code(device_code)
.content("返回参数:"+resp.body())
.requestparam("返回参数:"+resp.body())
.responseparam("返回参数:"+resp.body())
.method("feedAgvTaskStatus")
.status_code(String.valueOf(resp.getStatus()))
.build();
@@ -596,7 +598,7 @@ public class XgagvDeviceDriver extends AbstractOpcDeviceDriver implements Device
LuceneLogDto resplogDto = LuceneLogDto.builder()
.device_code(device_code)
.content("返回参数:"+resp.body())
.requestparam("返回参数:"+resp.body())
.responseparam("返回参数:"+resp.body())
.method("feedAgvTaskStatus")
.status_code(String.valueOf(resp.getStatus()))
.build();

8
acs/nladmin-system/src/main/java/org/nl/modules/lucence/common/LuceneIndexWriter.java
View File

@@ -53,6 +53,10 @@ public class LuceneIndexWriter {
}
}
public static void main(String[] args) throws IOException {
indexWriter.deleteAll();
}
public static String getDate(String timeString) throws ParseException {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSX");//时间格式
Date date = sdf.parse(timeString);
@@ -60,9 +64,5 @@ public class LuceneIndexWriter {
return timeString;
}
public static void main(String[] args) throws IOException {
indexWriter.deleteAll();
}
}

43
acs/nladmin-system/src/main/java/org/nl/modules/lucence/common/Searcher.java
View File

@@ -4,6 +4,7 @@ import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.extern.slf4j.Slf4j;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.index.DirectoryReader;
@@ -22,6 +23,7 @@ import java.util.*;
/**
* lucene查询器
*/
@Slf4j
public class Searcher {
public static Map<String, Object> search(String indexDir, String ext,Map whereJson) throws Exception {
@@ -47,8 +49,6 @@ public class Searcher {
Sort sort = new Sort(new SortField("logTime", SortField.Type.DOC,true));
TopDocs docs = null;
//通过解析要查询的String，获取查询对象，q为传进来的待查的字符串
String queryString = "";
BooleanQuery.Builder booleanQueryBuilder = new BooleanQuery.Builder();
//时间范围查询
String startDate = (String) whereJson.get("begin_time");
@@ -71,28 +71,24 @@ public class Searcher {
Query termQuery = new TermQuery(new Term("device_code", (String) whereJson.get("device_code")));
booleanQueryBuilder.add(termQuery,BooleanClause.Occur.MUST);
}
//日志类型
// if (whereJson.get("blurry") != null) queryString += "fieldContent:"+(String) whereJson.get("blurry");
if (whereJson.get("blurry") != null) queryString = (String) whereJson.get("blurry");
// if (whereJson.get("device_code") != null) queryString += " +device_code:"+(String) whereJson.get("device_code");
if (whereJson.get("blurry") == null) {
WildcardQuery query=new WildcardQuery(new Term("fieldContent","*"));
booleanQueryBuilder.add(query, BooleanClause.Occur.MUST);
docs = searcher.search(booleanQueryBuilder.build(), end,sort);
}else {
if (whereJson.get("method") != null){
Query termQuery = new TermQuery(new Term("method", (String) whereJson.get("method")));
booleanQueryBuilder.add(termQuery,BooleanClause.Occur.MUST);
}
if (whereJson.get("status_code") != null){
Query termQuery = new TermQuery(new Term("status_code", (String) whereJson.get("status_code")));
booleanQueryBuilder.add(termQuery,BooleanClause.Occur.MUST);
}
if (whereJson.get("blurry") != null) {
Query query = queryParser.parse((String) whereJson.get("blurry"));
booleanQueryBuilder.add(query, BooleanClause.Occur.MUST);
docs = searcher.search(booleanQueryBuilder.build(), end,sort);
}
//记录索引结束时间
docs = searcher.search(booleanQueryBuilder.build(), end,sort);
//记录索引时间
long endTime = System.currentTimeMillis();
System.out.println("匹配" + queryString + "共耗时" + (endTime-startTime) + "毫秒");
System.out.println("查询到" + docs.totalHits.value + "条日志文件");
//取出每条查询结果
log.info("匹配{}共耗时{}毫秒",booleanQueryBuilder.build(),(endTime-startTime));
log.info("查询到{}条日志文件", docs.totalHits.value);
List<String> list = new ArrayList<>();
//取出每条查询结果
ScoreDoc[] scoreDocs = docs.scoreDocs;
if (end > docs.totalHits.value) end = (int) docs.totalHits.value;
JSONArray array = new JSONArray();
@@ -104,16 +100,17 @@ public class Searcher {
object.put("content",doc.get("fieldContent"));
object.put("device_code",doc.get("device_code"));
object.put("logTime",doc.get("logTime"));
object.put("method",doc.get("method"));
object.put("status_code",doc.get("status_code"));
object.put("requestparam",doc.get("requestparam"));
object.put("responseparam",doc.get("responseparam"));
if(doc.get("fieldContent") != null) {
array.add(object);
}
}
// System.out.println("查询到" + array.size() + "条记录");
for(Object logDto:array){
String st = logDto.toString();
System.out.println(st);
log.info(logDto.toString());
}
reader.close();
JSONObject jo = new JSONObject();
jo.put("content", array);

15
acs/nladmin-system/src/main/java/org/nl/modules/lucence/enums/LogTypeEnum.java Normal file
View File

@@ -0,0 +1,15 @@
package org.nl.modules.lucence.enums;
public enum LogTypeEnum {
DEVICE_LOG("设备日志"),
INTERFACE_LOG("接口日志");
private String desc;
LogTypeEnum(String desc) {
this.desc = desc;
}
public String getDesc() {
return desc;
}
}

4
acs/nladmin-system/src/main/java/org/nl/modules/lucence/service/LuceneExecuteLogService.java
View File

@@ -3,6 +3,8 @@ package org.nl.modules.lucence.service;
import org.nl.modules.lucence.service.dto.LuceneLogDto;
import java.io.IOException;
public interface LuceneExecuteLogService {
/**
* 设备光电变化实时光电信号
@@ -25,7 +27,7 @@ public interface LuceneExecuteLogService {
*
* @param luceneLogDto 日志结果对象
*/
void interfaceExecuteLog(LuceneLogDto luceneLogDto);
void interfaceExecuteLog(LuceneLogDto luceneLogDto) throws IOException;
/**
* 设备执行日志,会保留历史记录

19
acs/nladmin-system/src/main/java/org/nl/modules/lucence/service/dto/LuceneLogDto.java
View File

@@ -1,10 +1,14 @@
package org.nl.modules.lucence.service.dto;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class LuceneLogDto {
/* 日志标识 */
@@ -64,4 +68,19 @@ public class LuceneLogDto {
/* 修改时间 */
private String update_time;
public LuceneLogDto (final String opc_server_code,final String opc_plc_code,
final String device_code,final String to_home,final int last_home,
final int home) {
super ();
this.device_code = device_code;
this.content = "信号"
+ opc_server_code + "."
+ opc_plc_code + "."
+ device_code + "."
+ to_home + "变更从"
+ last_home + "->"
+ home;
}
}

48
acs/nladmin-system/src/main/java/org/nl/modules/lucence/service/impl/LuceneExecuteLogServiceImpl.java
View File

@@ -11,12 +11,15 @@ import org.apache.lucene.document.Field;
import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexWriter;
import org.nl.modules.lucence.enums.LogTypeEnum;
import org.nl.modules.lucence.service.LuceneExecuteLogService;
import org.nl.modules.lucence.service.dto.LuceneLogDto;
import org.nl.modules.lucence.common.LuceneIndexWriter;
import org.slf4j.MDC;
import org.springframework.stereotype.Service;
import java.io.IOException;
/**
* @author jlm
* @description 服务实现
@@ -35,7 +38,17 @@ public class LuceneExecuteLogServiceImpl implements LuceneExecuteLogService {
@SneakyThrows
@Override
public void deviceExecuteLog(LuceneLogDto luceneLogDto) {
luceneLogDto.setLogType(LogTypeEnum.DEVICE_LOG.getDesc());
addIndex(luceneLogDto);
}
@Override
public void interfaceExecuteLog(LuceneLogDto luceneLogDto) throws IOException {
luceneLogDto.setLogType(LogTypeEnum.INTERFACE_LOG.getDesc());
addIndex(luceneLogDto);
}
private void addIndex(LuceneLogDto luceneLogDto) throws IOException {
IndexWriter indexWriter = LuceneIndexWriter.getIndexWriter();
//创建一个Document对象
Document document = new Document();
@@ -45,33 +58,36 @@ public class LuceneExecuteLogServiceImpl implements LuceneExecuteLogService {
//向document对象中添加域。
if (ObjectUtil.isNotEmpty(luceneLogDto.getDevice_code())){
document.add(new StringField("device_code", luceneLogDto.getDevice_code(), Field.Store.YES));
// document.add(new TextField("device_code", luceneLogDto.getDevice_code(), Field.Store.YES));
}
if (ObjectUtil.isNotEmpty(luceneLogDto.getContent())) {
document.add(new TextField("fieldContent", luceneLogDto.getContent(), Field.Store.YES));
}
document.add(new TextField("logType", "deviceLog", Field.Store.YES));
if (ObjectUtil.isNotEmpty(luceneLogDto.getMethod())) {
document.add(new StringField("method", luceneLogDto.getMethod(), Field.Store.YES));
}
if (ObjectUtil.isNotEmpty(luceneLogDto.getStatus_code())) {
document.add(new StringField("status_code", luceneLogDto.getStatus_code(), Field.Store.YES));
}
if (ObjectUtil.isNotEmpty(luceneLogDto.getRequestparam())) {
document.add(new TextField("requestparam", luceneLogDto.getRequestparam(), Field.Store.YES));
}
if (ObjectUtil.isNotEmpty(luceneLogDto.getResponseparam())) {
document.add(new TextField("responseparam", luceneLogDto.getResponseparam(), Field.Store.YES));
}
document.add(new StringField("logType", luceneLogDto.getLogType(), Field.Store.YES));
document.add(new StringField("logTime", DateUtil.format(new DateTime(),"yyyy-MM-dd HH:mm:ss.SSS"), Field.Store.YES));
indexWriter.addDocument(document);
//记录索引结束时间
long endTime = System.currentTimeMillis();
// System.out.println("建立索引"+ "共耗时" + (endTime-startTime) + "毫秒");
log.info("建立索引共耗时{}毫秒",endTime-startTime);
indexWriter.commit();
log.info("{},{}", luceneLogDto.getDevice_code(), luceneLogDto.getContent());
//步骤八：关闭资源
// indexWriter.close();
// System.out.println("建立索引成功-----关闭资源");
MDC.put("DEVICECODE", luceneLogDto.getDevice_code());
}catch (Exception e) {
e.printStackTrace();
// 删除所有的索引
// indexWriter.deleteAll();
indexWriter.close();
log.error(e.getMessage(),e);
}finally {
// MDC.remove("DEVICECODE");
}
}
@Override
public void interfaceExecuteLog(LuceneLogDto luceneLogDto) {
}
@Override

23
acs/nladmin-system/src/main/java/org/nl/modules/lucence/service/impl/LuceneServiceImpl.java
View File

@@ -5,6 +5,7 @@ import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.modules.lucence.common.Searcher;
import org.nl.modules.lucence.service.LuceneService;
import org.springframework.beans.factory.annotation.Value;
@@ -16,6 +17,7 @@ import java.util.Map;
@Service
@RequiredArgsConstructor
@Slf4j
public class LuceneServiceImpl implements LuceneService {
@Value("${loki.url}")
@@ -65,17 +67,18 @@ public class LuceneServiceImpl implements LuceneService {
@Override
public Map<String, Object> getAll(Map whereJson, Pageable page) {
JSONObject jsonObject1 = new JSONObject();
try {
jsonObject1 = (JSONObject) Searcher.search(luceneUrl, "",whereJson);
} catch (Exception e) {
e.printStackTrace();
}
JSONArray array = jsonObject1.getJSONArray("content");
int totalElements = Integer.parseInt(jsonObject1.get("totalElements").toString());
JSONObject jo = new JSONObject();
jo.put("content", array);
jo.put("totalElements", totalElements);
try {
JSONObject jsonObject = (JSONObject) Searcher.search(luceneUrl, "", whereJson);
JSONArray array = jsonObject.getJSONArray("content");
int totalElements = Integer.parseInt(jsonObject.get("totalElements").toString());
jo.put("content", array);
jo.put("totalElements", totalElements);
} catch (Exception e) {
log.error("索引查询为空", e);
throw new NullPointerException("索引查询为空");
}
return jo;
}

588
acs/nladmin-ui/src/views/monitor/lucene/index.vue
View File

@@ -1,555 +1,109 @@
<template>
<div class="app-container">
<!--工具栏-->
<div class="head-container">
<div v-if="crud.props.searchToggle">
<!-- 搜索 -->
<el-input
v-model="query.task_code"
size="small"
clearable
placeholder="输入任务号"
style="width: 200px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
<el-input
v-if="false"
v-model="query.is_over"
value="1"
size="small"
clearable
placeholder="输入任务号"
style="width: 200px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
<el-input
v-model="query.vehicle_code"
size="small"
clearable
placeholder="输入载具号"
style="width: 200px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
<el-select
v-model="query.material_type"
clearable
filterable
size="small"
placeholder="物料类型"
class="filter-item"
style="width: 190px"
@change="crud.toQuery"
>
<el-option v-for="item in materialList" :key="item.id" :label="item.label" :value="item.value" />
</el-select>
<el-select
v-model="query.status"
clearable
filterable
size="small"
placeholder="任务状态"
class="filter-item"
style="width: 190px"
@change="crud.toQuery"
>
<el-option v-for="item in dict.task_status" :key="item.id" :label="item.label" :value="item.value" />
</el-select>
<el-input
v-model="query.point_code"
size="small"
clearable
placeholder="输入起点或终点"
style="width: 200px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
<Search />
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission" />
<!--表单组件-->
<el-dialog
:close-on-click-modal="false"
:before-close="crud.cancelCU"
:visible.sync="crud.status.cu > 0"
:title="crud.status.title"
width="500px"
>
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
<el-form-item v-if="false" label="任务标识" prop="task_id">
<el-input v-model="form.task_id" style="width: 370px;" />
</el-form-item>
<el-form-item label="物料类型">
<el-select
v-model="form.material"
style="width: 370px;"
filterable
placeholder="请选择"
>
<el-option
v-for="item in dict.material_type"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="路由方案">
<el-select
v-model="form.route_plan_code"
style="width: 370px;"
filterable
placeholder="请选择"
default-first-option
>
<el-option
v-for="item in routeList"
:key="item.plan_code"
:label="item.plan_name"
:value="item.plan_code"
/>
</el-select>
</el-form-item>
<el-form-item label="起点" prop="start_point_code">
<el-select
v-model="form.start_point_code"
style="width: 370px;"
filterable
placeholder="请选择"
@change="showStartStorage"
>
<el-option
v-for="item in deviceList"
:key="item.device_code"
:label="item.device_name"
:value="item.device_code"
/>
</el-select>
</el-form-item>
<el-form-item v-show="start_flag" label="起点-列" prop="from_y">
<el-select
v-model="form.from_y"
style="width: 370px;"
filterable
placeholder="请选择"
>
<el-option
v-for="item in fromYList"
:key="item.id"
:label="item.value"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item v-show="start_flag" label="起点-层" prop="from_z">
<el-select
v-model="form.from_z"
style="width: 370px;"
filterable
placeholder="请选择"
>
<el-option
v-for="item in fromZList"
:key="item.id"
:label="item.value"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item label="终点" prop="next_point_code">
<el-select
v-model="form.next_point_code"
style="width: 370px;"
filterable
placeholder="请选择"
@change="showEndStorage"
>
<el-option
v-for="item in deviceList"
:key="item.device_code"
:label="item.device_name"
:value="item.device_code"
/>
</el-select>
</el-form-item>
<el-form-item v-show="end_flag" label="终点-列" prop="to_y">
<el-select
v-model="form.to_y"
style="width: 370px;"
filterable
placeholder="请选择"
>
<el-option
v-for="item in toYList"
:key="item.id"
:label="item.value"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item v-show="end_flag" label="终点-层" prop="to_z">
<el-select
v-model="form.to_z"
style="width: 370px;"
filterable
placeholder="请选择"
>
<el-option
v-for="item in toZList"
:key="item.id"
:label="item.value"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item label="优先级">
<el-input v-model="form.priority" style="width: 370px;" />
</el-form-item>
<el-form-item label="载具号">
<el-input v-model="form.vehicle_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="描述信息" prop="description">
<el-input v-model="form.remark" style="width: 380px;" rows="5" type="textarea" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
</div>
</el-dialog>
<!--表格渲染-->
<el-table
ref="table"
v-loading="crud.loading"
:data="crud.data"
size="small"
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column v-if="false" prop="task_id" label="任务标识" />
<el-table-column prop="task_code" label="任务号" />
<el-table-column prop="vehicle_code" label="载具号" />
<el-table-column prop="task_status" label="任务状态">
<template slot-scope="scope">
<span v-if="scope.row.task_status=='0' ">就绪</span>
<span v-if="scope.row.task_status=='1' ">执行中</span>
<span v-if="scope.row.task_status=='2' ">完成</span>
</template>
</el-table-column>
<el-table-column prop="priority" label="任务优先级" />
<el-table-column prop="start_point_code" label="起点" />
<el-table-column prop="next_point_code" label="终点" />
<el-table-column prop="matarial" label="物料" />
<el-table-column prop="quantity" label="数量" />
<el-table-column prop="remark" label="备注" />
<el-table-column prop="create_by" label="创建者" />
<el-table-column prop="create_time" label="创建时间" width="135" />
</el-table>
<!--分页组件-->
<pagination />
<Search />
<crudOperation />
</div>
<!--表格渲染-->
<el-table
ref="table"
v-loading="crud.loading"
:data="crud.data"
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<!-- <el-table-column type="selection" width="55"/>-->
<!-- <el-table-column v-if="false" prop="id" label="id"/>-->
<el-table-column prop="operate" width="50" label="操作" />
<el-table-column prop="device_code" label="设备号" />
<el-table-column prop="task_code" label="任务编号" />
<el-table-column prop="instruct_code" label="指令编号" />
<el-table-column prop="method" label="方法" />
<el-table-column prop="status_code" label="状态码" />
<el-table-column prop="requestparam" label="请求参数" />
<el-table-column prop="responseparam" label="返回参数" />
<el-table-column prop="logTime" width="170" label="记录时间" />
<el-table-column prop="content" width="500" label="内容详情" />
</el-table>
<!--分页组件-->
<pagination />
</div>
</template>
<script>
import Search from '@/views/monitor/lucene/time'
import crudTask from '@/views/monitor/lucene/api/lucene'
import CRUD, { crud, form, header, presenter } from '@crud/crud'
import Search from './search'
import CRUD, { crud, header, presenter } from '@crud/crud'
import crudOperation from '@crud/CRUD.operation'
import pagination from '@crud/Pagination'
import deviceCrud from '@/api/acs/device/device'
import routeCurd from '@/api/acs/route/routePlan'
import { getDicts } from '@/api/system/dict'
import { delAll } from '@/api/acs/lucene/log'
const defaultForm = {
task_id: null,
vehicle_code: null,
vehicle_type: null,
task_type: null,
task_status: null,
priority: 0,
start_point_code: null,
start_device_code: null,
next_point_code: null,
remark: null,
material: null,
route_plan_code: 'normal',
from_x: null,
from_y: null,
from_z: null,
to_x: null,
to_y: null,
to_z: null
}
export default {
name: 'Task',
components: { pagination, crudOperation, Search },
dicts: ['task_status'],
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
name: 'LuceneLog',
components: { Search, pagination, crudOperation },
mixins: [presenter(), header(), crud()],
cruds: function() {
return CRUD({
title: '任务',
url: 'api/lucene//getAll',
idField: 'task_id',
sort: 'task_id,desc',
query: { is_over: '1' },
crudMethod: { ...crudTask },
optShow: {}
title: '系统参数', url: 'api/lucene/getAll', idField: 'id', sort: 'id,desc',
queryOnPresenterCreated: true,
optShow: {
add: false,
edit: false,
del: false,
download: false
},
page: {
size: 40,
total: 0,
page: 0
},
query: {
createTime: [new Date(new Date().setTime(new Date().getTime() - 3600 * 1000 * 24)), new Date()]
}
})
},
data() {
const checkFromY = (rule, value, callback) => {
if (this.start_flag) {
if (!value) {
callback(new Error('请选择起点-列！'))
} else {
callback()
}
} else {
callback()
}
}
const checkFromZ = (rule, value, callback) => {
if (this.start_flag) {
if (!value) {
callback(new Error('请选择起点-层！'))
} else {
callback()
}
} else {
callback()
}
}
const checkToY = (rule, value, callback) => {
if (this.end_flag) {
if (!value) {
callback(new Error('请选择终点-列！'))
} else {
callback()
}
} else {
callback()
}
}
const checkToZ = (rule, value, callback) => {
if (this.end_flag) {
if (!value) {
callback(new Error('请选择终点-列！'))
} else {
callback()
}
} else {
callback()
}
}
return {
deviceList: [],
materialList: [],
statusList: [],
routeList: [],
fromYList: [],
fromZList: [],
toYList: [],
toZList: [],
start_flag: false,
end_flag: false,
query: { blurry: '123' },
permission: {
add: ['admin', 'task:add'],
edit: ['admin', 'task:edit'],
del: ['admin', 'task:del']
add: ['admin', 'param:add'],
edit: ['admin', 'param:edit'],
del: ['admin', 'param:del']
},
rules: {
start_point_code: [
{ required: true, message: '起点不能为空', trigger: 'change' }
],
next_point_code: [
{ required: true, message: '终点不能为空', trigger: 'change' }
],
from_y: [
{ validator: checkFromY, trigger: 'change' }
],
from_z: [
{ validator: checkFromZ, trigger: 'change' }
],
to_y: [
{ validator: checkToY, trigger: 'change' }
],
to_z: [
{ validator: checkToZ, trigger: 'change' }
]
}
}
},
watch: {
rangeDate: function(newVal, oldVal) {
if (newVal !== null) {
this.tableParams.beginDate = newVal[0]
this.tableParams.endDate = newVal[1]
} else {
this.tableParams.beginDate = null
this.tableParams.endDate = null
}
rules: {}
}
},
created() {
deviceCrud.selectDeviceList().then(data => {
this.deviceList = data
})
routeCurd.selectList().then(data => {
this.routeList = data
})
getDicts().then(data => {
this.dicts = data
})
this.query.a = 111
},
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
return true
},
finish(index, row) {
crudTask.finish(row.task_id).then(res => {
this.crud.toQuery()
this.crud.notify('完成成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
}).catch(err => {
console.log(err.response.data.message)
})
},
cancel(index, row) {
crudTask.cancel(row.task_id).then(res => {
this.crud.toQuery()
this.crud.notify('取消成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
}).catch(err => {
console.log(err.response.data.message)
})
},
beforeHandleCommand(index, row, command) {
return {
'index': index,
'row': row,
'command': command
}
},
handleCommand(command) {
switch (command.command) {
case 'a':// 完成
this.finish(command.index, command.row)
break
case 'b':// 取消
this.cancel(command.index, command.row)
break
}
},
showStartStorage(val) {
let obj = {}
obj = this.deviceList.find((item) => {
return item.device_code === val
})
if (obj.device_type === 'storage') {
this.start_flag = true
let storage_obj = {}
deviceCrud.queryStorageExtra(obj.device_code).then(data => {
storage_obj = data
const n1 = storage_obj.minY
const n2 = storage_obj.maxY
const m1 = storage_obj.minZ
const m2 = storage_obj.maxZ
const from_y = []
const from_z = []
for (let i = n1; i <= n2; i++) {
const y = {}
if (i < 10) {
y.id = '0' + i
} else {
y.id = i
}
y.value = i + '列'
from_y.push(y)
}
for (let i = m1; i <= m2; i++) {
const z = {}
if (i < 10) {
z.id = '0' + i
} else {
z.id = i
}
z.value = i + '层'
from_z.push(z)
}
this.fromYList = from_y
this.fromZList = from_z
this.form.from_x = storage_obj.tunnel
confirmDelAll() {
this.$confirm(`确认清空所有操作日志吗?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.crud.delAllLoading = true
delAll('device_execute').then(res => {
this.crud.delAllLoading = false
this.crud.dleChangePage(1)
this.crud.delSuccessNotify()
this.crud.toQuery()
}).catch(err => {
this.crud.delAllLoading = false
console.log(err.response.data.message)
})
} else {
this.start_flag = false
this.form.from_x = ''
this.form.from_y = ''
this.form.from_z = ''
}
},
showEndStorage(val) {
let obj = {}
obj = this.deviceList.find((item) => {
return item.device_code === val
}).catch(() => {
})
if (obj.device_type === 'storage') {
this.end_flag = true
let storage_obj = {}
deviceCrud.queryStorageExtra(obj.device_code).then(data => {
storage_obj = data
const n1 = storage_obj.minY
const n2 = storage_obj.maxY
const m1 = storage_obj.minZ
const m2 = storage_obj.maxZ
const to_y = []
const to_z = []
for (let i = n1; i <= n2; i++) {
const y = {}
if (i < 10) {
y.id = '0' + i
} else {
y.id = i
}
y.value = i + '列'
to_y.push(y)
}
for (let i = m1; i <= m2; i++) {
const z = {}
if (i < 10) {
z.id = '0' + i
} else {
z.id = i
}
z.value = i + '层'
to_z.push(z)
}
this.toYList = to_y
this.toZList = to_z
this.form.to_x = storage_obj.tunnel
})
} else {
this.end_flag = false
this.form.to_x = ''
this.form.to_y = ''
this.form.to_z = ''
}
}
}
}
</script>
<style scoped>
.el-dropdown-link {
cursor: pointer;
color: #409EFF;
}
.el-icon-arrow-down {
font-size: 12px;
}
</style>

107
acs/nladmin-ui/src/views/monitor/lucene/indexOld.vue
View File

@@ -1,107 +0,0 @@
<template>
<div class="app-container">
<div class="head-container">
<Search />
<crudOperation />
</div>
<!--表格渲染-->
<el-table
ref="table"
v-loading="crud.loading"
:data="crud.data"
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<!-- <el-table-column type="selection" width="55"/>-->
<!-- <el-table-column v-if="false" prop="id" label="id"/>-->
<el-table-column prop="operate" width="50" label="操作" />
<el-table-column prop="device_code" label="设备号" />
<el-table-column prop="task_code" label="任务编号" />
<el-table-column prop="instruct_code" label="指令编号" />
<el-table-column prop="logTime" width="170" label="记录时间" />
<el-table-column prop="content" width="500" label="内容详情" />
</el-table>
<!--分页组件-->
<pagination />
</div>
</template>
<script>
import Search from './search'
import CRUD, { crud, header, presenter } from '@crud/crud'
import crudOperation from '@crud/CRUD.operation'
import pagination from '@crud/Pagination'
import { delAll } from '@/api/acs/lucene/log'
/* const start = new Date() */
export default {
name: 'LuceneLog',
components: { Search, pagination, crudOperation },
mixins: [presenter(), header(), crud()],
cruds() {
return CRUD({
title: '系统参数', url: 'api/lucene/getAll', idField: 'id', sort: 'id,desc',
queryOnPresenterCreated: false,
optShow: {
add: false,
edit: false,
del: false,
download: false
},
page: {
size: 40,
total: 0,
page: 0
},
query: {
/* createTime: [start.setTime(start.getTime() - 3600 * 1000 * 0.5), new Date()] */
/* createTime: [start, new Date()] */
}
})
},
data() {
return {
query: { blurry: '123' },
permission: {
add: ['admin', 'param:add'],
edit: ['admin', 'param:edit'],
del: ['admin', 'param:del']
},
rules: {}
}
},
created() {
},
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
return true
},
confirmDelAll() {
this.$confirm(`确认清空所有操作日志吗?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.crud.delAllLoading = true
delAll('device_execute').then(res => {
this.crud.delAllLoading = false
this.crud.dleChangePage(1)
this.crud.delSuccessNotify()
this.crud.toQuery()
}).catch(err => {
this.crud.delAllLoading = false
console.log(err.response.data.message)
})
}).catch(() => {
})
}
}
}
</script>
<style scoped>
</style>

35
acs/nladmin-ui/src/views/monitor/lucene/search.vue
View File

@@ -8,11 +8,43 @@
style="width: 200px;"
class="filter-item"
/>
<el-input
v-model="query.method"
clearable
size="small"
placeholder="请输入你要搜索的方法名"
style="width: 200px;"
class="filter-item"
/>
<el-input
v-model="query.status_code"
clearable
size="small"
placeholder="请输入你要搜索的状态码"
style="width: 200px;"
class="filter-item"
/>
<el-input
v-model="query.requestparam"
clearable
size="small"
placeholder="请输入你要搜索的请求参数"
style="width: 200px;"
class="filter-item"
/>
<el-input
v-model="query.responseparam"
clearable
size="small"
placeholder="请输入你要搜索的返回参数"
style="width: 200px;"
class="filter-item"
/>
<el-input
v-model="query.blurry"
clearable
size="small"
placeholder="请输入你要搜索的内容"
placeholder="请输入你要搜索的内容详情"
style="width: 200px;"
class="filter-item"
/>
@@ -23,6 +55,7 @@
<el-date-picker
v-model="query.createTime"
type="datetimerange"
format="yyyy-MM-dd HH:mm:ss"
:picker-options="pickerOptions"
range-separator="至"
start-placeholder="开始日期"