add:新增接口日志

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/rest/AddressController.java

@@ -31,6 +31,12 @@ public class AddressController {
         return new ResponseEntity<>(addressService.queryAll(whereJson, page), HttpStatus.OK);
     }
 
+    @GetMapping("/queryAddressCodeList")
+    @Log("查询接口方法地址编码")
+    public ResponseEntity<Object> queryAddressCodeList() {
+        return new ResponseEntity<>(addressService.queryAddressCodeList(), HttpStatus.OK);
+    }
+
     @PostMapping
     @Log("新增接口方法地址")
     public ResponseEntity<Object> create(@Validated @RequestBody AddressDto dto) {

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/service/AddressService.java

@@ -1,5 +1,6 @@
 package org.nl.acs.address.service;
 
+import com.alibaba.fastjson.JSONObject;
 import org.nl.acs.common.base.PageInfo;
 import org.nl.acs.common.base.CommonService;
 import org.nl.acs.address.domain.Address;
@@ -146,4 +147,6 @@ public interface AddressService extends CommonService<Address> {
      * @throws IOException /
      */
     void download(List<AddressDto> dtos, HttpServletResponse response) throws IOException;
+
+    JSONObject queryAddressCodeList();
 }

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

@@ -1,5 +1,6 @@
 package org.nl.acs.address.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -198,4 +199,21 @@ public class AddressServiceImpl extends CommonServiceImpl<AddressMapper, Address
         }
         FileUtil.downloadExcel(list, response);
     }
+
+    @Override
+    public JSONObject queryAddressCodeList() {
+        List<JSONObject> list = new ArrayList<>();
+        List<AddressDto> addressDtoList = this.queryAll(new HashMap());
+        if (CollectionUtil.isNotEmpty(addressDtoList)){
+            for (AddressDto addressDto : addressDtoList) {
+                JSONObject jo = new JSONObject();
+                jo.put("label",addressDto.getMethods_name());
+                jo.put("value",addressDto.getMethods_code());
+                list.add(jo);
+            }
+        }
+        JSONObject ja1 = new JSONObject();
+        ja1.put("content",list);
+        return ja1;
+    }
 }

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/rest/LuceneController.java

@@ -30,9 +30,16 @@ public class LuceneController {
 
     @GetMapping("/getAll")
     @Log("日志检索")
-    
+
     //@PreAuthorize("@el.check('task:list')")
     public ResponseEntity<Object> get(@RequestParam Map whereJson, Pageable page) {
         return new ResponseEntity<>(luceneService.getAll(whereJson, page), HttpStatus.OK);
     }
+
+    @GetMapping("/getAddressLog")
+    @Log("接口日志检索")
+    //@PreAuthorize("@el.check('task:list')")
+    public ResponseEntity<Object> getAddressLog(@RequestParam Map whereJson, Pageable page) {
+        return new ResponseEntity<>(luceneService.getAddressLog(whereJson, page), HttpStatus.OK);
+    }
 }

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

@@ -15,4 +15,6 @@ public interface LuceneService {
      * @return Map<String, Object>
      */
     Map<String, Object> getAll(Map whereJson, Pageable page);
+
+    Map<String, Object> getAddressLog(Map whereJson, Pageable page);
 }

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

@@ -126,6 +126,100 @@ public class LuceneServiceImpl implements LuceneService {
         }
     }
 
+    @Override
+    public Map<String, Object> getAddressLog(Map whereJson, Pageable page) {
+        //获取要查询的路径，也就是索引所在的位置
+        try {
+            Resource resource = new ClassPathResource("config/application.yml");
+            YamlPropertiesFactoryBean yamlPropertiesFactoryBean = new YamlPropertiesFactoryBean();
+            yamlPropertiesFactoryBean.setResources(resource);
+            Properties properties = yamlPropertiesFactoryBean.getObject();
+            // 获取配置值
+            String luceneDir = properties.getProperty("lucene.index.path");
+            FSDirectory directory = FSDirectory.open(Paths.get(luceneDir));
+            DirectoryReader open = DirectoryReader.open(directory);
+            IndexSearcher searcher = new IndexSearcher(open);
+            // 实际上Lucene本身不支持分页。因此我们需要自己进行逻辑分页。我们要准备分页参数：
+            int pageSize = Integer.parseInt(whereJson.get("size").toString());// 每页条数
+            int pageNum = Integer.parseInt(whereJson.get("page").toString());// 当前页码
+
+            BooleanQuery.Builder booleanQueryBuilder = new BooleanQuery.Builder();
+            //时间范围查询
+            String startDate = (String) whereJson.get("begin_time");
+            String endDate = (String) whereJson.get("end_time");
+
+            if (startDate == null){
+                Calendar calendar=Calendar.getInstance();
+                calendar.set(1970, 0, 1);
+                startDate = DateUtil.format(calendar.getTime(),"yyyy-MM-dd HH:mm:ss.SSS");
+            }else{
+                startDate = getDate(startDate);
+            }
+            if (endDate == null){
+                endDate = DateUtil.format(new DateTime(),"yyyy-MM-dd HH:mm:ss.SSS");
+            } else {
+                endDate = 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);
+            }
+
+            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);
+            int totalSize = collector.getTotalHits();
+            ScoreDoc[] scoreDocs = topDocs.scoreDocs;
+
+            List<JSONObject> list = new ArrayList<>();
+            for (ScoreDoc scoreDoc : scoreDocs) {
+                Document doc = open.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) {
+                    list.add(object);
+                }
+            }
+            open.close();
+            directory.close();
+            JSONObject jo = new JSONObject();
+            jo.put("content", list);
+            jo.put("totalElements", totalSize);
+            return jo;
+        } catch (Exception e) {
+            log.error("索引查询为空", e);
+            throw new NullPointerException("索引查询为空");
+        }
+    }
+
     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);

acs2/nladmin-ui/src/api/acs/Address.js

@@ -8,6 +8,13 @@ export function add(data) {
   })
 }
 
+export function queryAddressCodeList() {
+  return request({
+    url: 'api/Address/queryAddressCodeList',
+    method: 'get'
+  })
+}
+
 export function del(ids) {
   return request({
     url: 'api/Address/',
@@ -24,4 +31,4 @@ export function edit(data) {
   })
 }
 
-export default { add, edit, del }
+export default { add, edit, del, queryAddressCodeList }

acs2/nladmin-ui/src/views/monitor/logQuery/index.vue

@@ -0,0 +1,106 @@
+<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" label="操作" :min-width="flexWidth('operate',crud.data,操作)" />
+      <!-- <el-table-column prop="trace_id" label="链路追踪" /> -->
+      <el-table-column prop="method" label="方法" :min-width="flexWidth('method',crud.data,方法)" />
+      <el-table-column prop="requestparam" label="请求参数" :min-width="flexWidth('requestparam',crud.data,请求参数)" />
+      <el-table-column prop="responseparam" label="返回参数" :min-width="flexWidth('responseparam',crud.data,返回参数)" />
+      <el-table-column prop="logTime" label="记录时间" :min-width="flexWidth('logTime',crud.data,记录时间)" />
+      <el-table-column prop="content" label="内容详情" :show-overflow-tooltip="true" />
+
+    </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'
+
+export default {
+  name: 'LuceneLog',
+  components: { Search, pagination, crudOperation },
+  mixins: [presenter(), header(), crud()],
+  cruds: function() {
+    return CRUD({
+      title: '系统参数', url: 'api/lucene/getAddressLog', 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)), new Date(new Date().setTime(new Date().getTime() + 3600 * 1000))],
+      }
+    })
+  },
+  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>

acs2/nladmin-ui/src/views/monitor/logQuery/search.vue

@@ -0,0 +1,125 @@
+<template>
+  <div v-if="crud.props.searchToggle">
+<!--    <el-input-->
+<!--      v-model="query.method"-->
+<!--      clearable-->
+<!--      size="small"-->
+<!--      placeholder="请输入你要搜索的方法名"-->
+<!--      style="width: 200px;"-->
+<!--      class="filter-item"-->
+<!--    />-->
+    <el-select
+      v-model="query.method"
+      clearable
+      filterable
+      size="small"
+      placeholder="请输入你要搜索的方法名"
+      class="filter-item"
+      style="width: 200px"
+      @change="crud.toQuery"
+    >
+      <el-option v-for="item in methods" :key="item.id" :label="item.label" :value="item.value" />
+    </el-select>
+    <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="请输入你要搜索的内容详情"
+      style="width: 200px;"
+      class="filter-item"
+    />
+    <!--
+        <date-range-picker v-model="query.createTime" class="date-item" />
+    -->
+
+    <el-date-picker
+      v-model="query.createTime"
+      type="datetimerange"
+      :picker-options="pickerOptions"
+      format="yyyy-MM-dd HH:mm:ss"
+      start-placeholder="开始日期"
+      end-placeholder="结束日期"
+      class="date-item1"
+    />
+    <rrOperation />
+  </div>
+</template>
+
+<script>
+import { header } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import {queryAddressCodeList} from "../../../api/acs/Address";
+
+export default {
+  components: { rrOperation },
+  mixins: [header()],
+
+  data() {
+    return {
+      methods: [],
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+            picker.$emit('pick', [start, end])
+          }
+        }]
+      },
+      value1: [new Date(2000, 10, 10, 10, 10), new Date(2000, 10, 11, 10, 10)],
+      value2: ''
+    }
+  },
+  created() {
+    queryAddressCodeList().then(data => {
+      this.methods = data.content
+    })
+  },
+}
+</script>
+
+<style scoped>
+.date-item1 {
+  display: inline-block;
+  vertical-align: middle;
+  margin-bottom: 10px;
+  height: 30.5px !important;
+  width: 350px;
+}
+
+</style>
+

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

@@ -59,7 +59,7 @@ export default {
         page: 0
       },
       query: {
-        createTime: [new Date(new Date().setTime(new Date().getTime() - 3600 * 1000)), new Date(new Date().setTime(new Date().getTime() + 3600 * 1000))]
+        createTime: [new Date(new Date().setTime(new Date().getTime() - 3600 * 1000)), new Date(new Date().setTime(new Date().getTime() + 3600 * 1000))],
       }
     })
   },