diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index e76e74a..bb9abb6 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -54,10 +54,10 @@ */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String deviceType, String communication) { + public Object listPage(String modelName, String communication) { Page page = PageFactory.defaultPage(); QueryWrapper query = new QueryWrapper() - .like("DEVICE_TYPE", deviceType == null ? "" : deviceType) + .like("MODEL_NAME", modelName == null ? "" : modelName) .like("COMMUNICATION", communication == null ? "" : communication); page = deviceModelsService.page(page, query); Map dictMap = deviceModelsService.getDictNameByCode(); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index e76e74a..bb9abb6 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -54,10 +54,10 @@ */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String deviceType, String communication) { + public Object listPage(String modelName, String communication) { Page page = PageFactory.defaultPage(); QueryWrapper query = new QueryWrapper() - .like("DEVICE_TYPE", deviceType == null ? "" : deviceType) + .like("MODEL_NAME", modelName == null ? "" : modelName) .like("COMMUNICATION", communication == null ? "" : communication); page = deviceModelsService.page(page, query); Map dictMap = deviceModelsService.getDictNameByCode(); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java index ede40c5..cbe9526 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.modular.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.application.service.AbstractDeptService; import com.casic.missiles.modular.system.model.DeptPermission; import com.casic.missiles.modular.system.service.IDeptPermissionService; import com.casic.missiles.core.application.context.AbstractPermissionContext; @@ -33,7 +34,8 @@ wrapper.eq("DEPTID", deptId); DeptPermission deptPermission = this.getOne(wrapper); if (deptPermission == null) { - List deptIds = service.getDeptService().getParentListById(deptId); + AbstractDeptService deptService = service.getDeptService(); + List deptIds = deptService.getParentListById(deptId); for (int i = deptIds.size() - 1; i > -1; i--) { Long depId = deptIds.get(i); QueryWrapper query = new QueryWrapper(); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java index e76e74a..bb9abb6 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java @@ -54,10 +54,10 @@ */ @RequestMapping(value = "/listPage") @ResponseBody - public Object listPage(String deviceType, String communication) { + public Object listPage(String modelName, String communication) { Page page = PageFactory.defaultPage(); QueryWrapper query = new QueryWrapper() - .like("DEVICE_TYPE", deviceType == null ? "" : deviceType) + .like("MODEL_NAME", modelName == null ? "" : modelName) .like("COMMUNICATION", communication == null ? "" : communication); page = deviceModelsService.page(page, query); Map dictMap = deviceModelsService.getDictNameByCode(); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java index ede40c5..cbe9526 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionServiceImpl.java @@ -1,6 +1,7 @@ package com.casic.missiles.modular.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.core.application.service.AbstractDeptService; import com.casic.missiles.modular.system.model.DeptPermission; import com.casic.missiles.modular.system.service.IDeptPermissionService; import com.casic.missiles.core.application.context.AbstractPermissionContext; @@ -33,7 +34,8 @@ wrapper.eq("DEPTID", deptId); DeptPermission deptPermission = this.getOne(wrapper); if (deptPermission == null) { - List deptIds = service.getDeptService().getParentListById(deptId); + AbstractDeptService deptService = service.getDeptService(); + List deptIds = deptService.getParentListById(deptId); for (int i = deptIds.size() - 1; i > -1; i--) { Long depId = deptIds.get(i); QueryWrapper query = new QueryWrapper(); diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml index de05d41..aab0124 100644 --- a/casic-web/src/main/resources/config/application.yml +++ b/casic-web/src/main/resources/config/application.yml @@ -3,7 +3,7 @@ ########################################################## spring: profiles: - active: postgre + active: dev servlet: multipart: max-file-size: 50MB