add lucene

wcs/nladmin-system/pom.xml

@@ -29,6 +29,7 @@
         <!-- oshi监控需要指定jna版本, 问题详见 https://github.com/oshi/oshi/issues/1040 -->
         <jna.version>5.9.0</jna.version>
         <configuration.version>1.9</configuration.version>
+        <lucene.version>8.2.0</lucene.version>
     </properties>
 
     <dependencies>
@@ -415,6 +416,41 @@
             <artifactId>UserAgentUtils</artifactId>
             <version>1.21</version>
         </dependency>
+
+        <!-- Lucence核心包 -->
+        <dependency>
+            <groupId>org.apache.lucene</groupId>
+            <artifactId>lucene-core</artifactId>
+            <version>${lucene.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.lucene</groupId>
+            <artifactId>lucene-highlighter</artifactId>
+            <version>${lucene.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.lucene</groupId>
+            <artifactId>lucene-analyzers-common</artifactId>
+            <version>${lucene.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.magese</groupId>
+            <artifactId>ik-analyzer</artifactId>
+            <version>${lucene.version}</version>
+        </dependency>
+
+        <!--支持中文分词  -->
+        <dependency>
+            <groupId>org.apache.lucene</groupId>
+            <artifactId>lucene-analyzers-smartcn</artifactId>
+            <version>${lucene.version}</version>
+        </dependency>
+        <!-- Lucene查询解析包 -->
+        <dependency>
+            <groupId>org.apache.lucene</groupId>
+            <artifactId>lucene-queryparser</artifactId>
+            <version>${lucene.version}</version>
+        </dependency>
     </dependencies>
 
     <distributionManagement>

wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_device/HailiangSpecialDeviceDriver.java

@@ -27,6 +27,8 @@ import org.nl.acs.monitor.DeviceStageMonitor;
 import org.nl.acs.opc.Device;
 import org.nl.acs.order.service.ProduceshiftorderService;
 import org.nl.acs.order.service.dto.ProduceshiftorderDto;
+import org.nl.modules.lucene.service.LuceneExecuteLogService;
+import org.nl.modules.lucene.service.dto.LuceneLogDto;
 import org.nl.modules.wql.util.SpringContextHolder;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -49,7 +51,7 @@ public class HailiangSpecialDeviceDriver extends AbstractOpcDeviceDriver impleme
     ProduceshiftorderService produceshiftorderService = SpringContextHolder.getBean(ProduceshiftorderService.class);
     @Autowired
     DeviceErrorLogService deviceErrorLogService = SpringContextHolder.getBean(DeviceErrorLogServiceImpl.class);
-
+    LuceneExecuteLogService luceneExecuteLogService = SpringContextHolder.getBean("luceneExecuteLogServiceImpl");
     int mode = 0;
     int error = 0;
     int now_one_box_num = 0;
@@ -107,6 +109,7 @@ public class HailiangSpecialDeviceDriver extends AbstractOpcDeviceDriver impleme
 
             if (mode != last_mode) {
                 feedDeviceStatusFlag = false;
+                luceneExecuteLogService.deviceExecuteLog(new LuceneLogDto(this.getDevice().getOpc_server_code(), this.getDevice().getOpc_plc_code(), this.device_code, ItemProtocol.item_mode, String.valueOf(this.last_mode), String.valueOf(this.mode)));
                 logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode);
             }
 

wcs/nladmin-system/src/main/java/org/nl/modules/logging/DeviceCodeDir.java

@@ -0,0 +1,23 @@
+package org.nl.modules.logging;
+
+import ch.qos.logback.core.PropertyDefinerBase;
+import org.springframework.stereotype.Component;
+
+// 通过实现logback的PropertyDefinerBase方法,动态定义logback配置中的变量
+@Component
+public class DeviceCodeDir extends PropertyDefinerBase {
+
+    String deviceCodeDir = "";
+    public void setPropertyValue(String deviceCode) {
+        deviceCodeDir = deviceCode ;
+    }
+
+    @Override
+    public String getPropertyValue() {
+        if (deviceCodeDir == ""){
+            deviceCodeDir = "默认";
+        }
+        return "默认";
+    }
+
+}

wcs/nladmin-system/src/main/java/org/nl/modules/lucene/common/Indexer.java

@@ -0,0 +1,178 @@
+package org.nl.modules.lucene.common;
+
+import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.io.FileUtils;
+import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.TextField;
+import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.index.IndexWriterConfig;
+import org.apache.lucene.store.Directory;
+import org.apache.lucene.store.FSDirectory;
+import org.springframework.beans.factory.annotation.Value;
+import org.wltea.analyzer.lucene.IKAnalyzer;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.nio.file.Paths;
+import java.util.Set;
+
+/**
+ * lucene索引器
+ */
+public class Indexer {
+    /**
+     * 写索引实例
+     */
+    private IndexWriter writer;
+
+    public IndexWriter getWriter() {
+        return writer;
+    }
+
+    /**
+     * 构造方法，实例化IndexWriter
+     * @param indexDir
+     * @throws Exception
+     */
+    public Indexer(String indexDir) throws Exception {
+        Directory dir = FSDirectory.open(Paths.get(indexDir));
+        //标准分词器，会自动去掉空格啊，is a the等单词
+//        Analyzer analyzer = new StandardAnalyzer();
+        Analyzer analyzer = new IKAnalyzer();
+        //将标准分词器配到写索引的配置中
+        IndexWriterConfig config = new IndexWriterConfig(analyzer);
+        //实例化写索引对象
+        writer = new IndexWriter(dir, config);
+    }
+
+    /**
+     * 索引指定目录下的所有文件
+     * @param dataDir
+     * @return
+     * @throws Exception
+     */
+    public int indexAll(String dataDir) throws Exception {
+        // 获取该路径下的所有文件
+        File[] files = new File(dataDir).listFiles();
+        if (null != files) {
+            for (File file : files) {
+                //调用下面的indexFile方法，对每个文件进行索引
+                indexFile(file);
+            }
+        }
+        //返回索引的文件数
+//        return writer.numDocs();
+        return writer.numRamDocs();
+    }
+
+    /**
+     * 索引指定的文件
+     * @param file
+     * @throws Exception
+     */
+    private void indexFile(File file) throws Exception {
+        System.out.println("索引文件的路径：" + file.getCanonicalPath());
+        //调用下面的getDocument方法，获取该文件的document
+        Document doc = getDocument(file);
+        //添加索引文档
+        //Document doc = json2Doc(jsonDoc);
+//        Document doc = new Document();
+//        doc.add(new TextField("content", jsonDoc, Field.Store.YES));
+        Field fieldContent=new TextField("fieldContent", FileUtils.readFileToString(null,"UTF-8"), Field.Store.YES);
+
+        //将doc添加到索引中
+        writer.addDocument(doc);
+    }
+
+    /**
+     * 获取文档，文档里再设置每个字段，就类似于数据库中的一行记录
+     * @param file
+     * @return
+     * @throws Exception
+     */
+    private Document getDocument(File file) throws Exception {
+        Document doc = new Document();
+        //开始添加字段
+        //添加内容
+        doc.add(new TextField("contents", new FileReader(file)));
+        //添加文件名，并把这个字段存到索引文件里
+        doc.add(new TextField("fileName", file.getName(), Field.Store.YES));
+        //添加文件路径
+        doc.add(new TextField("fullPath", file.getCanonicalPath(), Field.Store.YES));
+        return doc;
+    }
+    public Document json2Doc(String strDoc) {
+        Document doc = new Document();
+        JSONObject jsonDoc = JSONObject.parseObject(strDoc);
+        Set<String> keys = jsonDoc.keySet();
+        for (String key : keys) {
+            doc.add(new TextField(key, jsonDoc.getString(key), Field.Store.YES));
+        }
+        return doc;
+    }
+
+    public void addLogIndex(String msg) throws IOException {
+        //步骤一：创建Directory对象，用于指定索引库的位置    RAMDirectory内存
+        Directory directory = FSDirectory.open(new File("D:\\lucene\\index").toPath());
+        //步骤二：创建一个IndexWriter对象，用于写索引
+//        Analyzer analyzer = new StandardAnalyzer();
+        IndexWriter indexWriter=new IndexWriter(directory,new IndexWriterConfig(new IKAnalyzer(false)));
+//        indexWriter.deleteAll();//清理所有索引库
+//        IndexWriter indexWriter=new IndexWriter(directory,new IndexWriterConfig(new StandardAnalyzer()));
+        //记录索引开始时间
+        long startTime = System.currentTimeMillis();
+        //步骤三：读取磁盘中文件，对应每一个文件创建一个文档对象
+        Document document = new Document();
+//        document.add(new TextField("fieldContent", device_id, Field.Store.YES));
+        document.add(new TextField("fieldContent", msg, Field.Store.YES));
+        indexWriter.addDocument(document);
+        //记录索引结束时间
+        long endTime = System.currentTimeMillis();
+        System.out.println("建立索引"+ "共耗时" + (endTime-startTime) + "毫秒");
+        indexWriter.commit();
+        //步骤八：关闭资源
+        indexWriter.close();
+        System.out.println("建立索引成功-----关闭资源");
+    }
+    //系统的日志文件路径
+    @Value("${logging.file.path}")
+    private String logUrl;
+
+    public static void main(String[] args)throws IOException {
+        //步骤一：创建Directory对象，用于指定索引库的位置    RAMDirectory内存
+        Directory directory = FSDirectory.open(new File("D:\\lucene\\index").toPath());
+        //步骤二：创建一个IndexWriter对象，用于写索引
+//        Analyzer analyzer = new StandardAnalyzer();
+       IndexWriter indexWriter=new IndexWriter(directory,new IndexWriterConfig(new IKAnalyzer(false)));
+
+       indexWriter.deleteAll();//清理所有索引库
+//        IndexWriter indexWriter=new IndexWriter(directory,new IndexWriterConfig(new StandardAnalyzer()));
+        //记录索引开始时间
+        long startTime = System.currentTimeMillis();
+        //步骤三：读取磁盘中文件，对应每一个文件创建一个文档对象
+        File file=new File("D:\\testlog");
+        //步骤四：获取文件列表
+        File[] files = file.listFiles();
+        for (File item:files) {
+            BufferedReader bufferedReader = new BufferedReader(new FileReader(item));
+            String strLine = null;
+            while(null != (strLine = bufferedReader.readLine())){
+                Document document = new Document();
+//                document.add(new Field());
+                document.add(new TextField("fieldContent", strLine, Field.Store.YES));
+                indexWriter.addDocument(document);
+            }
+        }
+        //记录索引结束时间
+        long endTime = System.currentTimeMillis();
+        System.out.println("建立索引"+ "共耗时" + (endTime-startTime) + "毫秒");
+        indexWriter.commit();
+        //步骤八：关闭资源
+        indexWriter.close();
+        System.out.println("建立索引成功-----关闭资源");
+    }
+}

wcs/nladmin-system/src/main/java/org/nl/modules/lucene/common/LuceneIndexWriter.java

@@ -0,0 +1,66 @@
+package org.nl.modules.lucene.common;
+
+import cn.hutool.core.date.DateUtil;
+import org.apache.lucene.index.CorruptIndexException;
+import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.index.IndexWriterConfig;
+import org.apache.lucene.store.Directory;
+import org.apache.lucene.store.FSDirectory;
+import org.nl.modules.lucene.config.UrlConfig;
+import org.wltea.analyzer.lucene.IKAnalyzer;
+
+import java.io.File;
+import java.io.IOException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class LuceneIndexWriter {
+    private static IndexWriter indexWriter;
+
+    static {
+        try {
+            Directory directory = FSDirectory.open(new File(UrlConfig.luceneUrl).toPath());
+            IndexWriterConfig config = new IndexWriterConfig(new IKAnalyzer());
+            indexWriter = new IndexWriter(directory, config);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        /**当当前线程结束时，自动关闭IndexWriter，使用Runtime对象*/
+        Runtime.getRuntime().addShutdownHook(new Thread(){
+            @Override
+            public void run() {
+                try {
+                    closeIndexWriter();
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        });
+    }
+    /**在线程结束时，自动关闭IndexWriter*/
+    public static IndexWriter getIndexWriter() {
+        return indexWriter;
+    }
+    /**关闭IndexWriter
+     * @throws IOException
+     * @throws CorruptIndexException */
+    public static void closeIndexWriter() throws Exception {
+        if(indexWriter != null) {
+            indexWriter.close();
+        }
+    }
+
+    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);
+        timeString = DateUtil.format(date, "yyyy-MM-dd HH:mm:ss.SSS");//格式化后的时间
+        return timeString;
+    }
+
+
+}

wcs/nladmin-system/src/main/java/org/nl/modules/lucene/common/Searcher.java

@@ -0,0 +1,140 @@
+package org.nl.modules.lucene.common;
+
+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.document.Document;
+import org.apache.lucene.index.DirectoryReader;
+import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.Term;
+import org.apache.lucene.search.*;
+import org.apache.lucene.store.Directory;
+import org.apache.lucene.store.FSDirectory;
+import org.apache.lucene.util.BytesRef;
+
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * lucene查询器
+ */
+@Slf4j
+public class Searcher {
+
+    public static Map<String, Object> search(String indexDir, String ext,Map whereJson) throws Exception {
+        //获取要查询的路径，也就是索引所在的位置
+        Directory dir = FSDirectory.open(Paths.get(indexDir));
+        IndexReader reader = DirectoryReader.open(dir);
+        //构建IndexSearcher
+        IndexSearcher searcher = new IndexSearcher(reader);
+        //标准分词器，会自动去掉空格啊，is a the等单词
+//        Analyzer analyzer = new StandardAnalyzer();
+//        Analyzer analyzer = new IKAnalyzer(false);
+        //查询解析器
+//        QueryParser queryParser = new QueryParser("fieldContent", analyzer);
+
+        //记录索引开始时间
+        long startTime = System.currentTimeMillis();
+        // 实际上Lucene本身不支持分页。因此我们需要自己进行逻辑分页。我们要准备分页参数：
+        int pageSize = Integer.parseInt(whereJson.get("size").toString());// 每页条数
+        int pageNum = Integer.parseInt(whereJson.get("page").toString());// 当前页码
+        int start = pageNum * pageSize;// 当前页的起始条数
+        int end = start + pageSize;// 当前页的结束条数（不能包含）
+        // 创建排序对象,需要排序字段SortField，参数：字段的名称、字段的类型、是否反转如果是false，升序。true降序
+        Sort sort = new Sort(new SortField("logTime", SortField.Type.DOC,true));
+
+        TopDocs docs = null;
+        BooleanQuery.Builder booleanQueryBuilder = new BooleanQuery.Builder();
+        //时间范围查询
+        String startDate = (String) whereJson.get("begin_time");
+        String endDate = (String) whereJson.get("end_time");
+        Calendar calendar=Calendar.getInstance();
+        calendar.set(1970, 0, 1);
+        if (startDate == null){
+            startDate = DateUtil.format(calendar.getTime(),"yyyy-MM-dd HH:mm:ss.SSS");
+        }else{
+            startDate = LuceneIndexWriter.getDate(startDate);
+        }
+        if (endDate == null){
+            endDate = DateUtil.format(new DateTime(),"yyyy-MM-dd HH:mm:ss.SSS");
+        } else {
+            endDate = LuceneIndexWriter.getDate(endDate);
+        }
+        TermRangeQuery termRangeQuery = new TermRangeQuery("logTime", new BytesRef(startDate), new BytesRef(endDate), true, true);
+        booleanQueryBuilder.add(termRangeQuery,BooleanClause.Occur.MUST);
+        if (whereJson.get("device_code") != null){
+            Query termQuery = new TermQuery(new Term("device_code", (String) whereJson.get("device_code")));
+            booleanQueryBuilder.add(termQuery,BooleanClause.Occur.MUST);
+        }
+        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("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);
+        }
+        docs = searcher.search(booleanQueryBuilder.build(), end,sort);
+        //记录索引时间
+        long endTime = System.currentTimeMillis();
+        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();
+
+        for (int i = start; i < end; i++) {
+            ScoreDoc scoreDoc = scoreDocs[i];
+            Document doc = reader.document(scoreDoc.doc);
+            JSONObject object = new JSONObject();
+            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);
+            }
+        }
+        for(Object logDto:array){
+            log.info(logDto.toString());
+        }
+        reader.close();
+        JSONObject jo = new JSONObject();
+        jo.put("content", array);
+        jo.put("totalElements", docs.totalHits.value);
+        return jo;
+    }
+
+    public static void main(String[] args) {
+        String indexDir = "D:\\lucene\\index";
+        //查询这个字符串
+        String q = "07.832";
+        Map whereJson = null;
+        try {
+            search(indexDir, q,whereJson);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}

wcs/nladmin-system/src/main/java/org/nl/modules/lucene/config/StaticConfig.java

@@ -0,0 +1,21 @@
+package org.nl.modules.lucene.config;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @deprecated 设置静态参数初始化
+ */
+@Configuration
+public class StaticConfig {
+    //日志索引目录
+    @Value("${lucene.index.path}")
+    private String luceneDir;
+
+    @Bean
+    public int initStatic() {
+        UrlConfig.setLuceneUrl(luceneDir);
+        return 0;
+    }
+}

wcs/nladmin-system/src/main/java/org/nl/modules/lucene/config/UrlConfig.java

@@ -0,0 +1,13 @@
+package org.nl.modules.lucene.config;
+
+public class UrlConfig {
+    public static String luceneUrl;
+
+    public static String getLuceneUrl() {
+        return luceneUrl;
+    }
+
+    public static void setLuceneUrl(String luceneUrl) {
+        UrlConfig.luceneUrl = luceneUrl;
+    }
+}

wcs/nladmin-system/src/main/java/org/nl/modules/lucene/enums/LogTypeEnum.java

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

wcs/nladmin-system/src/main/java/org/nl/modules/lucene/rest/LuceneController.java

@@ -0,0 +1,43 @@
+package org.nl.modules.lucene.rest;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.nl.modules.logging.annotation.Log;
+import org.nl.modules.lucene.service.LuceneService;
+import org.springframework.data.domain.Pageable;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+
+@RestController
+@RequiredArgsConstructor
+@Api(tags = "日志检索")
+@RequestMapping("/api/lucene")
+@Slf4j
+public class LuceneController {
+
+    private final LuceneService luceneService;
+
+    @GetMapping("/labels/values")
+    @ApiOperation("获取标签")
+    public ResponseEntity<Object> labelsValues() {
+        return new ResponseEntity<>(luceneService.getLabelsValues(), HttpStatus.OK);
+    }
+
+
+    @GetMapping("/getAll")
+    @Log("日志检索")
+    @ApiOperation("日志检索")
+    //@PreAuthorize("@el.check('task:list')")
+    public ResponseEntity<Object> get(@RequestParam Map whereJson, Pageable page) {
+        return new ResponseEntity<>(luceneService.getAll(whereJson, page), HttpStatus.OK);
+    }
+}

wcs/nladmin-system/src/main/java/org/nl/modules/lucene/service/LuceneExecuteLogService.java

@@ -0,0 +1,41 @@
+package org.nl.modules.lucene.service;
+
+
+import org.nl.modules.lucene.service.dto.LuceneLogDto;
+
+import java.io.IOException;
+
+public interface LuceneExecuteLogService {
+    /**
+     * 设备光电变化实时光电信号
+     *
+     * @param device_code 设备编号
+     * @param key         plc信号
+     * @param value       plc信号值
+     */
+    void deviceItemValue(String device_code, String key, String value);
+
+    /**
+     * 设备执行日志,会保留历史记录
+     *
+     * @param luceneLogDto  日志结果对象
+     */
+    void deviceExecuteLog(LuceneLogDto luceneLogDto);
+
+    /**
+     * 接口日志,会保留历史记录
+     *
+     * @param luceneLogDto  日志结果对象
+     */
+    void interfaceExecuteLog(LuceneLogDto luceneLogDto) throws IOException;
+
+    /**
+     * 设备执行日志,会保留历史记录
+     *
+     * @param name  日志名称
+     * @param message      日志信息
+     */
+    void extLog(String name, String message);
+
+
+}

wcs/nladmin-system/src/main/java/org/nl/modules/lucene/service/LuceneService.java

@@ -0,0 +1,24 @@
+package org.nl.modules.lucene.service;
+
+import com.alibaba.fastjson.JSONArray;
+import org.springframework.data.domain.Pageable;
+
+import java.util.Map;
+
+
+public interface LuceneService {
+    /**
+     * 获取labels和values树
+     * @return
+     */
+    JSONArray getLabelsValues();
+
+    /**
+     * 获取数据分页
+     *
+     * @param whereJson 条件
+     * @param page      分页参数
+     * @return Map<String, Object>
+     */
+    Map<String, Object> getAll(Map whereJson, Pageable page);
+}

wcs/nladmin-system/src/main/java/org/nl/modules/lucene/service/dto/LuceneLogDto.java

@@ -0,0 +1,85 @@
+package org.nl.modules.lucene.service.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class LuceneLogDto {
+
+    /* 日志标识 */
+    private String log_uuid;
+    /*日志类型*/
+    private String logType;
+    /*设备编号*/
+    private String device_code;
+    /*内容详情*/
+    private String content;
+
+    /* 任务编码 */
+    private String task_code;
+
+    /* 指令编码 */
+    private String instruct_code;
+
+    /* 任务标识 */
+    private String task_id;
+
+    /* 载具号 */
+    private String vehicle_code;
+
+    /* 备注 */
+    private String remark;
+
+    /* 日志类型 */
+    private String log_type;
+
+    /* 方法 */
+    private String method;
+
+    /* 请求参数 */
+    private String requestparam;
+
+    /* 响应参数 */
+    private String responseparam;
+
+    /* 请求地址 */
+    private String requesturl;
+
+    /* 状态码 */
+    private String status_code;
+
+    /* 是否删除 1:是；0：否 */
+    private String is_delete;
+
+    /* 创建者 */
+    private String create_by;
+
+    /* 创建时间  YYYY-MM-DD hh:mm:ss */
+    private String create_time;
+
+    /* 修改者 */
+    private String update_by;
+
+    /* 修改时间 */
+    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 String last_home,
+                        final String home) {
+        super();
+        this.device_code = device_code;
+        this.content = "信号 ["
+                + opc_server_code + "."
+                + opc_plc_code + "."
+                + device_code + "."
+                + to_home + "] 发生变更 "
+                + last_home + " -> "
+                + home;
+    }
+}

wcs/nladmin-system/src/main/java/org/nl/modules/lucene/service/impl/LuceneExecuteLogServiceImpl.java

@@ -0,0 +1,101 @@
+package org.nl.modules.lucene.service.impl;
+
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.StringField;
+import org.apache.lucene.index.IndexWriter;
+import org.nl.modules.lucene.common.LuceneIndexWriter;
+import org.nl.modules.lucene.enums.LogTypeEnum;
+import org.nl.modules.lucene.service.LuceneExecuteLogService;
+import org.nl.modules.lucene.service.dto.LuceneLogDto;
+import org.slf4j.MDC;
+import org.springframework.stereotype.Service;
+
+import java.io.IOException;
+
+/**
+ * @author jlm
+ * @description 服务实现
+ * @date 2023-04-11
+ */
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class LuceneExecuteLogServiceImpl implements LuceneExecuteLogService {
+
+    @Override
+    public void deviceItemValue(String device_code, String key, String value) {
+        String now = DateUtil.now();
+    }
+
+    @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();
+        try {
+            //记录索引开始时间
+            long startTime = System.currentTimeMillis();
+            //向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 StringField("fieldContent", luceneLogDto.getContent(), 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 StringField("requestparam", luceneLogDto.getRequestparam(), Field.Store.YES));
+            }
+            if (ObjectUtil.isNotEmpty(luceneLogDto.getResponseparam())) {
+                document.add(new StringField("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();
+            log.info("建立索引共耗时{}毫秒", endTime - startTime);
+            indexWriter.commit();
+            MDC.put("DEVICECODE", luceneLogDto.getDevice_code());
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+        }
+    }
+
+    @Override
+    public void extLog(String name, String message) {
+        try {
+            MDC.put(name, name);
+            log.info("{}", message);
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            MDC.remove(name);
+        }
+    }
+}

wcs/nladmin-system/src/main/java/org/nl/modules/lucene/service/impl/LuceneServiceImpl.java

@@ -0,0 +1,85 @@
+package org.nl.modules.lucene.service.impl;
+
+import cn.hutool.core.util.CharsetUtil;
+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.lucene.common.Searcher;
+import org.nl.modules.lucene.service.LuceneService;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class LuceneServiceImpl implements LuceneService {
+
+    @Value("${loki.url}")
+    private String lokiUrl;
+
+    @Value("${loki.systemName}")
+    private String systemName;
+
+    //日志索引目录
+    @Value("${lucene.index.path}")
+    private  String luceneUrl;
+
+    /**
+     * 获取labels和values树
+     *
+     * @return
+     */
+    @Override
+    public JSONArray getLabelsValues() {
+        JSONArray result = new JSONArray();
+        // 获取所有标签
+        String labelString = HttpUtil.get(lokiUrl + "/labels", CharsetUtil.CHARSET_UTF_8);
+        JSONObject parse = (JSONObject) JSONObject.parse(labelString);
+        JSONArray labels = parse.getJSONArray("data");
+        for (int i=0; i<labels.size(); i++) {
+            // 获取标签下的所有值
+            String valueString = HttpUtil.get(lokiUrl + "/label/" + labels.getString(i) + "/values", CharsetUtil.CHARSET_UTF_8);
+            JSONObject parse2 = (JSONObject) JSONObject.parse(valueString);
+            JSONArray values = parse2.getJSONArray("data");
+            JSONArray children = new JSONArray();
+            // 组成树形状态 两级
+            for (int j=0; j<values.size(); j++) {
+                JSONObject leaf = new JSONObject();
+                leaf.put("label", values.getString(j));
+                leaf.put("value", values.getString(j));
+                children.add(leaf);
+            }
+
+            JSONObject node = new JSONObject();
+            node.put("label", labels.getString(i));
+            node.put("value", labels.getString(i));
+            node.put("children", children);
+            result.add(node);
+        }
+        return result;
+    }
+
+    @Override
+    public Map<String, Object> getAll(Map whereJson, Pageable page) {
+        JSONObject jo = new JSONObject();
+        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;
+    }
+
+}

wcs/nladmin-system/src/main/resources/config/application-dev.yml

@@ -138,6 +138,9 @@ logging:
   file:
     path: D:\acs_log
   config: classpath:logback-spring.xml
+lucene:
+  index:
+    path: D:\lucene\index
 
 # Sa-Token配置
 sa-token:

wcs/nladmin-system/src/main/resources/config/application-prod.yml

@@ -142,6 +142,9 @@ logging:
   file:
     path: E:\acs_log
   config: classpath:logback-spring.xml
+lucene:
+  index:
+    path: D:\lucene\index
 
 # Sa-Token配置
 sa-token:

wcs/nladmin-system/src/main/resources/log/Lucene.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<included>
+    <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
+    <property name="LOG_HOME" value="${logPath}"/>
+    <define name="DEVICECODE" class="org.nl.modules.logging.DeviceCodeDir"/>
+    <!-- 按照每天生成日志文件 -->
+    <appender name="FILE_LUCENE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!--日志文件输出的文件名-->
+            <FileNamePattern>${LOG_HOME}/lucene/${DEVICECODE}/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <maxHistory>15</maxHistory>
+            <!--单个日志最大容量 至少10MB才能看得出来-->
+            <maxFileSize>200MB</maxFileSize>
+            <!--所有日志最多占多大容量-->
+            <totalSizeCap>2GB</totalSizeCap>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>${log.charset}</charset>
+        </encoder>
+
+    </appender>
+
+    <!--  <logger name="org.nl.start.Init" level="info" additivity="false">
+          <appender-ref ref="FILE3"/>
+      </logger>-->
+
+    <!-- 打印sql -->
+    <logger name="org.nl.modules.lucene.service.impl.LuceneExecuteLogServiceImpl" level="info" additivity="false">
+        <appender-ref ref="FILE_LUCENE"/>
+    </logger>
+</included>

wcs/nladmin-system/src/main/resources/logback-spring.xml

@@ -20,18 +20,7 @@ https://juejin.cn/post/6844903775631572999
     <property name="SYSTEM_NAME" value="${systemName}"/>
     <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
     <property name="LOG_HOME" value="${logPath}"/>
-    <!--引入默认的一些设置-->
+    <include resource="log/Lucene.xml"/>
-    <!--  <include resource="log/AutoCreateInst.xml"/>
-      <include resource="log/QueryAgvTaskStatus.xml"/>
-      <include resource="log/AgvFeedbackServiceImpl.xml"/>
-      <include resource="log/AgvLeaveServlet.xml"/>
-      <include resource="log/AcsToErp.xml"/>
-      <include resource="log/AcsToMes.xml"/>
-      <include resource="log/MesToAcs.xml"/>
-      <include resource="log/QueryXZAgvTaskStatus.xml"/>
-      -->
-    <!--    <include resource="log/QueryMagicAgvDeviceStatus.xml"/>-->
-    <!--FILE 10开始+1-->
     <include resource="log/OneNDCSocketConnectionAutoRun.xml"/>
     <include resource="log/NDCSocketConnectionAutoRun.xml"/>
     <include resource="log/AgvNdcOneDeviceDriver.xml"/>
@@ -42,12 +31,11 @@ https://juejin.cn/post/6844903775631572999
     <include resource="log/NDCAgvServiceImpl.xml"/>
 
 
-
     <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
         <withJansi>true</withJansi>
         <encoder>
             <pattern>${log.pattern}</pattern>
-<!--            <charset>${log.charset}</charset>-->
+            <!--            <charset>${log.charset}</charset>-->
         </encoder>
     </appender>
 
@@ -86,7 +74,9 @@ https://juejin.cn/post/6844903775631572999
         </http>
         <format>
             <label>
-                <pattern>system=${SYSTEM_NAME},level=%level,logType=%X{log_file_type:-logType},device=%X{device_code_log:-device}</pattern>
+                <pattern>
+                    system=${SYSTEM_NAME},level=%level,logType=%X{log_file_type:-logType},device=%X{device_code_log:-device}
+                </pattern>
             </label>
             <message>
                 <pattern>${log.pattern}</pattern>
@@ -120,21 +110,21 @@ https://juejin.cn/post/6844903775631572999
     <springProfile name="dev">
         <root level="info">
             <appender-ref ref="CONSOLE"/>
-            <appender-ref ref="lokiAppender" />
+            <appender-ref ref="lokiAppender"/>
             <appender-ref ref="asyncFileAppender"/>
         </root>
         <!--logmanage -->
         <logger name="org.nl.acs.log.service.impl.DeviceExecuteLogServiceImpl" level="info" additivity="false">
             <appender-ref ref="CONSOLE"/>
-            <appender-ref ref="lokiAppender" />
+            <appender-ref ref="lokiAppender"/>
         </logger>
         <logger name="jdbc.resultsettable" level="ERROR" additivity="false">
             <appender-ref ref="CONSOLE"/>
-            <appender-ref ref="lokiAppender" />
+            <appender-ref ref="lokiAppender"/>
         </logger>
         <logger name="org.openscada.opc.lib.da.Server" level="ERROR" additivity="false">
             <appender-ref ref="CONSOLE"/>
-            <appender-ref ref="lokiAppender" />
+            <appender-ref ref="lokiAppender"/>
         </logger>
         <!--logmanage -->
 
@@ -174,20 +164,20 @@ https://juejin.cn/post/6844903775631572999
     <springProfile name="prod">
         <root level="info">
             <appender-ref ref="ERROR"/>
-            <appender-ref ref="lokiAppender" />
+            <appender-ref ref="lokiAppender"/>
             <appender-ref ref="asyncFileAppender"/>
         </root>
         <!--logmanage -->
         <logger name="org.nl.acs.log.service.impl.DeviceExecuteLogServiceImpl" level="info" additivity="false">
-            <appender-ref ref="lokiAppender" />
+            <appender-ref ref="lokiAppender"/>
         </logger>
         <logger name="jdbc.resultsettable" level="ERROR" additivity="false">
             <appender-ref ref="CONSOLE"/>
-            <appender-ref ref="lokiAppender" />
+            <appender-ref ref="lokiAppender"/>
         </logger>
         <logger name="org.openscada.opc.lib.da.Server" level="ERROR" additivity="false">
             <appender-ref ref="CONSOLE"/>
-            <appender-ref ref="lokiAppender" />
+            <appender-ref ref="lokiAppender"/>
         </logger>
         <!--logmanage -->
 

wcs/nladmin-ui/src/views/acs/instruction/index.vue

@@ -146,11 +146,11 @@
             {{ dict.label.agv_system_type[scope.row.agv_system_type] }}
           </template>
         </el-table-column>
-<!--        <el-table-column prop="agv_inst_type" label="AGV任务类型" show-overflow-tooltip width="130">-->
+        <!--        <el-table-column prop="agv_inst_type" label="AGV任务类型" show-overflow-tooltip width="130">-->
-<!--          <template slot-scope="scope">-->
+        <!--          <template slot-scope="scope">-->
-<!--            {{ dict.label.agv_inst_type[scope.row.agv_inst_type] }}-->
+        <!--            {{ dict.label.agv_inst_type[scope.row.agv_inst_type] }}-->
-<!--          </template>-->
+        <!--          </template>-->
-<!--        </el-table-column>-->
+        <!--        </el-table-column>-->
         <el-table-column prop="remark" label="描述" show-overflow-tooltip width="100" />
         <el-table-column prop="create_by" label="创建者" show-overflow-tooltip width="100" />
         <el-table-column prop="create_time" label="创建时间" show-overflow-tooltip width="150" />

wcs/nladmin-ui/src/views/acs/order/index.vue

@@ -41,9 +41,9 @@
           style="width: 190px"
           @change="crud.toQuery"
         >
-          <el-option v-for="item in dict.order_status" :key="item.id" :label="item.label" :value="item.value"/>
+          <el-option v-for="item in dict.order_status" :key="item.id" :label="item.label" :value="item.value" />
         </el-select>
-        <rrOperation/>
+        <rrOperation />
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission">
@@ -79,22 +79,22 @@
       >
         <el-form ref="form" :model="form" :rules="rules" size="small" label-width="120px">
           <el-form-item label="生产总量" prop="qty">
-            <el-input v-model="form.qty" style="width: 370px;"/>
+            <el-input v-model="form.qty" style="width: 370px;" />
           </el-form-item>
           <el-form-item label="物料编码" prop="material_code">
-            <el-input v-model="form.material_code" style="width: 370px;"/>
+            <el-input v-model="form.material_code" style="width: 370px;" />
           </el-form-item>
           <el-form-item label="物料名称">
-            <el-input v-model="form.material_name" style="width: 370px;"/>
+            <el-input v-model="form.material_name" style="width: 370px;" />
           </el-form-item>
           <el-form-item label="规格型号">
-            <el-input v-model="form.material_spec" style="width: 370px;"/>
+            <el-input v-model="form.material_spec" style="width: 370px;" />
           </el-form-item>
           <el-form-item label="满框数量" prop="one_qty">
-            <el-input v-model="form.one_qty" style="width: 370px;"/>
+            <el-input v-model="form.one_qty" style="width: 370px;" />
           </el-form-item>
           <el-form-item label="托盘模板">
-            <el-input v-model="form.lane_tray_template" style="width: 370px;" @input="handleEdit"/>
+            <el-input v-model="form.lane_tray_template" style="width: 370px;" @input="handleEdit" />
           </el-form-item>
           <el-form-item label="生产设备" prop="device_code">
             <el-select
@@ -115,7 +115,7 @@
             </el-select>
           </el-form-item>
           <el-form-item v-if="form.device_code === 'A1_CPQXJ_01_S'" label="上料设备" prop="in_devices">
-            <el-input v-model="form.in_devices" placeholder="清洗上料时储料仓设备号,多个设备以,分割" style="width: 370px;"/>
+            <el-input v-model="form.in_devices" placeholder="清洗上料时储料仓设备号,多个设备以,分割" style="width: 370px;" />
           </el-form-item>
           <el-form-item label="agv搬运" prop="is_needmove">
             <el-radio-group v-model="form.is_needmove" size="mini">
@@ -130,10 +130,10 @@
             </el-radio-group>
           </el-form-item>
           <el-form-item label="装箱机编号" prop="ealing_device_code">
-            <el-input v-model="form.ealing_device_code" style="width: 370px;"/>
+            <el-input v-model="form.ealing_device_code" style="width: 370px;" />
           </el-form-item>
           <el-form-item label="开箱机编号" prop="unboxing_device_code">
-            <el-input v-model="form.unboxing_device_code" style="width: 370px;"/>
+            <el-input v-model="form.unboxing_device_code" style="width: 370px;" />
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
@@ -150,35 +150,35 @@
         style="width: 100%;"
         @selection-change="crud.selectionChangeHandler"
       >
-        <el-table-column type="selection" width="55"/>
+        <el-table-column type="selection" width="55" />
-        <el-table-column prop="order_code" label="工单编码" min-width="120" show-overflow-tooltip/>
+        <el-table-column prop="order_code" label="工单编码" min-width="120" show-overflow-tooltip />
         <el-table-column prop="order_status" label="工单状态" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ dict.label.order_status[scope.row.order_status] }}
           </template>
         </el-table-column>
-        <el-table-column prop="qty" label="生产数量" min-width="100" show-overflow-tooltip/>
+        <el-table-column prop="qty" label="生产数量" min-width="100" show-overflow-tooltip />
-        <el-table-column prop="device_code" label="设备编号" min-width="100" show-overflow-tooltip/>
+        <el-table-column prop="device_code" label="设备编号" min-width="100" show-overflow-tooltip />
-        <el-table-column prop="material_code" label="物料编码" min-width="100" show-overflow-tooltip/>
+        <el-table-column prop="material_code" label="物料编码" min-width="100" show-overflow-tooltip />
-        <el-table-column prop="material_name" label="物料名称" min-width="100" show-overflow-tooltip/>
+        <el-table-column prop="material_name" label="物料名称" min-width="100" show-overflow-tooltip />
-        <el-table-column prop="material_spec" label="规格型号" min-width="100" show-overflow-tooltip/>
+        <el-table-column prop="material_spec" label="规格型号" min-width="100" show-overflow-tooltip />
-        <el-table-column prop="one_qty" label="满框数量" min-width="100" show-overflow-tooltip/>
+        <el-table-column prop="one_qty" label="满框数量" min-width="100" show-overflow-tooltip />
         <el-table-column prop="is_needmove" label="是否AGV搬运" min-width="120" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ dict.label.is_need_move[scope.row.is_needmove] }}
           </template>
         </el-table-column>
-        <el-table-column prop="lane_tray_template" label="托盘模板" min-width="100" show-overflow-tooltip/>
+        <el-table-column prop="lane_tray_template" label="托盘模板" min-width="100" show-overflow-tooltip />
-        <el-table-column prop="in_devices" label="上料模板" min-width="100" show-overflow-tooltip/>
+        <el-table-column prop="in_devices" label="上料模板" min-width="100" show-overflow-tooltip />
-        <el-table-column prop="tray_num" label="托盘总数" min-width="100" show-overflow-tooltip/>
+        <el-table-column prop="tray_num" label="托盘总数" min-width="100" show-overflow-tooltip />
-        <el-table-column prop="is_used_fxx" label="启用封箱线" min-width="100" show-overflow-tooltip/>
+        <el-table-column prop="is_used_fxx" label="启用封箱线" min-width="100" show-overflow-tooltip />
-        <el-table-column prop="ealing_device_code" label="装箱机编号" min-width="100" show-overflow-tooltip/>
+        <el-table-column prop="ealing_device_code" label="装箱机编号" min-width="100" show-overflow-tooltip />
-        <el-table-column prop="unboxing_device_code" label="开箱机编号" min-width="100" show-overflow-tooltip/>
+        <el-table-column prop="unboxing_device_code" label="开箱机编号" min-width="100" show-overflow-tooltip />
-        <el-table-column prop="create_by" label="创建者" min-width="100" show-overflow-tooltip/>
+        <el-table-column prop="create_by" label="创建者" min-width="100" show-overflow-tooltip />
-        <el-table-column prop="create_time" label="创建时间" min-width="150" show-overflow-tooltip/>
+        <el-table-column prop="create_time" label="创建时间" min-width="150" show-overflow-tooltip />
       </el-table>
       <!--分页组件-->
-      <pagination/>
+      <pagination />
     </div>
   </div>
 </template>

wcs/nladmin-ui/src/views/monitor/lucene/api/lucene.js

@@ -0,0 +1,18 @@
+import request from '@/utils/request'
+
+export function getLogData(param) {
+  return request({
+    url: 'api/lucene/getAll',
+    method: 'get',
+    data: param
+  })
+}
+
+export function labelsValues() {
+  return request({
+    url: 'api/loki/labels/values',
+    method: 'get'
+  })
+}
+
+export default { getLogData, labelsValues }

wcs/nladmin-ui/src/views/monitor/lucene/index.vue

@@ -1,20 +1,8 @@
 <template>
   <div class="app-container">
     <div class="head-container">
-      <Search/>
+      <Search />
-      <crudOperation>
+      <crudOperation />
-        <el-button
-          slot="left"
-          class="filter-item"
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          :loading="crud.delAllLoading"
-          @click="confirmDelAll()"
-        >
-          清空
-        </el-button>
-      </crudOperation>
     </div>
     <!--表格渲染-->
     <el-table
@@ -24,15 +12,22 @@
       style="width: 100%;"
       @selection-change="crud.selectionChangeHandler"
     >
-      <el-table-column type="selection" width="55"/>
+      <!--      <el-table-column type="selection" width="55"/>-->
-      <el-table-column v-if="false" prop="id" label="id"/>
+      <!--      <el-table-column v-if="false" prop="id" label="id"/>-->
-      <el-table-column prop="resource_name" label="资源号"/>
+      <el-table-column prop="operate" width="50" label="操作" />
-      <el-table-column prop="create_datetime" label="创建时间"/>
+      <el-table-column prop="device_code" width="120" label="设备号" />
-      <el-table-column prop="content" 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/>
+    <pagination />
   </div>
 </template>
 
@@ -43,14 +38,13 @@ 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() {
+  cruds: function() {
     return CRUD({
-      title: '系统参数', url: 'api/lucene', idField: 'id', sort: 'id,desc',
+      title: '系统参数', url: 'api/lucene/getAll', idField: 'id', sort: 'id,desc',
       queryOnPresenterCreated: true,
       optShow: {
         add: false,
@@ -64,7 +58,7 @@ export default {
         page: 0
       },
       query: {
-        createTime: [start.setTime(start.getTime() - 3600 * 1000 * 0.5), new Date()]
+        createTime: [new Date(new Date().setTime(new Date().getTime() - 3600 * 1000 * 24)), new Date()]
       }
     })
   },

wcs/nladmin-ui/src/views/monitor/lucene/search.vue

@@ -1,10 +1,50 @@
 <template>
   <div v-if="crud.props.searchToggle">
+    <el-input
+      v-model="query.device_code"
+      clearable
+      size="small"
+      placeholder="请输入你要搜索的设备号"
+      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"
     />
@@ -16,12 +56,13 @@
       v-model="query.createTime"
       type="datetimerange"
       :picker-options="pickerOptions"
+      format="yyyy-MM-dd HH:mm:ss"
       range-separator="至"
       start-placeholder="开始日期"
       end-placeholder="结束日期"
       align="right"
     />
-    <rrOperation/>
+    <rrOperation />
   </div>
 </template>
 

wcs/nladmin-ui/src/views/system/monitor/device/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div style="overflow: hidden">
     <el-row>
-      <div id="container" className="container" style="min-height: 100%"/>
+      <div id="container" className="container" style="min-height: 100%" />
     </el-row>
     <!--点击设备显示信息-->
     <el-dialog
@@ -33,7 +33,7 @@
     <el-dialog title="设备设置" :visible.sync="dialogFormVisible" width="35%">
       <el-form :model="form" size="small">
         <el-form-item label="设备编号" prop="device_code" label-width="80px">
-          <el-input v-model="form.device_code" :disabled="true"/>
+          <el-input v-model="form.device_code" :disabled="true" />
         </el-form-item>
 
         <el-form-item label="设备状态" label-width="80px">
@@ -54,7 +54,7 @@
     <el-dialog title="设备设置" :visible.sync="dialogFormVisible3" width="35%">
       <el-form :model="form" size="small">
         <el-form-item label="设备编号" prop="device_code" label-width="80px">
-          <el-input v-model="form.device_code" :disabled="true"/>
+          <el-input v-model="form.device_code" :disabled="true" />
         </el-form-item>
         <el-form-item label="设备状态" label-width="80px">
           <el-radio-group v-model="form.hasGoodStatus">
@@ -64,7 +64,7 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item label="物料编码" prop="material_type" label-width="80px">
-          <el-input v-model="form.material_type"/>
+          <el-input v-model="form.material_type" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -77,7 +77,7 @@
     <el-dialog title="设备设置" :visible.sync="dialogFormVisible4" width="35%">
       <el-form :model="form" size="small">
         <el-form-item label="设备编号" prop="device_code" label-width="120px">
-          <el-input v-model="form.device_code" :disabled="true"/>
+          <el-input v-model="form.device_code" :disabled="true" />
         </el-form-item>
         <el-form-item label="禁用机械手" prop="is_disable" label-width="120px">
           <el-radio-group v-model="form.is_disable">
@@ -101,7 +101,7 @@
     <el-dialog title="设备设置" :visible.sync="dialogFormVisible5" width="35%">
       <el-form :model="form" size="small">
         <el-form-item label="设备编号" prop="device_code" label-width="120px">
-          <el-input v-model="form.device_code" :disabled="true"/>
+          <el-input v-model="form.device_code" :disabled="true" />
         </el-form-item>
         <el-form-item label="请求标记" prop="requireSucess" label-width="120px">
           <el-radio-group v-model="form.requireSucess">
@@ -119,7 +119,7 @@
     <el-dialog title="设备设置" :visible.sync="dialogFormVisible6" width="35%">
       <el-form :model="form" size="small">
         <el-form-item label="设备编号" prop="device_code" label-width="120px">
-          <el-input v-model="form.device_code" :disabled="true"/>
+          <el-input v-model="form.device_code" :disabled="true" />
         </el-form-item>
         <el-form-item label="申请指令标记" prop="requireSucess" label-width="120px">
           <el-radio-group v-model="form.requireSucess">
@@ -144,11 +144,11 @@
     <el-dialog title="设备设置" :visible.sync="dialogFormVisible1" width="35%">
       <el-form :model="form" size="small">
         <el-form-item label="设备编号" prop="device_code" label-width="80px">
-          <el-input v-model="form.device_code" :disabled="true"/>
+          <el-input v-model="form.device_code" :disabled="true" />
         </el-form-item>
 
         <el-form-item label="条码" label-width="80px">
-          <el-input v-model="form.barcode" :disabled="false"/>
+          <el-input v-model="form.barcode" :disabled="false" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">