-
+
@@ -12,14 +17,9 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
-
-
-
-
-
-
-
-
+
+
+
@@ -32,6 +32,7 @@ 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'
+import crudLucene from './api/lucene'
export default {
name: 'LuceneLog',
@@ -39,7 +40,7 @@ export default {
mixins: [presenter(), header(), crud()],
cruds: function() {
return CRUD({
- title: '系统参数', url: 'api/lucene/getAll', idField: 'id', sort: 'id,desc',
+ title: '设备日志', url: 'api/lucene/getAll', idField: 'id', sort: 'id,desc',
queryOnPresenterCreated: true,
optShow: {
add: false,
@@ -53,7 +54,8 @@ 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))],
+ logType: '设备日志'
}
})
},
@@ -65,17 +67,38 @@ export default {
edit: ['admin', 'param:edit'],
del: ['admin', 'param:del']
},
-
- rules: {}
+ deviceList: [],
+ deviceLogTypes: [],
+ logTypes: [],
+ rules: {},
+ logType: ''
}
},
created() {
+ this.getLogTypes()
+ this.getDeviceList()
+ this.getDeviceLogTypes()
},
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
return true
},
+ getLogTypes() {
+ crudLucene.getLogTypes().then(res => {
+ this.logTypes = res
+ })
+ },
+ getDeviceLogTypes() {
+ crudLucene.getDeviceLogType().then(res => {
+ this.deviceLogTypes = res
+ })
+ },
+ getDeviceList() {
+ crudLucene.getDeviceCodes().then(res => {
+ this.deviceList = (res || []).map(code => ({ device_code: code }))
+ })
+ },
confirmDelAll() {
this.$confirm(`确认清空所有操作日志吗?`, '提示', {
confirmButtonText: '确定',
@@ -94,14 +117,16 @@ export default {
})
}).catch(() => {
})
+ },
+ performSearch(value) {
+ console.log('Search with:' + value)
+ this.logType = value
+ this.crud.toQuery()
}
}
}
diff --git a/acs/acs2/nladmin-ui/src/views/monitor/lucene/search.vue b/acs/acs2/nladmin-ui/src/views/monitor/lucene/search.vue
index c5fc1f3..aa64760 100644
--- a/acs/acs2/nladmin-ui/src/views/monitor/lucene/search.vue
+++ b/acs/acs2/nladmin-ui/src/views/monitor/lucene/search.vue
@@ -1,67 +1,66 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
@@ -72,9 +71,16 @@ import rrOperation from '@crud/RR.operation'
export default {
components: { rrOperation },
mixins: [header()],
-
+ props: {
+ deviceList: Array,
+ deviceLogTypes: Array,
+ logTypes: Array
+ },
data() {
return {
+ querySearch: {
+ logType: null
+ },
pickerOptions: {
shortcuts: [{
text: '最近一周',
@@ -106,19 +112,22 @@ export default {
value2: ''
}
},
+ watch: {
+ logTypes: {
+ immediate: true,
+ handler(newVal) {
+ if (newVal.length > 0 && !this.query.logType) {
+ }
+ }
+ }
+ },
created() {
+ },
+ methods: {
+ handleLogTypeChange(value) {
+ this.query.logType = value
+ this.$emit('performSearch', this.query.logType)
+ }
}
}
-
-
-
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/GroupController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/GroupController.java
index 79c89da..afbe0e3 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/GroupController.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/GroupController.java
@@ -9,6 +9,13 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.DataFormatter;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.ss.usermodel.WorkbookFactory;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.apache.commons.lang3.StringUtils;
import org.checkerframework.checker.units.qual.A;
import org.nl.common.base.TableDataInfo;
@@ -17,9 +24,13 @@ import org.nl.common.exception.BadRequestException;
import org.nl.common.logging.annotation.Log;
import org.nl.common.utils.IdUtil;
import org.nl.common.utils.SecurityUtils;
+import org.nl.wms.basedata_manage.service.IMdMeMaterialbaseService;
import org.nl.wms.basedata_manage.service.IMdCsSupplierbaseService;
+import org.nl.wms.basedata_manage.service.IMdPbMeasureunitService;
import org.nl.wms.basedata_manage.service.IMdPbStoragevehicleinfoService;
+import org.nl.wms.basedata_manage.service.dao.MdMeMaterialbase;
import org.nl.wms.basedata_manage.service.dao.MdCsSupplierbase;
+import org.nl.wms.basedata_manage.service.dao.MdPbMeasureunit;
import org.nl.wms.basedata_manage.service.dao.MdPbStoragevehicleinfo;
import org.nl.wms.pm_manage.service.IPmFormDataService;
import org.nl.wms.pm_manage.service.dao.PmFormData;
@@ -32,14 +43,20 @@ import org.nl.wms.warehouse_manage.service.IMdPbGroupplateService;
import org.nl.wms.warehouse_manage.service.dao.GroupPlate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.InputStream;
import java.math.BigDecimal;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -66,6 +83,10 @@ public class GroupController {
@Autowired
private IMdCsSupplierbaseService supplierbaseService;
@Autowired
+ private IMdMeMaterialbaseService materialbaseService;
+ @Autowired
+ private IMdPbMeasureunitService measureunitService;
+ @Autowired
private IPmFormDataService iPmFormDataService;
/**
* 点位服务
@@ -86,58 +107,62 @@ public class GroupController {
public ResponseEntity