diff --git a/src/main/java/com/glxp/udi/ApiAdminApplication.java b/src/main/java/com/glxp/udi/ApiAdminApplication.java index b7c7509..0d312c2 100644 --- a/src/main/java/com/glxp/udi/ApiAdminApplication.java +++ b/src/main/java/com/glxp/udi/ApiAdminApplication.java @@ -1,6 +1,5 @@ package com.glxp.udi; -import com.github.pagehelper.autoconfigure.PageHelperAutoConfiguration; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; @@ -9,7 +8,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; @EnableTransactionManagement -@SpringBootApplication(exclude = PageHelperAutoConfiguration.class) +@SpringBootApplication public class ApiAdminApplication extends SpringBootServletInitializer { public static void main(String[] args) { diff --git a/src/main/java/com/glxp/udi/admin/config/MybatisPlusConfig.java b/src/main/java/com/glxp/udi/admin/config/MybatisPlusConfig.java index 655ccc6..37e3661 100644 --- a/src/main/java/com/glxp/udi/admin/config/MybatisPlusConfig.java +++ b/src/main/java/com/glxp/udi/admin/config/MybatisPlusConfig.java @@ -31,6 +31,7 @@ public class MybatisPlusConfig { paginationInnerInterceptor.setMaxLimit(-1L); // 分页合理化 paginationInnerInterceptor.setOverflow(true); + paginationInnerInterceptor.setOptimizeJoin(true); //设置分页插件属性 Properties properties = new Properties(); properties.setProperty("helperDialect", "mysql"); diff --git a/src/main/java/com/glxp/udi/admin/controller/auth/AuthAdminController.java b/src/main/java/com/glxp/udi/admin/controller/auth/AuthAdminController.java index f3d6941..7ca2367 100644 --- a/src/main/java/com/glxp/udi/admin/controller/auth/AuthAdminController.java +++ b/src/main/java/com/glxp/udi/admin/controller/auth/AuthAdminController.java @@ -1,6 +1,7 @@ package com.glxp.udi.admin.controller.auth; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.glxp.udi.admin.annotation.AuthRuleAnnotation; import com.glxp.udi.admin.common.res.BaseResponse; @@ -73,7 +74,7 @@ public class AuthAdminController { } authAdminQueryRequest.setIds(ids); } - Page page = authAdminService.listAdminPage(authAdminQueryRequest); + IPage page = authAdminService.listAdminPage(authAdminQueryRequest); // 查询所有的权限 @@ -311,7 +312,7 @@ public class AuthAdminController { @AuthRuleAnnotation("") @GetMapping("/admin/auth/admin/getUserList") public BaseResponse getUserList(QueryRequest queryRequest) { - Page page = authAdminService.getUserList(queryRequest); + IPage page = authAdminService.getUserList(queryRequest); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(page.getTotal()); pageSimpleResponse.setList(page.getRecords()); diff --git a/src/main/java/com/glxp/udi/admin/controller/auth/AuthRoleController.java b/src/main/java/com/glxp/udi/admin/controller/auth/AuthRoleController.java index 8ddc30e..fd3d3f2 100644 --- a/src/main/java/com/glxp/udi/admin/controller/auth/AuthRoleController.java +++ b/src/main/java/com/glxp/udi/admin/controller/auth/AuthRoleController.java @@ -1,7 +1,7 @@ package com.glxp.udi.admin.controller.auth; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.glxp.udi.admin.annotation.AuthRuleAnnotation; import com.glxp.udi.admin.common.res.BaseResponse; import com.glxp.udi.admin.entity.auth.AuthPermission; @@ -59,7 +59,7 @@ public class AuthRoleController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - Page authRolePage = authRoleService.listAdminPage(authRoleQueryRequest); + IPage authRolePage = authRoleService.listAdminPage(authRoleQueryRequest); List authRoleResponseList = authRolePage.getRecords().stream().map(item -> { AuthRoleResponse authRoleResponse = new AuthRoleResponse(); BeanUtils.copyProperties(item, authRoleResponse); diff --git a/src/main/java/com/glxp/udi/admin/controller/auth/CustomerController.java b/src/main/java/com/glxp/udi/admin/controller/auth/CustomerController.java index edf98bc..5fe0e8e 100644 --- a/src/main/java/com/glxp/udi/admin/controller/auth/CustomerController.java +++ b/src/main/java/com/glxp/udi/admin/controller/auth/CustomerController.java @@ -1,7 +1,7 @@ package com.glxp.udi.admin.controller.auth; import cn.hutool.core.bean.BeanUtil; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.glxp.udi.admin.annotation.AuthRuleAnnotation; import com.glxp.udi.admin.common.res.BaseResponse; import com.glxp.udi.admin.entity.auth.CustomerDetailEntity; @@ -49,7 +49,7 @@ public class CustomerController { @AuthRuleAnnotation("") @GetMapping("udi/customer/list") public BaseResponse filterList(CustomerInfoFilterRequest customerFilterRequest) { - Page page = customerInfoService.filterDetailCustomer(customerFilterRequest); + IPage page = customerInfoService.filterDetailCustomer(customerFilterRequest); List responses = new ArrayList<>(page.getRecords().size()); for (CustomerDetailEntity customerDetailEntity : page.getRecords()) { diff --git a/src/main/java/com/glxp/udi/admin/controller/basic/BussinessTypeController.java b/src/main/java/com/glxp/udi/admin/controller/basic/BussinessTypeController.java index 2f8ac6e..957d071 100644 --- a/src/main/java/com/glxp/udi/admin/controller/basic/BussinessTypeController.java +++ b/src/main/java/com/glxp/udi/admin/controller/basic/BussinessTypeController.java @@ -1,6 +1,7 @@ package com.glxp.udi.admin.controller.basic; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.glxp.udi.admin.annotation.AuthRuleAnnotation; import com.glxp.udi.admin.common.res.BaseResponse; @@ -59,7 +60,7 @@ public class BussinessTypeController { if (!customerId.equals(Constant.SYSTEM_CUSTOMER_ID)) { bussinessTypeFilterRequest.setSpUse(true); } - Page page = bussinessTypeService.filterList(bussinessTypeFilterRequest); + IPage page = bussinessTypeService.filterList(bussinessTypeFilterRequest); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(page.getTotal()); pageSimpleResponse.setList(page.getRecords()); @@ -83,7 +84,7 @@ public class BussinessTypeController { } bussinessTypeFilterRequest.setCustomerId(customerId); bussinessTypeFilterRequest.setEnabled(true); - Page page = bussinessTypeService.filterAllByUser(bussinessTypeFilterRequest); + IPage page = bussinessTypeService.filterAllByUser(bussinessTypeFilterRequest); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(page.getTotal()); pageSimpleResponse.setList(page.getRecords()); diff --git a/src/main/java/com/glxp/udi/admin/controller/inout/InvProductsController.java b/src/main/java/com/glxp/udi/admin/controller/inout/InvProductsController.java index 056dee8..622ae1b 100644 --- a/src/main/java/com/glxp/udi/admin/controller/inout/InvProductsController.java +++ b/src/main/java/com/glxp/udi/admin/controller/inout/InvProductsController.java @@ -2,7 +2,7 @@ package com.glxp.udi.admin.controller.inout; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.glxp.udi.admin.annotation.AuthRuleAnnotation; import com.glxp.udi.admin.common.res.BaseResponse; import com.glxp.udi.admin.constant.ConstantType; @@ -61,7 +61,7 @@ public class InvProductsController { FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); filterUdiInfoRequest.setNameCode(filterInvProductRequest.getNameCode()); filterUdiInfoRequest.setCpmctymc(filterInvProductRequest.getProductsName()); - Page page = udiInfoService.filterAllUdiInfo(filterUdiInfoRequest); + IPage page = udiInfoService.filterUdiInfo(filterUdiInfoRequest); List uuids = new ArrayList<>(); for (UdiInfoEntity udiInfoEntity : page.getRecords()) { uuids.add(udiInfoEntity.getUuid()); @@ -106,7 +106,7 @@ public class InvProductsController { filterUdiInfoRequest.setNameCode(FilterUdiUtils.getDiStr(filterInvProductRequest.getUdiCode())); } filterUdiInfoRequest.setCpmctymc(filterInvProductRequest.getProductsName()); - Page page = udiInfoService.filterAllUdiInfo(filterUdiInfoRequest); + IPage page = udiInfoService.filterUdiInfo(filterUdiInfoRequest); List uuids = new ArrayList<>(); for (UdiInfoEntity udiInfoEntity : page.getRecords()) { uuids.add(udiInfoEntity.getUuid()); diff --git a/src/main/java/com/glxp/udi/admin/controller/inout/StockQRCodeTextController.java b/src/main/java/com/glxp/udi/admin/controller/inout/StockQRCodeTextController.java index 9dcba81..0627aa7 100644 --- a/src/main/java/com/glxp/udi/admin/controller/inout/StockQRCodeTextController.java +++ b/src/main/java/com/glxp/udi/admin/controller/inout/StockQRCodeTextController.java @@ -2,7 +2,6 @@ package com.glxp.udi.admin.controller.inout; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.github.pagehelper.PageInfo; import com.glxp.udi.admin.annotation.AuthRuleAnnotation; import com.glxp.udi.admin.common.res.BaseResponse; import com.glxp.udi.admin.constant.Constant; @@ -218,9 +217,9 @@ public class StockQRCodeTextController { filterStockprintRequest.setId(stockQRCodeTextPDFTemplateRequest.getQueryId()); } stockPrintTempService.deleteById(deleteStPrintTempRequest); - List stockPrintEntities = stockPrintService.filterJoinStockPrint(filterStockprintRequest); - if (stockPrintEntities != null && stockPrintEntities.size() > 0) { - mStockPrintEntities.addAll(stockPrintEntities); + Page page = stockPrintService.filterJoinStockPrint(filterStockprintRequest); + if (page.getTotal() > 0) { + mStockPrintEntities.addAll(page.getRecords()); } for (StockPrintEntity stockPrintEntity : mStockPrintEntities) { PdfPrintCountEntity pdfPrintCount = getCount(stockQRCodeTextPDFTemplateRequest.getCountList(), stockPrintEntity); @@ -266,9 +265,8 @@ public class StockQRCodeTextController { stockPrintEntity.setPrintStatus("102"); stockPrintService.updateStockPrint(stockPrintEntity); } - PageInfo pageInfo = new PageInfo<>(stockPrintTempEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); - pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setTotal((long) stockPrintTempEntities.size()); pageSimpleResponse.setList(stockPrintTempEntities); return ResultVOUtils.success(pageSimpleResponse); } @@ -279,12 +277,10 @@ public class StockQRCodeTextController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - List stockQRCodeTextEntityList - = stockPrintTempService.filterStockPrintTempEntity(filterStPrintTempRequest); - PageInfo pageInfo = new PageInfo<>(stockQRCodeTextEntityList); + Page page = stockPrintTempService.filterStockPrintTempEntity(filterStPrintTempRequest); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); - pageSimpleResponse.setTotal(pageInfo.getTotal()); - pageSimpleResponse.setList(stockQRCodeTextEntityList); + pageSimpleResponse.setTotal(page.getTotal()); + pageSimpleResponse.setList(page.getRecords()); return ResultVOUtils.success(pageSimpleResponse); } @@ -310,11 +306,11 @@ public class StockQRCodeTextController { SystemPDFTemplateRelevanceRequest systemPDFTemplateRelevanceRequest = new SystemPDFTemplateRelevanceRequest(); systemPDFTemplateRelevanceRequest.setLocalAction(orderMdEntity.getAction()); systemPDFTemplateRelevanceRequest.setModuleId(inspectionPDFTemplateRequest.getModuleId()); - List systemPDFTemplateRelevanceResponses = systemPDFTemplateRelevanceService.filterList(systemPDFTemplateRelevanceRequest); - if (systemPDFTemplateRelevanceResponses.isEmpty()) { + Page page = systemPDFTemplateRelevanceService.filterList(systemPDFTemplateRelevanceRequest); + if (page.getTotal() == 0) { return ResultVOUtils.error(ResultEnum.DATA_NOT, "未找到模板文件"); } else { - SystemPDFTemplateRelevanceResponse systemPDFTemplateRelevanceResponse = systemPDFTemplateRelevanceResponses.get(0); + SystemPDFTemplateRelevanceResponse systemPDFTemplateRelevanceResponse = page.getRecords().get(0); SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById(String.valueOf(systemPDFTemplateRelevanceResponse.getTemplateId())); if (systemPDFTemplateEntity == null) { @@ -339,12 +335,12 @@ public class StockQRCodeTextController { SystemPDFTemplateRelevanceRequest systemPDFTemplateRelevanceRequest = new SystemPDFTemplateRelevanceRequest(); systemPDFTemplateRelevanceRequest.setModuleId(systemPDFModuleEntity.getId()); systemPDFTemplateRelevanceRequest.setLocalAction(list.get(0).getBillType()); - List systemPDFTemplateRelevanceResponses = systemPDFTemplateRelevanceService.filterList(systemPDFTemplateRelevanceRequest); - if (systemPDFTemplateRelevanceResponses == null || systemPDFTemplateRelevanceResponses.size() < 1) { + Page page = systemPDFTemplateRelevanceService.filterList(systemPDFTemplateRelevanceRequest); + if (page.getTotal() == 0) { return; } - SystemPDFTemplateRelevanceResponse systemPDFTemplateRelevanceResponse = systemPDFTemplateRelevanceResponses.get(0); + SystemPDFTemplateRelevanceResponse systemPDFTemplateRelevanceResponse = page.getRecords().get(0); SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById(String.valueOf(systemPDFTemplateRelevanceResponse.getTemplateId())); diff --git a/src/main/java/com/glxp/udi/admin/controller/inout/UdiInfoController.java b/src/main/java/com/glxp/udi/admin/controller/inout/UdiInfoController.java index 6f0e13b..0473de6 100644 --- a/src/main/java/com/glxp/udi/admin/controller/inout/UdiInfoController.java +++ b/src/main/java/com/glxp/udi/admin/controller/inout/UdiInfoController.java @@ -3,6 +3,7 @@ package com.glxp.udi.admin.controller.inout; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.glxp.udi.admin.annotation.AuthRuleAnnotation; import com.glxp.udi.admin.common.res.BaseResponse; @@ -85,11 +86,11 @@ public class UdiInfoController { FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); filterUdiInfoRequest.setCustomerId(customerId); filterUdiInfoRequest.setUuid(udiInfoEntity.getUuid()); - Page page = udiInfoService.filterUdiInfo(filterUdiInfoRequest); + IPage page = udiInfoService.filterUdiInfo(filterUdiInfoRequest); if (page != null && page.getTotal() > 0) { - udiInfoEntity.setCheck(true); + udiInfoEntity.setIsCheck(true); } else { - udiInfoEntity.setCheck(false); + udiInfoEntity.setIsCheck(false); } udiInfoEntity.setIsUseDy(0); } @@ -97,6 +98,7 @@ public class UdiInfoController { } return udiDlDeviceResponse; } catch (Exception e) { + log.error(e.getMessage(), e); return ResultVOUtils.error(500, "连接UDI数据下载服务出错！"); } } @@ -122,7 +124,7 @@ public class UdiInfoController { @GetMapping("udims/udiinfo/local/filterByUuid") public BaseResponse filterLocalByUuid(FilterUdiInfoRequest productInfoFilterRequest) { productInfoFilterRequest.setCustomerId(authAdminService.getCurrentUserCustomerId()); - Page page = udiInfoService.filterAllUdiInfo(productInfoFilterRequest); + IPage page = udiInfoService.filterUdiInfo(productInfoFilterRequest); return ResultVOUtils.success(page.getRecords()); } diff --git a/src/main/java/com/glxp/udi/admin/controller/inout/UdiRelevanceController.java b/src/main/java/com/glxp/udi/admin/controller/inout/UdiRelevanceController.java index dbe026c..1d77c98 100644 --- a/src/main/java/com/glxp/udi/admin/controller/inout/UdiRelevanceController.java +++ b/src/main/java/com/glxp/udi/admin/controller/inout/UdiRelevanceController.java @@ -2,8 +2,8 @@ package com.glxp.udi.admin.controller.inout; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.github.pagehelper.PageInfo; import com.glxp.udi.admin.annotation.AuthRuleAnnotation; import com.glxp.udi.admin.common.res.BaseResponse; import com.glxp.udi.admin.entity.inout.UdiInfoEntity; @@ -63,7 +63,7 @@ public class UdiRelevanceController { filterUdiInfoRequest.setCustomerId(authAdminService.getCurrentUserCustomerId()); filterUdiInfoRequest.setDisable(false); - Page page = udiInfoService.filterUdiInfo(filterUdiInfoRequest); + IPage page = udiInfoService.filterUdiInfo(filterUdiInfoRequest); List udiRelevanceResponses = page.getRecords().stream().map(e -> { UdiRelevanceResponse authAdminRoleResponse = new UdiRelevanceResponse(); BeanUtils.copyProperties(e, authAdminRoleResponse); @@ -85,7 +85,7 @@ public class UdiRelevanceController { filterUdiInfoRequest.setCustomerId(authAdminService.getCurrentUserCustomerId()); - Page page = udiInfoService.filterUdiInfoGp(filterUdiInfoRequest); + IPage page = udiInfoService.filterUdiInfoGp(filterUdiInfoRequest); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(page.getTotal()); pageSimpleResponse.setList(page.getRecords()); @@ -128,7 +128,7 @@ public class UdiRelevanceController { FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); filterUdiInfoRequest.setUuid(key); filterUdiInfoRequest.setCustomerId(customerId); - Page page = udiInfoService.filterAllUdiInfo(filterUdiInfoRequest); + IPage page = udiInfoService.filterUdiInfo(filterUdiInfoRequest); List udiInfoEntities = page.getRecords(); if (udiInfoEntities == null || udiInfoEntities.isEmpty()) { udiInfoEntities = udidlClient.getUdiByUuid(key); @@ -136,7 +136,7 @@ public class UdiRelevanceController { for (UdiInfoEntity udiInfoEntity : udiInfoEntities) { udiInfoEntity.setCustomerId(customerId); udiInfoEntity.setIsUseDy(0); - udiInfoEntity.setDisable(false); + udiInfoEntity.setIsDisable(false); if (StrUtil.isBlank(udiInfoEntity.getManufactory())) { //生产厂家为空 udiInfoEntity.setManufactory(udiInfoEntity.getYlqxzcrbarmc()); @@ -176,7 +176,7 @@ public class UdiRelevanceController { } } - udiInfoEntity.setDisable(combineRequest.getIsDisable()); + udiInfoEntity.setIsDisable(combineRequest.getIsDisable()); udiInfoService.updateUdiInfo(udiInfoEntity); return ResultVOUtils.success("更新成功"); } @@ -189,9 +189,8 @@ public class UdiRelevanceController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } List udiRelevanceResponses = udiRelevanceService.selectAllByNameCode(filterUdiInfoRequest.getNameCode()); - PageInfo pageInfo = new PageInfo<>(udiRelevanceResponses); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); - pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setTotal((long) udiRelevanceResponses.size()); pageSimpleResponse.setList(udiRelevanceResponses); return ResultVOUtils.success(pageSimpleResponse); } diff --git a/src/main/java/com/glxp/udi/admin/controller/inout/UdiTraceController.java b/src/main/java/com/glxp/udi/admin/controller/inout/UdiTraceController.java index edc0a8b..f2a8770 100644 --- a/src/main/java/com/glxp/udi/admin/controller/inout/UdiTraceController.java +++ b/src/main/java/com/glxp/udi/admin/controller/inout/UdiTraceController.java @@ -3,7 +3,7 @@ package com.glxp.udi.admin.controller.inout; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; -import com.github.pagehelper.PageInfo; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.glxp.udi.admin.common.res.BaseResponse; import com.glxp.udi.admin.entity.inout.InvProductDetailEntity; import com.glxp.udi.admin.entity.inout.OrderMdEntity; @@ -97,11 +97,11 @@ public class UdiTraceController { } responses.addAll(set); - PageInfo pageInfo; - pageInfo = new PageInfo<>(responses); + Page page = new Page<>(warehouseQueryRequest.getPage(), warehouseQueryRequest.getLimit()); + page.setRecords(responses); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); - pageSimpleResponse.setTotal(pageInfo.getTotal()); - pageSimpleResponse.setList(responses); + pageSimpleResponse.setTotal(page.getTotal()); + pageSimpleResponse.setList(page.getRecords()); return ResultVOUtils.success(pageSimpleResponse); } @@ -149,10 +149,11 @@ public class UdiTraceController { orderMdEntities = orderMdEntities.stream().sorted(Comparator.comparing(OrderMdEntity::getActDate, Comparator.reverseOrder())).collect(Collectors.toList()); } - PageInfo pageInfo = new PageInfo<>(orderMdEntities); + Page pageResult = new Page<>(warehouseQueryRequest.getPage(), warehouseQueryRequest.getLimit()); + pageResult.setRecords(orderMdEntities); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); - pageSimpleResponse.setTotal(pageInfo.getTotal()); - pageSimpleResponse.setList(orderMdEntities); + pageSimpleResponse.setTotal(pageResult.getTotal()); + pageSimpleResponse.setList(pageResult.getRecords()); return ResultVOUtils.success(pageSimpleResponse); } diff --git a/src/main/java/com/glxp/udi/admin/controller/inout/UnitMaintainController.java b/src/main/java/com/glxp/udi/admin/controller/inout/UnitMaintainController.java index d08dc14..978cae3 100644 --- a/src/main/java/com/glxp/udi/admin/controller/inout/UnitMaintainController.java +++ b/src/main/java/com/glxp/udi/admin/controller/inout/UnitMaintainController.java @@ -1,5 +1,6 @@ package com.glxp.udi.admin.controller.inout; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.glxp.udi.admin.annotation.AuthRuleAnnotation; import com.glxp.udi.admin.common.res.BaseResponse; @@ -39,7 +40,7 @@ public class UnitMaintainController { String customerId = authAdminService.getCurrentUserCustomerId(); unitMaintainFilterRequest.setCustomerId(customerId); - Page page = unitMaintainService.filterList(unitMaintainFilterRequest); + IPage page = unitMaintainService.filterList(unitMaintainFilterRequest); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(page.getTotal()); pageSimpleResponse.setList(page.getRecords()); @@ -77,7 +78,7 @@ public class UnitMaintainController { } unitMaintainFilterRequest.setCustomerId(authAdminService.getCurrentUserCustomerId()); - Page page = unitMaintainService.filterList(unitMaintainFilterRequest); + IPage page = unitMaintainService.filterList(unitMaintainFilterRequest); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(page.getTotal()); @@ -94,7 +95,7 @@ public class UnitMaintainController { unitMaintainFilterRequest.setCustomerId(authAdminService.getCurrentUserCustomerId()); - Page page = unitMaintainService.filterList(unitMaintainFilterRequest); + IPage page = unitMaintainService.filterList(unitMaintainFilterRequest); for (UnitMaintainEntity unitMaintainEntity : page.getRecords()) { unitMaintainEntity.setErpId(unitMaintainEntity.getUnitId()); } diff --git a/src/main/java/com/glxp/udi/admin/controller/inventory/InvWarehouseController.java b/src/main/java/com/glxp/udi/admin/controller/inventory/InvWarehouseController.java index 572e86b..098e616 100644 --- a/src/main/java/com/glxp/udi/admin/controller/inventory/InvWarehouseController.java +++ b/src/main/java/com/glxp/udi/admin/controller/inventory/InvWarehouseController.java @@ -1,7 +1,7 @@ package com.glxp.udi.admin.controller.inventory; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.glxp.udi.admin.annotation.AuthRuleAnnotation; import com.glxp.udi.admin.common.res.BaseResponse; import com.glxp.udi.admin.entity.auth.AuthAdmin; @@ -52,8 +52,8 @@ public class InvWarehouseController { @AuthRuleAnnotation("") @GetMapping("spms/inv/warehouse/filter") public BaseResponse filterInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest) { - List invWarehouseEntities = invWarehouseService.filterInvWarehouse(filterInvWarehouseRequest); - List merge = merge(invWarehouseEntities, 0); + IPage page = invWarehouseService.filterInvWarehouse(filterInvWarehouseRequest); + List merge = merge(page.getRecords(), 0); Map restMap = new HashMap<>(); restMap.put("list", merge); return ResultVOUtils.success(restMap); @@ -64,8 +64,8 @@ public class InvWarehouseController { public BaseResponse filterAllInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest) { filterInvWarehouseRequest.setPid(0); filterInvWarehouseRequest.setStatus(1); - List invWarehouseEntities = invWarehouseService.filterInvWarehouse(filterInvWarehouseRequest); - return ResultVOUtils.success(invWarehouseEntities); + IPage page = invWarehouseService.filterInvWarehouse(filterInvWarehouseRequest); + return ResultVOUtils.success(page.getRecords()); } @@ -76,7 +76,7 @@ public class InvWarehouseController { filterInvWarehouseRequest.setStatus(1); long customerId = customerService.getCustomerId(); filterInvWarehouseRequest.setCustomerId(String.valueOf(customerId)); - Page page = invWarehouseService.filterInvWarehouse(filterInvWarehouseRequest); + IPage page = invWarehouseService.filterInvWarehouse(filterInvWarehouseRequest); SystemParamConfigEntity systemParamConfigEntity = systemParamCustomerConfigService.getParamByKey("corp_innor_inv", customerId); List temps = new ArrayList<>(); if (systemParamConfigEntity.getParamValue().equals("1")) { @@ -99,7 +99,6 @@ public class InvWarehouseController { } } - @AuthRuleAnnotation("") @GetMapping("spms/inv/warehouse/filterAllByUser") public BaseResponse filterAllByUser(FilterInvWarehouseRequest filterInvWarehouseRequest) { @@ -122,7 +121,6 @@ public class InvWarehouseController { return ResultVOUtils.success(invWarehouseEntities); } - public List merge(List invWarehouseEntities, Integer pid) { List invWarehouseResponses = new ArrayList<>(); for (InvWarehouseEntity invWarehouseEntity : invWarehouseEntities) { @@ -265,9 +263,9 @@ public class InvWarehouseController { @AuthRuleAnnotation("") @PostMapping("/spms/inv/warehouse/downloadByStatus") public BaseResponse downloadByStatus(@RequestBody FilterInvWarehouseRequest filterInvWarehouseRequest) { - List invWarehouseEntities = invWarehouseService.filterInvWarehouse(filterInvWarehouseRequest); + IPage page = invWarehouseService.filterInvWarehouse(filterInvWarehouseRequest); InvWarehouseExportResponse invWarehouseExportResponse = new InvWarehouseExportResponse(); - invWarehouseExportResponse.setInvWarehouseEntities(invWarehouseEntities); + invWarehouseExportResponse.setInvWarehouseEntities(page.getRecords()); return ResultVOUtils.success(invWarehouseExportResponse); } diff --git a/src/main/java/com/glxp/udi/admin/controller/param/SystemPDFModuleController.java b/src/main/java/com/glxp/udi/admin/controller/param/SystemPDFModuleController.java index d3a436f..edcd33a 100644 --- a/src/main/java/com/glxp/udi/admin/controller/param/SystemPDFModuleController.java +++ b/src/main/java/com/glxp/udi/admin/controller/param/SystemPDFModuleController.java @@ -1,5 +1,6 @@ package com.glxp.udi.admin.controller.param; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.glxp.udi.admin.annotation.AuthRuleAnnotation; import com.glxp.udi.admin.common.res.BaseResponse; @@ -88,7 +89,7 @@ public class SystemPDFModuleController { if (systemPDFModuleRequest.getTemplateType() != null && systemPDFModuleRequest.getTemplateType() == 2) { BussinessTypeFilterRequest bussinessTypeFilterRequest = new BussinessTypeFilterRequest(); bussinessTypeFilterRequest.setCustomerId(systemPDFModuleRequest.getCustomerId()); - Page page = bussinessTypeService.filterList(bussinessTypeFilterRequest); + IPage page = bussinessTypeService.filterList(bussinessTypeFilterRequest); for (BussinessTypeEntity bussinessTypeEntity : page.getRecords()) { SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntity = new SystemPDFTemplateRelevanceEntity(); systemPDFTemplateRelevanceEntity.setLocalAction(bussinessTypeEntity.getAction()); diff --git a/src/main/java/com/glxp/udi/admin/controller/param/SystemPDFTemplateController.java b/src/main/java/com/glxp/udi/admin/controller/param/SystemPDFTemplateController.java index 646d3a9..d6cf20d 100644 --- a/src/main/java/com/glxp/udi/admin/controller/param/SystemPDFTemplateController.java +++ b/src/main/java/com/glxp/udi/admin/controller/param/SystemPDFTemplateController.java @@ -1,6 +1,6 @@ package com.glxp.udi.admin.controller.param; -import com.github.pagehelper.PageInfo; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.glxp.udi.admin.annotation.AuthRuleAnnotation; import com.glxp.udi.admin.common.res.BaseResponse; import com.glxp.udi.admin.entity.param.SystemPDFTemplateEntity; @@ -42,16 +42,15 @@ public class SystemPDFTemplateController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - List systemPDFTemplateEntityList = systemPDFTemplateService.queryPage(systemPDFTemplateRequest); - List systemPDFTemplateResponseList = systemPDFTemplateEntityList.stream().map(item -> { + Page page = systemPDFTemplateService.queryPage(systemPDFTemplateRequest); + List systemPDFTemplateResponseList = page.getRecords().stream().map(item -> { SystemPDFTemplateResponse systemPDFTemplateResponse = new SystemPDFTemplateResponse(); BeanUtils.copyProperties(item, systemPDFTemplateResponse); return systemPDFTemplateResponse; }).collect(Collectors.toList()); - PageInfo pageInfo = new PageInfo<>(systemPDFTemplateEntityList); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); - pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setTotal(page.getTotal()); pageSimpleResponse.setList(systemPDFTemplateResponseList); return ResultVOUtils.success(pageSimpleResponse); } @@ -61,11 +60,10 @@ public class SystemPDFTemplateController { public BaseResponse pdfTemplates(@RequestParam(value = "page", defaultValue = "1") Integer page, @RequestParam(value = "limit", defaultValue = "100") Integer limit) { - List systemPDFTemplateEntityList = systemPDFTemplateService.listPDFTemplates(page, limit); - PageInfo pageInfo = new PageInfo<>(systemPDFTemplateEntityList); + Page pageResult = systemPDFTemplateService.listPDFTemplates(page, limit); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); - pageSimpleResponse.setTotal(pageInfo.getTotal()); - List systemPDFTemplateSelectResponses = systemPDFTemplateEntityList.stream().map(e -> { + pageSimpleResponse.setTotal(pageResult.getTotal()); + List systemPDFTemplateSelectResponses = pageResult.getRecords().stream().map(e -> { SystemPDFTemplateSelectResponse systemPDFTemplateSelectResponse = new SystemPDFTemplateSelectResponse(); BeanUtils.copyProperties(e, systemPDFTemplateSelectResponse); systemPDFTemplateSelectResponse.setIdStr(String.valueOf(e.getId())); diff --git a/src/main/java/com/glxp/udi/admin/controller/param/SystemParamConfigController.java b/src/main/java/com/glxp/udi/admin/controller/param/SystemParamConfigController.java index 347de74..d60fbf8 100644 --- a/src/main/java/com/glxp/udi/admin/controller/param/SystemParamConfigController.java +++ b/src/main/java/com/glxp/udi/admin/controller/param/SystemParamConfigController.java @@ -1,8 +1,7 @@ package com.glxp.udi.admin.controller.param; import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollUtil; -import com.github.pagehelper.PageInfo; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.glxp.udi.admin.annotation.AuthRuleAnnotation; import com.glxp.udi.admin.common.res.BaseResponse; import com.glxp.udi.admin.constant.SystemParamConstant; @@ -52,13 +51,12 @@ public class SystemParamConfigController { } systemParamConfigRequest.setParamStatus(1); //查询用户是否自定义了此参数 - List list = customerParamConfigService.getSystemParams(systemParamConfigRequest); + Page page = customerParamConfigService.getSystemParams(systemParamConfigRequest); - PageInfo pageInfo = new PageInfo<>(list); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); - pageSimpleResponse.setTotal(pageInfo.getTotal()); - if (CollUtil.isNotEmpty(list)) { - List systemParamConfigResponseList = list.stream().map(item -> { + pageSimpleResponse.setTotal(page.getTotal()); + if (page.getTotal() > 0) { + List systemParamConfigResponseList = page.getRecords().stream().map(item -> { SystemParamConfigResponse systemParamConfigResponse = new SystemParamConfigResponse(); BeanUtil.copyProperties(item, systemParamConfigResponse); return systemParamConfigResponse; diff --git a/src/main/java/com/glxp/udi/admin/dao/auth/AuthAdminDao.java b/src/main/java/com/glxp/udi/admin/dao/auth/AuthAdminDao.java index ca92b88..7dc2638 100644 --- a/src/main/java/com/glxp/udi/admin/dao/auth/AuthAdminDao.java +++ b/src/main/java/com/glxp/udi/admin/dao/auth/AuthAdminDao.java @@ -1,22 +1,16 @@ package com.glxp.udi.admin.dao.auth; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.glxp.udi.admin.entity.auth.AuthAdmin; -import com.glxp.udi.admin.req.auth.AuthAdminQueryRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper -public interface AuthAdminDao { +public interface AuthAdminDao extends BaseMapper { - /** - * 后台业务查询列表 - * - * @return 列表 - */ - Page listAdminPage(Page page, AuthAdminQueryRequest authAdminQueryRequest); /** * 根据id查询 diff --git a/src/main/java/com/glxp/udi/admin/dao/auth/AuthLicenseDao.java b/src/main/java/com/glxp/udi/admin/dao/auth/AuthLicenseDao.java index 43091a2..e5463bb 100644 --- a/src/main/java/com/glxp/udi/admin/dao/auth/AuthLicenseDao.java +++ b/src/main/java/com/glxp/udi/admin/dao/auth/AuthLicenseDao.java @@ -1,11 +1,12 @@ package com.glxp.udi.admin.dao.auth; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.udi.admin.entity.auth.AuthLicense; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @Mapper -public interface AuthLicenseDao { +public interface AuthLicenseDao extends BaseMapper { AuthLicense get(String id); diff --git a/src/main/java/com/glxp/udi/admin/dao/auth/AuthPermissionDao.java b/src/main/java/com/glxp/udi/admin/dao/auth/AuthPermissionDao.java index ce060c6..ca01ec2 100644 --- a/src/main/java/com/glxp/udi/admin/dao/auth/AuthPermissionDao.java +++ b/src/main/java/com/glxp/udi/admin/dao/auth/AuthPermissionDao.java @@ -1,12 +1,13 @@ package com.glxp.udi.admin.dao.auth; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.udi.admin.entity.auth.AuthPermission; import org.apache.ibatis.annotations.Mapper; import java.util.List; @Mapper -public interface AuthPermissionDao { +public interface AuthPermissionDao extends BaseMapper { /** * 根据roleIds查询 diff --git a/src/main/java/com/glxp/udi/admin/dao/auth/AuthPermissionRuleDao.java b/src/main/java/com/glxp/udi/admin/dao/auth/AuthPermissionRuleDao.java index e9cd428..690e621 100644 --- a/src/main/java/com/glxp/udi/admin/dao/auth/AuthPermissionRuleDao.java +++ b/src/main/java/com/glxp/udi/admin/dao/auth/AuthPermissionRuleDao.java @@ -1,5 +1,6 @@ package com.glxp.udi.admin.dao.auth; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.udi.admin.entity.auth.AuthPermissionRule; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -8,7 +9,7 @@ import java.util.List; @Mapper -public interface AuthPermissionRuleDao { +public interface AuthPermissionRuleDao extends BaseMapper { /** * 根据ids查询 规则名称 diff --git a/src/main/java/com/glxp/udi/admin/dao/auth/AuthRoleAdminDao.java b/src/main/java/com/glxp/udi/admin/dao/auth/AuthRoleAdminDao.java index ea2a751..0b7c6a6 100644 --- a/src/main/java/com/glxp/udi/admin/dao/auth/AuthRoleAdminDao.java +++ b/src/main/java/com/glxp/udi/admin/dao/auth/AuthRoleAdminDao.java @@ -1,5 +1,6 @@ package com.glxp.udi.admin.dao.auth; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.udi.admin.entity.auth.AuthRole; import com.glxp.udi.admin.entity.auth.AuthRoleAdmin; import org.apache.ibatis.annotations.Mapper; @@ -9,7 +10,7 @@ import java.util.List; @Mapper -public interface AuthRoleAdminDao { +public interface AuthRoleAdminDao extends BaseMapper { /** * 根据 adminId 查询 diff --git a/src/main/java/com/glxp/udi/admin/dao/auth/AuthRoleDao.java b/src/main/java/com/glxp/udi/admin/dao/auth/AuthRoleDao.java index e6a4c08..992eebd 100644 --- a/src/main/java/com/glxp/udi/admin/dao/auth/AuthRoleDao.java +++ b/src/main/java/com/glxp/udi/admin/dao/auth/AuthRoleDao.java @@ -1,5 +1,6 @@ package com.glxp.udi.admin.dao.auth; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.glxp.udi.admin.entity.auth.AuthRole; import com.glxp.udi.admin.req.auth.AuthRoleQueryRequest; @@ -9,7 +10,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper -public interface AuthRoleDao { +public interface AuthRoleDao extends BaseMapper { /** * 后台管理业务查询列表 diff --git a/src/main/java/com/glxp/udi/admin/dao/auth/CustomerContacDao.java b/src/main/java/com/glxp/udi/admin/dao/auth/CustomerContacDao.java index 131b171..96952c4 100644 --- a/src/main/java/com/glxp/udi/admin/dao/auth/CustomerContacDao.java +++ b/src/main/java/com/glxp/udi/admin/dao/auth/CustomerContacDao.java @@ -1,5 +1,6 @@ package com.glxp.udi.admin.dao.auth; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.glxp.udi.admin.entity.auth.CustomerContactEntity; import com.glxp.udi.admin.req.auth.CustomerContactFilterRequest; @@ -7,7 +8,7 @@ import com.glxp.udi.admin.req.info.DeleteRequest; import org.apache.ibatis.annotations.Mapper; @Mapper -public interface CustomerContacDao { +public interface CustomerContacDao extends BaseMapper { Page filterCustomerContact(Page page, CustomerContactFilterRequest userResisterFilterRequest); diff --git a/src/main/java/com/glxp/udi/admin/dao/auth/CustomerInfoDao.java b/src/main/java/com/glxp/udi/admin/dao/auth/CustomerInfoDao.java index 7054efe..5687785 100644 --- a/src/main/java/com/glxp/udi/admin/dao/auth/CustomerInfoDao.java +++ b/src/main/java/com/glxp/udi/admin/dao/auth/CustomerInfoDao.java @@ -1,22 +1,16 @@ package com.glxp.udi.admin.dao.auth; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.glxp.udi.admin.entity.auth.CustomerDetailEntity; import com.glxp.udi.admin.entity.auth.CustomerInfoEntity; -import com.glxp.udi.admin.req.auth.CustomerInfoFilterRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper -public interface CustomerInfoDao { - - - List filterCustomerInfo(CustomerInfoFilterRequest customerInfoFilterRequest); - - Page filterDetailCustomerInfo(Page page, CustomerInfoFilterRequest customerInfoFilterRequest); - +public interface CustomerInfoDao extends BaseMapper { boolean insertCustomerInfo(CustomerInfoEntity customerInfoEntity); @@ -35,4 +29,6 @@ public interface CustomerInfoDao { * @return */ List selectCustomerIdByCustomerName(@Param("customerName") String customerName); + + IPage filterDetailCustomerInfo(IPage page, String key, String customerName, String companyName, Integer userFlag, Integer bussinessStatus); } diff --git a/src/main/java/com/glxp/udi/admin/dao/auth/DeviceKeyDao.java b/src/main/java/com/glxp/udi/admin/dao/auth/DeviceKeyDao.java index 0e1d6ae..f0f225c 100644 --- a/src/main/java/com/glxp/udi/admin/dao/auth/DeviceKeyDao.java +++ b/src/main/java/com/glxp/udi/admin/dao/auth/DeviceKeyDao.java @@ -1,5 +1,6 @@ package com.glxp.udi.admin.dao.auth; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.glxp.udi.admin.entity.info.DeviceKeyEntity; import com.glxp.udi.admin.req.info.FilterDeviceKeyRequest; @@ -11,7 +12,8 @@ import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper -public interface DeviceKeyDao { +public interface DeviceKeyDao extends BaseMapper { + DeviceKeyEntity findDeviceByImei(FilterDeviceKeyRequest filterDeviceKeyRequest); List findDeviceKey(FilterDeviceKeyRequest filterDeviceKeyRequest); diff --git a/src/main/java/com/glxp/udi/admin/dao/auth/UserRegisterDao.java b/src/main/java/com/glxp/udi/admin/dao/auth/UserRegisterDao.java index 6497a62..1751fcf 100644 --- a/src/main/java/com/glxp/udi/admin/dao/auth/UserRegisterDao.java +++ b/src/main/java/com/glxp/udi/admin/dao/auth/UserRegisterDao.java @@ -1,14 +1,11 @@ package com.glxp.udi.admin.dao.auth; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.udi.admin.entity.auth.UserRegisterEntity; -import com.glxp.udi.admin.req.auth.UserResisterFilterRequest; import org.apache.ibatis.annotations.Mapper; @Mapper -public interface UserRegisterDao { - - Page filterUserRegisters(Page page, UserResisterFilterRequest userResisterFilterRequest); +public interface UserRegisterDao extends BaseMapper { boolean insertUserRegister(UserRegisterEntity userRegisterEntity); diff --git a/src/main/java/com/glxp/udi/admin/dao/basic/BasicBussinessTypeRoleDao.java b/src/main/java/com/glxp/udi/admin/dao/basic/BasicBussinessTypeRoleDao.java index 42dc03c..7a6dd89 100644 --- a/src/main/java/com/glxp/udi/admin/dao/basic/BasicBussinessTypeRoleDao.java +++ b/src/main/java/com/glxp/udi/admin/dao/basic/BasicBussinessTypeRoleDao.java @@ -1,5 +1,6 @@ package com.glxp.udi.admin.dao.basic; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.udi.admin.entity.basic.BasicBussinessTypeRoleEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -7,9 +8,9 @@ import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper -public interface BasicBussinessTypeRoleDao { +public interface BasicBussinessTypeRoleDao extends BaseMapper { - public List getListByRoleId(@Param("roleId") Long roleId); + List getListByRoleId(@Param("roleId") Long roleId); /** * 删除此角色下所有的扫码单据类型授权数据 diff --git a/src/main/java/com/glxp/udi/admin/dao/basic/BussinessTypeDao.java b/src/main/java/com/glxp/udi/admin/dao/basic/BussinessTypeDao.java index ab050cd..ca4accd 100644 --- a/src/main/java/com/glxp/udi/admin/dao/basic/BussinessTypeDao.java +++ b/src/main/java/com/glxp/udi/admin/dao/basic/BussinessTypeDao.java @@ -1,5 +1,7 @@ package com.glxp.udi.admin.dao.basic; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.glxp.udi.admin.entity.basic.BussinessTypeEntity; import com.glxp.udi.admin.req.basic.BussinessTypeFilterRequest; @@ -10,14 +12,16 @@ import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper -public interface BussinessTypeDao { +public interface BussinessTypeDao extends BaseMapper { BussinessTypeEntity selectById(String id); Page filterList(Pagepage, BussinessTypeFilterRequest bussinessTypeFilterRequest); Page filterJoinList(Page page, BussinessTypeFilterRequest bussinessTypeFilterRequest); - Page filterAllByUser(Page page, BussinessTypeFilterRequest bussinessTypeFilterRequest); + IPage filterAllByUser(IPage page, String name, String action, String mainAction, String locInvCode, String customerId, Boolean enabled); + + List filterAllByUserList(BussinessTypeFilterRequest bussinessTypeFilterRequest); boolean insertBussinessType(BussinessTypeEntity bussinessTypeEntity); @@ -80,4 +84,5 @@ public interface BussinessTypeDao { * @return */ String selectSupplementTypeByAction(@Param("action") String action); + } diff --git a/src/main/java/com/glxp/udi/admin/dao/info/CompanyDao.java b/src/main/java/com/glxp/udi/admin/dao/info/CompanyDao.java index 4e8d453..173bace 100644 --- a/src/main/java/com/glxp/udi/admin/dao/info/CompanyDao.java +++ b/src/main/java/com/glxp/udi/admin/dao/info/CompanyDao.java @@ -1,5 +1,6 @@ package com.glxp.udi.admin.dao.info; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.glxp.udi.admin.entity.info.AliKeyEntity; import com.glxp.udi.admin.entity.info.CompanyEntity; @@ -10,7 +11,8 @@ import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper -public interface CompanyDao { + +public interface CompanyDao extends BaseMapper { CompanyEntity findCompany(Long CustomerId); diff --git a/src/main/java/com/glxp/udi/admin/dao/info/CompanyUpdateLogDao.java b/src/main/java/com/glxp/udi/admin/dao/info/CompanyUpdateLogDao.java index be1fa09..7aae3d2 100644 --- a/src/main/java/com/glxp/udi/admin/dao/info/CompanyUpdateLogDao.java +++ b/src/main/java/com/glxp/udi/admin/dao/info/CompanyUpdateLogDao.java @@ -1,5 +1,6 @@ package com.glxp.udi.admin.dao.info; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.udi.admin.entity.info.CompanyUpdateLogEntity; import com.glxp.udi.admin.req.info.FilterCompanyUpdateLogRequest; import org.apache.ibatis.annotations.Mapper; @@ -7,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; import java.util.List; @Mapper -public interface CompanyUpdateLogDao { +public interface CompanyUpdateLogDao extends BaseMapper { List filterCompanyUpdateLog(FilterCompanyUpdateLogRequest filterCompanyUpdateLogRequest); diff --git a/src/main/java/com/glxp/udi/admin/dao/info/PlatformDao.java b/src/main/java/com/glxp/udi/admin/dao/info/PlatformDao.java index b800aec..fe2a090 100644 --- a/src/main/java/com/glxp/udi/admin/dao/info/PlatformDao.java +++ b/src/main/java/com/glxp/udi/admin/dao/info/PlatformDao.java @@ -1,5 +1,6 @@ package com.glxp.udi.admin.dao.info; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.glxp.udi.admin.entity.info.PlatformEntity; import com.glxp.udi.admin.req.info.PlatformLinkRequest; @@ -11,7 +12,7 @@ import java.util.List; import java.util.Map; @Mapper -public interface PlatformDao { +public interface PlatformDao extends BaseMapper { int save(PlatformEntity platformEntity); diff --git a/src/main/java/com/glxp/udi/admin/dao/info/ScheduledDao.java b/src/main/java/com/glxp/udi/admin/dao/info/ScheduledDao.java index b14d925..e49d199 100644 --- a/src/main/java/com/glxp/udi/admin/dao/info/ScheduledDao.java +++ b/src/main/java/com/glxp/udi/admin/dao/info/ScheduledDao.java @@ -1,11 +1,12 @@ package com.glxp.udi.admin.dao.info; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.udi.admin.entity.info.ScheduledEntity; import com.glxp.udi.admin.req.udidl.ScheduledRequest; import org.apache.ibatis.annotations.Mapper; @Mapper -public interface ScheduledDao { +public interface ScheduledDao extends BaseMapper { ScheduledEntity findScheduled(ScheduledRequest scheduledRequest); diff --git a/src/main/java/com/glxp/udi/admin/dao/info/SetupDao.java b/src/main/java/com/glxp/udi/admin/dao/info/SetupDao.java index 712c8cf..5a5a64b 100644 --- a/src/main/java/com/glxp/udi/admin/dao/info/SetupDao.java +++ b/src/main/java/com/glxp/udi/admin/dao/info/SetupDao.java @@ -1,10 +1,11 @@ package com.glxp.udi.admin.dao.info; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.udi.admin.entity.info.SetupEntity; import org.apache.ibatis.annotations.Mapper; @Mapper -public interface SetupDao { +public interface SetupDao extends BaseMapper { boolean modifySetup(SetupEntity setupEntity); diff --git a/src/main/java/com/glxp/udi/admin/dao/inout/StockQRCodeTextDao.java b/src/main/java/com/glxp/udi/admin/dao/inout/StockQRCodeTextDao.java index 0b31934..cb4fc84 100644 --- a/src/main/java/com/glxp/udi/admin/dao/inout/StockQRCodeTextDao.java +++ b/src/main/java/com/glxp/udi/admin/dao/inout/StockQRCodeTextDao.java @@ -1,5 +1,6 @@ package com.glxp.udi.admin.dao.inout; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.udi.admin.entity.inout.StockQRCodeTextEntity; import com.glxp.udi.admin.req.inout.StockQRCodeTextFilterRequest; import org.apache.ibatis.annotations.Mapper; @@ -8,7 +9,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper -public interface StockQRCodeTextDao { +public interface StockQRCodeTextDao extends BaseMapper { List filterStockQRCodeText(StockQRCodeTextFilterRequest stockQRCodeTextFilterRequest); @@ -16,8 +17,6 @@ public interface StockQRCodeTextDao { boolean insertStockQRCodeTexts(@Param("StockQRCodeTextEntities") List StockQRCodeTextEntitys); - boolean updateById(StockQRCodeTextEntity stockQRCodeTextEntity); - boolean deleteById(@Param("id") String id); boolean deleteByOrderId(@Param("id") String id); diff --git a/src/main/java/com/glxp/udi/admin/dao/inout/UdiInfoDao.java b/src/main/java/com/glxp/udi/admin/dao/inout/UdiInfoDao.java index cf946ba..4a6ea13 100644 --- a/src/main/java/com/glxp/udi/admin/dao/inout/UdiInfoDao.java +++ b/src/main/java/com/glxp/udi/admin/dao/inout/UdiInfoDao.java @@ -1,19 +1,14 @@ package com.glxp.udi.admin.dao.inout; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.udi.admin.entity.inout.UdiInfoEntity; -import com.glxp.udi.admin.req.inout.FilterUdiInfoRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper -public interface UdiInfoDao { - - Page filterUdiInfo(Page page, FilterUdiInfoRequest filterUdiInfoRequest); - - Page filterUdiInfoGp(Page page, FilterUdiInfoRequest filterUdiInfoRequest); +public interface UdiInfoDao extends BaseMapper { UdiInfoEntity findByNameCode(@Param("nameCode") String nameCode, @Param("customerId") String customerId); @@ -21,7 +16,6 @@ public interface UdiInfoDao { List findByUuids(@Param("uuid") String uuid, @Param("customerId") String customerId); - UdiInfoEntity selectById(@Param("id") String id); boolean insertUdiInfo(UdiInfoEntity udiInfoEntity); diff --git a/src/main/java/com/glxp/udi/admin/dao/inout/UdiRelevanceDao.java b/src/main/java/com/glxp/udi/admin/dao/inout/UdiRelevanceDao.java index 9d91749..333eb5e 100644 --- a/src/main/java/com/glxp/udi/admin/dao/inout/UdiRelevanceDao.java +++ b/src/main/java/com/glxp/udi/admin/dao/inout/UdiRelevanceDao.java @@ -1,5 +1,6 @@ package com.glxp.udi.admin.dao.inout; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.glxp.udi.admin.entity.inout.UdiRelevanceEntity; import com.glxp.udi.admin.req.inout.FilterUdiInfoRequest; @@ -10,7 +11,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper -public interface UdiRelevanceDao { +public interface UdiRelevanceDao extends BaseMapper { Page filterUdiRelevance(Page page, FilterUdiInfoRequest filterUdiInfoRequest); diff --git a/src/main/java/com/glxp/udi/admin/dao/inout/UnitMaintainDao.java b/src/main/java/com/glxp/udi/admin/dao/inout/UnitMaintainDao.java index 4bd452c..88ec2bc 100644 --- a/src/main/java/com/glxp/udi/admin/dao/inout/UnitMaintainDao.java +++ b/src/main/java/com/glxp/udi/admin/dao/inout/UnitMaintainDao.java @@ -1,16 +1,16 @@ package com.glxp.udi.admin.dao.inout; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.glxp.udi.admin.entity.inout.UnitMaintainEntity; -import com.glxp.udi.admin.req.inout.UnitMaintainFilterRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper -public interface UnitMaintainDao { - Page filterList(Page page, UnitMaintainFilterRequest unitMaintainFilterRequest); +public interface UnitMaintainDao extends BaseMapper { boolean insertUnitMaintain(UnitMaintainEntity unitMaintainEntity); @@ -35,7 +35,7 @@ public interface UnitMaintainDao { * @param unitMaintainFilterRequest * @return */ - Page getUnbindUnitMaintain(Page page, UnitMaintainFilterRequest unitMaintainFilterRequest); + Page getUnbindUnitMaintain(Page page, String customerId); /** * 根据单位ID查询往来单位信息 @@ -77,4 +77,6 @@ public interface UnitMaintainDao { * @return */ int countByName(@Param("name") String name, @Param("customerId") String customerId); + + IPage filterList(IPage page, String key, String customerId, Integer corpType); } diff --git a/src/main/java/com/glxp/udi/admin/dao/inout/WarehouseBussinessTypeDao.java b/src/main/java/com/glxp/udi/admin/dao/inout/WarehouseBussinessTypeDao.java index 77f0b19..d305534 100644 --- a/src/main/java/com/glxp/udi/admin/dao/inout/WarehouseBussinessTypeDao.java +++ b/src/main/java/com/glxp/udi/admin/dao/inout/WarehouseBussinessTypeDao.java @@ -1,5 +1,6 @@ package com.glxp.udi.admin.dao.inout; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.glxp.udi.admin.entity.inout.WarehouseBussinessTypeEntity; import org.apache.ibatis.annotations.Mapper; @@ -8,7 +9,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper -public interface WarehouseBussinessTypeDao { +public interface WarehouseBussinessTypeDao extends BaseMapper { int deleteByPrimaryKey(Integer id); diff --git a/src/main/java/com/glxp/udi/admin/dao/inout/WarehouseUserDao.java b/src/main/java/com/glxp/udi/admin/dao/inout/WarehouseUserDao.java index 0e008a9..269c7b1 100644 --- a/src/main/java/com/glxp/udi/admin/dao/inout/WarehouseUserDao.java +++ b/src/main/java/com/glxp/udi/admin/dao/inout/WarehouseUserDao.java @@ -1,5 +1,6 @@ package com.glxp.udi.admin.dao.inout; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.glxp.udi.admin.entity.inout.WarehouseUserEntity; import org.apache.ibatis.annotations.Mapper; @@ -8,7 +9,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper -public interface WarehouseUserDao { +public interface WarehouseUserDao extends BaseMapper { int deleteByPrimaryKey(Integer id); int insert(WarehouseUserEntity record); diff --git a/src/main/java/com/glxp/udi/admin/dao/inventory/InvStockPrintDao.java b/src/main/java/com/glxp/udi/admin/dao/inventory/InvStockPrintDao.java index ea9f89d..b89657a 100644 --- a/src/main/java/com/glxp/udi/admin/dao/inventory/InvStockPrintDao.java +++ b/src/main/java/com/glxp/udi/admin/dao/inventory/InvStockPrintDao.java @@ -1,5 +1,6 @@ package com.glxp.udi.admin.dao.inventory; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.glxp.udi.admin.entity.basic.StockPrintEntity; import com.glxp.udi.admin.req.basic.FilterStockprintRequest; @@ -9,7 +10,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper -public interface InvStockPrintDao { +public interface InvStockPrintDao extends BaseMapper { List filterStockPrint(FilterStockprintRequest filterStockprintRequest); diff --git a/src/main/java/com/glxp/udi/admin/dao/inventory/InvWarehouseDao.java b/src/main/java/com/glxp/udi/admin/dao/inventory/InvWarehouseDao.java index 186686c..dab35bd 100644 --- a/src/main/java/com/glxp/udi/admin/dao/inventory/InvWarehouseDao.java +++ b/src/main/java/com/glxp/udi/admin/dao/inventory/InvWarehouseDao.java @@ -1,6 +1,7 @@ package com.glxp.udi.admin.dao.inventory; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.glxp.udi.admin.entity.inventory.InvWarehouseEntity; import com.glxp.udi.admin.req.inventory.FilterInvWarehouseRequest; import org.apache.ibatis.annotations.Mapper; @@ -9,9 +10,9 @@ import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper -public interface InvWarehouseDao { +public interface InvWarehouseDao extends BaseMapper { - Page filterInvWarehouse(Page page, FilterInvWarehouseRequest filterInvWarehouseRequest); + IPage filterInvWarehouse(@Param("page") IPage page, @Param("request") FilterInvWarehouseRequest request); List filterAllByUser(FilterInvWarehouseRequest filterInvWarehouseRequest); diff --git a/src/main/java/com/glxp/udi/admin/dao/inventory/StockPrintTempDao.java b/src/main/java/com/glxp/udi/admin/dao/inventory/StockPrintTempDao.java index e77573e..9dc4545 100644 --- a/src/main/java/com/glxp/udi/admin/dao/inventory/StockPrintTempDao.java +++ b/src/main/java/com/glxp/udi/admin/dao/inventory/StockPrintTempDao.java @@ -1,16 +1,16 @@ package com.glxp.udi.admin.dao.inventory; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.glxp.udi.admin.entity.inventory.StockPrintTempEntity; import com.glxp.udi.admin.req.inventory.DeleteStPrintTempRequest; import com.glxp.udi.admin.req.inventory.FilterStPrintTempRequest; import org.apache.ibatis.annotations.Mapper; -import java.util.List; - @Mapper -public interface StockPrintTempDao { +public interface StockPrintTempDao extends BaseMapper { - List filterStockPrintTempEntity(FilterStPrintTempRequest filterStockprintRequest); + Page filterStockPrintTempEntity(Page page, FilterStPrintTempRequest filterStockprintRequest); boolean deleteById(DeleteStPrintTempRequest deleteStPrintTempRequest); diff --git a/src/main/java/com/glxp/udi/admin/dao/param/SystemExcelTemplateDao.java b/src/main/java/com/glxp/udi/admin/dao/param/SystemExcelTemplateDao.java index bfba957..09215b5 100644 --- a/src/main/java/com/glxp/udi/admin/dao/param/SystemExcelTemplateDao.java +++ b/src/main/java/com/glxp/udi/admin/dao/param/SystemExcelTemplateDao.java @@ -1,5 +1,6 @@ package com.glxp.udi.admin.dao.param; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.udi.admin.entity.param.SystemExcelTemplateEntity; import com.glxp.udi.admin.req.param.SystemExcelTemplateRequest; import org.apache.ibatis.annotations.Mapper; @@ -7,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; import java.util.List; @Mapper -public interface SystemExcelTemplateDao { +public interface SystemExcelTemplateDao extends BaseMapper { List filterSystemExcelTemplate(SystemExcelTemplateRequest systemExcelTemplateRequest); diff --git a/src/main/java/com/glxp/udi/admin/dao/param/SystemPDFModuleDao.java b/src/main/java/com/glxp/udi/admin/dao/param/SystemPDFModuleDao.java index 80b7339..ba25cd9 100644 --- a/src/main/java/com/glxp/udi/admin/dao/param/SystemPDFModuleDao.java +++ b/src/main/java/com/glxp/udi/admin/dao/param/SystemPDFModuleDao.java @@ -1,5 +1,6 @@ package com.glxp.udi.admin.dao.param; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.glxp.udi.admin.entity.param.SystemPDFModuleEntity; import com.glxp.udi.admin.req.param.SystemPDFModuleRequest; @@ -7,7 +8,7 @@ import com.glxp.udi.admin.req.param.SystemPDFModuleSaveRequest; import org.apache.ibatis.annotations.Mapper; @Mapper -public interface SystemPDFModuleDao { +public interface SystemPDFModuleDao extends BaseMapper { Page queryPage(Page page, SystemPDFModuleRequest systemPDFModuleRequest); @@ -19,7 +20,7 @@ public interface SystemPDFModuleDao { boolean updateById(SystemPDFModuleSaveRequest systemPDFModuleSaveRequest); - boolean insert(SystemPDFModuleEntity systemPDFModuleEntity); + boolean insertData(SystemPDFModuleEntity systemPDFModuleEntity); boolean deleteById(Integer id); } diff --git a/src/main/java/com/glxp/udi/admin/dao/param/SystemPDFTemplateDao.java b/src/main/java/com/glxp/udi/admin/dao/param/SystemPDFTemplateDao.java index 7f6c8b3..ce38ccd 100644 --- a/src/main/java/com/glxp/udi/admin/dao/param/SystemPDFTemplateDao.java +++ b/src/main/java/com/glxp/udi/admin/dao/param/SystemPDFTemplateDao.java @@ -1,27 +1,22 @@ package com.glxp.udi.admin.dao.param; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.glxp.udi.admin.entity.param.SystemPDFTemplateEntity; -import com.glxp.udi.admin.req.param.SystemPDFTemplateRequest; import com.glxp.udi.admin.req.param.SystemPDFTemplateSaveRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import java.util.List; - @Mapper -public interface SystemPDFTemplateDao { - - List queryPage(SystemPDFTemplateRequest systemPDFTemplateRequest); - - List listPDFTemplates(); +public interface SystemPDFTemplateDao extends BaseMapper { - SystemPDFTemplateEntity findSystemPDFTemplate(SystemPDFTemplateRequest systemPDFTemplateRequest); + Page listPDFTemplates(Page page); SystemPDFTemplateEntity selectById(String id); boolean updateById(SystemPDFTemplateSaveRequest systemPDFTemplateSaveRequest); - boolean insert(SystemPDFTemplateEntity systemPDFTemplateEntity); + boolean insertData(SystemPDFTemplateEntity systemPDFTemplateEntity); boolean deleteById(Integer id); diff --git a/src/main/java/com/glxp/udi/admin/dao/param/SystemPDFTemplateRelevanceDao.java b/src/main/java/com/glxp/udi/admin/dao/param/SystemPDFTemplateRelevanceDao.java index 1600a76..b49e6d3 100644 --- a/src/main/java/com/glxp/udi/admin/dao/param/SystemPDFTemplateRelevanceDao.java +++ b/src/main/java/com/glxp/udi/admin/dao/param/SystemPDFTemplateRelevanceDao.java @@ -1,5 +1,6 @@ package com.glxp.udi.admin.dao.param; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.glxp.udi.admin.entity.param.SystemPDFTemplateRelevanceEntity; import com.glxp.udi.admin.req.itextpdf.SystemPDFTemplateRelevanceRequest; @@ -10,7 +11,7 @@ import java.util.List; @Mapper -public interface SystemPDFTemplateRelevanceDao { +public interface SystemPDFTemplateRelevanceDao extends BaseMapper { Page filterList(Page page, SystemPDFTemplateRelevanceRequest systemPDFModuleRequest); @@ -47,7 +48,7 @@ public interface SystemPDFTemplateRelevanceDao { */ int insertSystemPDFTemplateRelevanceAll(List systemPDFTemplateRelevanceEntityList); - boolean insert(SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntity); + boolean insertData(SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntity); /** diff --git a/src/main/java/com/glxp/udi/admin/dao/param/SystemParamConfigCustomerDao.java b/src/main/java/com/glxp/udi/admin/dao/param/SystemParamConfigCustomerDao.java index ac66192..ef0f95b 100644 --- a/src/main/java/com/glxp/udi/admin/dao/param/SystemParamConfigCustomerDao.java +++ b/src/main/java/com/glxp/udi/admin/dao/param/SystemParamConfigCustomerDao.java @@ -1,14 +1,14 @@ package com.glxp.udi.admin.dao.param; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.glxp.udi.admin.entity.param.SystemParamConfigCustomerEntity; import com.glxp.udi.admin.req.param.SystemParamConfigRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import java.util.List; - @Mapper -public interface SystemParamConfigCustomerDao { +public interface SystemParamConfigCustomerDao extends BaseMapper { int deleteByPrimaryKey(Integer id); int insert(SystemParamConfigCustomerEntity record); @@ -28,7 +28,7 @@ public interface SystemParamConfigCustomerDao { * @param systemParams * @return */ - List selectCustomizeParam(@Param("systemParamConfigRequest") SystemParamConfigRequest systemParamConfigRequest, @Param("systemParams") String[] systemParams); + Page selectCustomizeParam(Page page, @Param("systemParamConfigRequest") SystemParamConfigRequest systemParamConfigRequest, @Param("systemParams") String[] systemParams); /** * 判断客户是否添加过此配置 diff --git a/src/main/java/com/glxp/udi/admin/dao/param/SystemParamConfigDao.java b/src/main/java/com/glxp/udi/admin/dao/param/SystemParamConfigDao.java index 32a8cc8..77bd409 100644 --- a/src/main/java/com/glxp/udi/admin/dao/param/SystemParamConfigDao.java +++ b/src/main/java/com/glxp/udi/admin/dao/param/SystemParamConfigDao.java @@ -1,5 +1,6 @@ package com.glxp.udi.admin.dao.param; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.udi.admin.entity.param.SystemParamConfigEntity; import com.glxp.udi.admin.req.param.SystemParamConfigRequest; import com.glxp.udi.admin.req.param.SystemParamConfigSaveRequest; @@ -9,8 +10,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper -public interface SystemParamConfigDao { - List queryPage(SystemParamConfigRequest systemParamConfigRequest); +public interface SystemParamConfigDao extends BaseMapper { SystemParamConfigEntity findSystemParamConfig(SystemParamConfigRequest systemParamConfigRequest); @@ -24,7 +24,7 @@ public interface SystemParamConfigDao { boolean updateParentId(SystemParamConfigSaveRequest systemParamConfigSaveRequest); - boolean insert(SystemParamConfigEntity systemParamConfigEntity); + boolean insertData(SystemParamConfigEntity systemParamConfigEntity); /** * 查询可以自定义的参数 diff --git a/src/main/java/com/glxp/udi/admin/entity/auth/AuthAdmin.java b/src/main/java/com/glxp/udi/admin/entity/auth/AuthAdmin.java index 7e8f7fc..f2f6458 100644 --- a/src/main/java/com/glxp/udi/admin/entity/auth/AuthAdmin.java +++ b/src/main/java/com/glxp/udi/admin/entity/auth/AuthAdmin.java @@ -1,5 +1,6 @@ package com.glxp.udi.admin.entity.auth; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.glxp.udi.admin.util.serializer.LongJsonDeserializer; @@ -9,6 +10,7 @@ import lombok.Data; import java.util.Date; @Data +@TableName("auth_user") public class AuthAdmin { // 主键 diff --git a/src/main/java/com/glxp/udi/admin/entity/auth/AuthLicense.java b/src/main/java/com/glxp/udi/admin/entity/auth/AuthLicense.java index fb9772a..540ea93 100644 --- a/src/main/java/com/glxp/udi/admin/entity/auth/AuthLicense.java +++ b/src/main/java/com/glxp/udi/admin/entity/auth/AuthLicense.java @@ -1,10 +1,12 @@ package com.glxp.udi.admin.entity.auth; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.util.Date; @Data +@TableName("auth_license") public class AuthLicense { private String id; diff --git a/src/main/java/com/glxp/udi/admin/entity/auth/AuthPermission.java b/src/main/java/com/glxp/udi/admin/entity/auth/AuthPermission.java index 5441a5a..623c3dc 100644 --- a/src/main/java/com/glxp/udi/admin/entity/auth/AuthPermission.java +++ b/src/main/java/com/glxp/udi/admin/entity/auth/AuthPermission.java @@ -1,11 +1,13 @@ package com.glxp.udi.admin.entity.auth; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; /** * 权限授权表 */ @Data +@TableName("auth_permission") public class AuthPermission { private Long id; diff --git a/src/main/java/com/glxp/udi/admin/entity/auth/AuthPermissionRule.java b/src/main/java/com/glxp/udi/admin/entity/auth/AuthPermissionRule.java index a8fe6db..c661a2f 100644 --- a/src/main/java/com/glxp/udi/admin/entity/auth/AuthPermissionRule.java +++ b/src/main/java/com/glxp/udi/admin/entity/auth/AuthPermissionRule.java @@ -1,5 +1,7 @@ package com.glxp.udi.admin.entity.auth; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.util.Date; @@ -8,6 +10,7 @@ import java.util.Date; * 规则表 */ @Data +@TableName("auth_permission_rule") public class AuthPermissionRule { private Long id; @@ -24,8 +27,10 @@ public class AuthPermissionRule { private Integer listorder; + @TableField("create_time") private Date createTime; + @TableField("update_time") private Date updateTime; } diff --git a/src/main/java/com/glxp/udi/admin/entity/auth/AuthRole.java b/src/main/java/com/glxp/udi/admin/entity/auth/AuthRole.java index 2bfbf6a..248630b 100644 --- a/src/main/java/com/glxp/udi/admin/entity/auth/AuthRole.java +++ b/src/main/java/com/glxp/udi/admin/entity/auth/AuthRole.java @@ -1,5 +1,7 @@ package com.glxp.udi.admin.entity.auth; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.util.Date; @@ -8,6 +10,7 @@ import java.util.Date; * 角色表 */ @Data +@TableName("auth_role") public class AuthRole { private Long id; @@ -22,8 +25,10 @@ public class AuthRole { private Long listorder; + @TableField("create_time") private Date createTime; + @TableField("update_time") private Date updateTime; private Integer isCustomer; diff --git a/src/main/java/com/glxp/udi/admin/entity/auth/AuthRoleAdmin.java b/src/main/java/com/glxp/udi/admin/entity/auth/AuthRoleAdmin.java index 892424c..35846be 100644 --- a/src/main/java/com/glxp/udi/admin/entity/auth/AuthRoleAdmin.java +++ b/src/main/java/com/glxp/udi/admin/entity/auth/AuthRoleAdmin.java @@ -1,11 +1,13 @@ package com.glxp.udi.admin.entity.auth; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; /** * 用户角色对应表 */ @Data +@TableName("auth_role_admin") public class AuthRoleAdmin { private Long id; diff --git a/src/main/java/com/glxp/udi/admin/entity/auth/CustomerContactEntity.java b/src/main/java/com/glxp/udi/admin/entity/auth/CustomerContactEntity.java index e98ae11..7732ebe 100644 --- a/src/main/java/com/glxp/udi/admin/entity/auth/CustomerContactEntity.java +++ b/src/main/java/com/glxp/udi/admin/entity/auth/CustomerContactEntity.java @@ -1,8 +1,10 @@ package com.glxp.udi.admin.entity.auth; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @Data +@TableName("customer_contact") public class CustomerContactEntity { private Long id; diff --git a/src/main/java/com/glxp/udi/admin/entity/auth/CustomerInfoEntity.java b/src/main/java/com/glxp/udi/admin/entity/auth/CustomerInfoEntity.java index 0fb1ce7..a20bb34 100644 --- a/src/main/java/com/glxp/udi/admin/entity/auth/CustomerInfoEntity.java +++ b/src/main/java/com/glxp/udi/admin/entity/auth/CustomerInfoEntity.java @@ -1,8 +1,10 @@ package com.glxp.udi.admin.entity.auth; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @Data +@TableName("customer_info") public class CustomerInfoEntity { private Long customerId; diff --git a/src/main/java/com/glxp/udi/admin/entity/auth/UserRegisterEntity.java b/src/main/java/com/glxp/udi/admin/entity/auth/UserRegisterEntity.java index abdea61..cbd1047 100644 --- a/src/main/java/com/glxp/udi/admin/entity/auth/UserRegisterEntity.java +++ b/src/main/java/com/glxp/udi/admin/entity/auth/UserRegisterEntity.java @@ -1,8 +1,10 @@ package com.glxp.udi.admin.entity.auth; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @Data +@TableName("user_register") public class UserRegisterEntity { private Integer id; diff --git a/src/main/java/com/glxp/udi/admin/entity/basic/BasicBussinessTypeRoleEntity.java b/src/main/java/com/glxp/udi/admin/entity/basic/BasicBussinessTypeRoleEntity.java index 9202e72..35a9c3d 100644 --- a/src/main/java/com/glxp/udi/admin/entity/basic/BasicBussinessTypeRoleEntity.java +++ b/src/main/java/com/glxp/udi/admin/entity/basic/BasicBussinessTypeRoleEntity.java @@ -1,11 +1,13 @@ package com.glxp.udi.admin.entity.basic; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; /** * 扫码单据类型和角色关联表 */ @Data +@TableName("basic_bussiness_type_role") public class BasicBussinessTypeRoleEntity { private Integer id; diff --git a/src/main/java/com/glxp/udi/admin/entity/basic/BussinessTypeEntity.java b/src/main/java/com/glxp/udi/admin/entity/basic/BussinessTypeEntity.java index 9f76fae..cb0ef43 100644 --- a/src/main/java/com/glxp/udi/admin/entity/basic/BussinessTypeEntity.java +++ b/src/main/java/com/glxp/udi/admin/entity/basic/BussinessTypeEntity.java @@ -1,5 +1,7 @@ package com.glxp.udi.admin.entity.basic; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -8,6 +10,7 @@ import javax.validation.constraints.NotBlank; @ApiModel("单据类型数据") @Data +@TableName("basic_bussiness_type") public class BussinessTypeEntity { @ApiModelProperty(value = "数据ID") @@ -36,12 +39,14 @@ public class BussinessTypeEntity { private String localAction; @ApiModelProperty(value = "本地单据类型名称") + @TableField(exist = false) private String localName; @ApiModelProperty(hidden = true) private boolean checkEnable; @ApiModelProperty(hidden = true) + @TableField(exist = false) private boolean advanceType; @ApiModelProperty(value = "是否自动生成往来单位：1.是；2.否") @@ -54,12 +59,14 @@ public class BussinessTypeEntity { private boolean secCheckEnable; @ApiModelProperty(value = "是否允许供应商使用") + @TableField(exist = false) private Boolean spUse; @ApiModelProperty(hidden = true) private String defaultUnit; @ApiModelProperty(hidden = true) + @TableField("`index`") private Integer index; @ApiModelProperty(hidden = true) diff --git a/src/main/java/com/glxp/udi/admin/entity/basic/StockPrintEntity.java b/src/main/java/com/glxp/udi/admin/entity/basic/StockPrintEntity.java index c34730d..ec5178c 100644 --- a/src/main/java/com/glxp/udi/admin/entity/basic/StockPrintEntity.java +++ b/src/main/java/com/glxp/udi/admin/entity/basic/StockPrintEntity.java @@ -1,11 +1,13 @@ package com.glxp.udi.admin.entity.basic; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.io.Serializable; import java.util.Date; @Data +@TableName("inv_stockprint") public class StockPrintEntity implements Serializable { private Integer id; diff --git a/src/main/java/com/glxp/udi/admin/entity/info/CompanyEntity.java b/src/main/java/com/glxp/udi/admin/entity/info/CompanyEntity.java index e9a6c6e..68f2fc7 100644 --- a/src/main/java/com/glxp/udi/admin/entity/info/CompanyEntity.java +++ b/src/main/java/com/glxp/udi/admin/entity/info/CompanyEntity.java @@ -1,5 +1,6 @@ package com.glxp.udi.admin.entity.info; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.glxp.udi.admin.util.serializer.LongJsonDeserializer; @@ -9,6 +10,7 @@ import lombok.Data; import java.util.Date; @Data +@TableName("company") public class CompanyEntity { private String companyName; //企业名称 diff --git a/src/main/java/com/glxp/udi/admin/entity/info/CompanyUpdateLogEntity.java b/src/main/java/com/glxp/udi/admin/entity/info/CompanyUpdateLogEntity.java index 55a4c30..3b007c3 100644 --- a/src/main/java/com/glxp/udi/admin/entity/info/CompanyUpdateLogEntity.java +++ b/src/main/java/com/glxp/udi/admin/entity/info/CompanyUpdateLogEntity.java @@ -1,11 +1,13 @@ package com.glxp.udi.admin.entity.info; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.util.Date; @Data +@TableName("company_update_log") public class CompanyUpdateLogEntity { private Integer id; diff --git a/src/main/java/com/glxp/udi/admin/entity/info/DeviceKeyEntity.java b/src/main/java/com/glxp/udi/admin/entity/info/DeviceKeyEntity.java index 3a56ee5..3901308 100644 --- a/src/main/java/com/glxp/udi/admin/entity/info/DeviceKeyEntity.java +++ b/src/main/java/com/glxp/udi/admin/entity/info/DeviceKeyEntity.java @@ -1,8 +1,10 @@ package com.glxp.udi.admin.entity.info; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @Data +@TableName("device_check") public class DeviceKeyEntity { private String id; diff --git a/src/main/java/com/glxp/udi/admin/entity/info/PlatformEntity.java b/src/main/java/com/glxp/udi/admin/entity/info/PlatformEntity.java index 9fd0a8e..f4fd976 100644 --- a/src/main/java/com/glxp/udi/admin/entity/info/PlatformEntity.java +++ b/src/main/java/com/glxp/udi/admin/entity/info/PlatformEntity.java @@ -1,8 +1,10 @@ package com.glxp.udi.admin.entity.info; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @Data +@TableName("auth_platform") public class PlatformEntity { private String id; diff --git a/src/main/java/com/glxp/udi/admin/entity/info/ScheduledEntity.java b/src/main/java/com/glxp/udi/admin/entity/info/ScheduledEntity.java index 7e708f4..444c371 100644 --- a/src/main/java/com/glxp/udi/admin/entity/info/ScheduledEntity.java +++ b/src/main/java/com/glxp/udi/admin/entity/info/ScheduledEntity.java @@ -1,8 +1,10 @@ package com.glxp.udi.admin.entity.info; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @Data +@TableName("scheduled") public class ScheduledEntity { private int id; diff --git a/src/main/java/com/glxp/udi/admin/entity/info/SetupEntity.java b/src/main/java/com/glxp/udi/admin/entity/info/SetupEntity.java index 0b1df40..0374b8e 100644 --- a/src/main/java/com/glxp/udi/admin/entity/info/SetupEntity.java +++ b/src/main/java/com/glxp/udi/admin/entity/info/SetupEntity.java @@ -1,8 +1,10 @@ package com.glxp.udi.admin.entity.info; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @Data +@TableName("customer_set") public class SetupEntity { private int id; diff --git a/src/main/java/com/glxp/udi/admin/entity/inout/StockQRCodeTextEntity.java b/src/main/java/com/glxp/udi/admin/entity/inout/StockQRCodeTextEntity.java index bf9ee42..418b352 100644 --- a/src/main/java/com/glxp/udi/admin/entity/inout/StockQRCodeTextEntity.java +++ b/src/main/java/com/glxp/udi/admin/entity/inout/StockQRCodeTextEntity.java @@ -1,11 +1,13 @@ package com.glxp.udi.admin.entity.inout; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.util.Date; @Data +@TableName("stock_qrcode_text") public class StockQRCodeTextEntity { private String id; diff --git a/src/main/java/com/glxp/udi/admin/entity/inout/UdiInfoEntity.java b/src/main/java/com/glxp/udi/admin/entity/inout/UdiInfoEntity.java index abf8d7f..5e922bb 100644 --- a/src/main/java/com/glxp/udi/admin/entity/inout/UdiInfoEntity.java +++ b/src/main/java/com/glxp/udi/admin/entity/inout/UdiInfoEntity.java @@ -1,7 +1,13 @@ package com.glxp.udi.admin.entity.inout; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + import java.util.Date; +@Data +@TableName("io_productinfo") public class UdiInfoEntity { private Integer id; @@ -56,10 +62,6 @@ public class UdiInfoEntity { private Integer diType; - private String thirdId; - - private String thirdName; - private String customerId; private String scbssfbhph; @@ -76,415 +78,35 @@ public class UdiInfoEntity { private Date lastUpdateTime; //更新时间 + private String ybbm; //医保编码 + + private String sptm; //商品条码 + + private Boolean isDisable; + //本地生成信息 + @TableField(exist = false) private String batchNo; + @TableField(exist = false) private String produceDate; + @TableField(exist = false) private String expireDate; + @TableField(exist = false) private String serialNo; + @TableField(exist = false) private String udi; + @TableField(exist = false) private String code; + @TableField(exist = false) private Integer count; - private String ybbm; //医保编码 - - private String sptm; //商品条码 - + @TableField(exist = false) private Boolean isCheck; - private Boolean isDisable; - - public String getYbbm() { - return ybbm; - } - - public void setYbbm(String ybbm) { - this.ybbm = ybbm; - } - - public String getSptm() { - return sptm; - } - - public void setSptm(String sptm) { - this.sptm = sptm; - } - - public Boolean getDisable() { - return isDisable; - } - - public void setDisable(Boolean disable) { - isDisable = disable; - } - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getNameCode() { - return nameCode; - } - - public void setNameCode(String nameCode) { - this.nameCode = nameCode; - } - - public String getPackRatio() { - return packRatio; - } - - public void setPackRatio(String packRatio) { - this.packRatio = packRatio; - } - - public String getPackLevel() { - return packLevel; - } - - public void setPackLevel(String packLevel) { - this.packLevel = packLevel; - } - - public Integer getBhxjsl() { - if (bhxjsl == null || bhxjsl == 0) { - return 1; - } - return bhxjsl; - } - - public void setBhxjsl(Integer bhxjsl) { - this.bhxjsl = bhxjsl; - } - - public Integer getBhzxxsbzsl() { - if (bhzxxsbzsl == null || bhzxxsbzsl == 0) { - return 1; - } - return bhzxxsbzsl; - } - - public void setBhzxxsbzsl(Integer bhzxxsbzsl) { - this.bhzxxsbzsl = bhzxxsbzsl; - } - - public Integer getZxxsbzbhsydysl() { - if (zxxsbzbhsydysl == null || zxxsbzbhsydysl == 0) { - return 1; - } - return zxxsbzbhsydysl; - } - - public void setZxxsbzbhsydysl(Integer zxxsbzbhsydysl) { - this.zxxsbzbhsydysl = zxxsbzbhsydysl; - } - - public String getBhxjcpbm() { - return bhxjcpbm; - } - - public void setBhxjcpbm(String bhxjcpbm) { - this.bhxjcpbm = bhxjcpbm; - } - - public String getSjcpbm() { - return sjcpbm; - } - - public void setSjcpbm(String sjcpbm) { - this.sjcpbm = sjcpbm; - } - - public String getBzcj() { - return bzcj; - } - - public void setBzcj(String bzcj) { - this.bzcj = bzcj; - } - - public String getAddType() { - return addType; - } - - public void setAddType(String addType) { - this.addType = addType; - } - - public String getDeviceRecordKey() { - return deviceRecordKey; - } - - public void setDeviceRecordKey(String deviceRecordKey) { - this.deviceRecordKey = deviceRecordKey; - } - - public int getIsUseDy() { - return isUseDy; - } - - public void setIsUseDy(int isUseDy) { - this.isUseDy = isUseDy; - } - - public String getCpmctymc() { - return cpmctymc; - } - - public void setCpmctymc(String cpmctymc) { - this.cpmctymc = cpmctymc; - } - - public String getCplb() { - return cplb; - } - - public void setCplb(String cplb) { - this.cplb = cplb; - } - - public String getFlbm() { - return flbm; - } - - public void setFlbm(String flbm) { - this.flbm = flbm; - } - - public String getGgxh() { - return ggxh; - } - - public void setGgxh(String ggxh) { - this.ggxh = ggxh; - } - - public String getQxlb() { - return qxlb; - } - - public void setQxlb(String qxlb) { - this.qxlb = qxlb; - } - - public String getTyshxydm() { - return tyshxydm; - } - - public void setTyshxydm(String tyshxydm) { - this.tyshxydm = tyshxydm; - } - - public String getYlqxzcrbarmc() { - return ylqxzcrbarmc; - } - - public void setYlqxzcrbarmc(String ylqxzcrbarmc) { - this.ylqxzcrbarmc = ylqxzcrbarmc; - } - - public String getZczbhhzbapzbh() { - return zczbhhzbapzbh; - } - - public void setZczbhhzbapzbh(String zczbhhzbapzbh) { - this.zczbhhzbapzbh = zczbhhzbapzbh; - } - - public String getYlqxzcrbarywmc() { - return ylqxzcrbarywmc; - } - - public void setYlqxzcrbarywmc(String ylqxzcrbarywmc) { - this.ylqxzcrbarywmc = ylqxzcrbarywmc; - } - - public String getSydycpbs() { - return sydycpbs; - } - - public void setSydycpbs(String sydycpbs) { - this.sydycpbs = sydycpbs; - } - - public String getUuid() { - return uuid; - } - - public void setUuid(String uuid) { - this.uuid = uuid; - } - - public int getVersionNumber() { - return versionNumber; - } - - public void setVersionNumber(int versionNumber) { - this.versionNumber = versionNumber; - } - - public int getDiType() { - return diType; - } - - public void setDiType(int diType) { - this.diType = diType; - } - - public String getThirdId() { - return thirdId; - } - - public void setThirdId(String thirdId) { - this.thirdId = thirdId; - } - - public String getThirdName() { - return thirdName; - } - - public void setThirdName(String thirdName) { - this.thirdName = thirdName; - } - - public String getBatchNo() { - return batchNo; - } - - public void setBatchNo(String batchNo) { - this.batchNo = batchNo; - } - - public String getProduceDate() { - return produceDate; - } - - public void setProduceDate(String produceDate) { - this.produceDate = produceDate; - } - - public String getExpireDate() { - return expireDate; - } - - public void setExpireDate(String expireDate) { - this.expireDate = expireDate; - } - - public String getSerialNo() { - return serialNo; - } - - public void setSerialNo(String serialNo) { - this.serialNo = serialNo; - } - - public String getUdi() { - return udi; - } - - public void setUdi(String udi) { - this.udi = udi; - } - - public String getCode() { - return code; - } - - public void setCode(String code) { - this.code = code; - } - - public Integer getCount() { - if (count == null) { - return 1; - } - return count; - } - - public void setCount(Integer count) { - this.count = count; - } - - public String getCustomerId() { - return customerId; - } - - public void setCustomerId(String customerId) { - this.customerId = customerId; - } - - public Boolean getCheck() { - return isCheck; - } - - public void setCheck(Boolean check) { - isCheck = check; - } - - public String getScbssfbhph() { - return scbssfbhph; - } - - public void setScbssfbhph(String scbssfbhph) { - this.scbssfbhph = scbssfbhph; - } - - public String getScbssfbhxlh() { - return scbssfbhxlh; - } - - public void setScbssfbhxlh(String scbssfbhxlh) { - this.scbssfbhxlh = scbssfbhxlh; - } - - public String getScbssfbhscrq() { - return scbssfbhscrq; - } - - public void setScbssfbhscrq(String scbssfbhscrq) { - this.scbssfbhscrq = scbssfbhscrq; - } - - public String getScbssfbhsxrq() { - return scbssfbhsxrq; - } - - public void setScbssfbhsxrq(String scbssfbhsxrq) { - this.scbssfbhsxrq = scbssfbhsxrq; - } - - public String getCpms() { - return cpms; - } - - public void setCpms(String cpms) { - this.cpms = cpms; - } - - public String getManufactory() { - return manufactory; - } - - public void setManufactory(String manufactory) { - this.manufactory = manufactory; - } - - public Date getLastUpdateTime() { - return lastUpdateTime; - } - - public void setLastUpdateTime(Date lastUpdateTime) { - this.lastUpdateTime = lastUpdateTime; - } - } diff --git a/src/main/java/com/glxp/udi/admin/entity/inout/UdiRelevanceEntity.java b/src/main/java/com/glxp/udi/admin/entity/inout/UdiRelevanceEntity.java index 042ff5c..eb7430e 100644 --- a/src/main/java/com/glxp/udi/admin/entity/inout/UdiRelevanceEntity.java +++ b/src/main/java/com/glxp/udi/admin/entity/inout/UdiRelevanceEntity.java @@ -1,8 +1,10 @@ package com.glxp.udi.admin.entity.inout; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @Data +@TableName("udi_relevance") public class UdiRelevanceEntity { private String id; diff --git a/src/main/java/com/glxp/udi/admin/entity/inout/UnitMaintainEntity.java b/src/main/java/com/glxp/udi/admin/entity/inout/UnitMaintainEntity.java index a065e78..de73f6f 100644 --- a/src/main/java/com/glxp/udi/admin/entity/inout/UnitMaintainEntity.java +++ b/src/main/java/com/glxp/udi/admin/entity/inout/UnitMaintainEntity.java @@ -1,11 +1,13 @@ package com.glxp.udi.admin.entity.inout; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; @Data +@TableName("io_unit_maintain") public class UnitMaintainEntity { private Integer id; diff --git a/src/main/java/com/glxp/udi/admin/entity/inout/WarehouseBussinessTypeEntity.java b/src/main/java/com/glxp/udi/admin/entity/inout/WarehouseBussinessTypeEntity.java index 7615482..7d95978 100644 --- a/src/main/java/com/glxp/udi/admin/entity/inout/WarehouseBussinessTypeEntity.java +++ b/src/main/java/com/glxp/udi/admin/entity/inout/WarehouseBussinessTypeEntity.java @@ -1,11 +1,13 @@ package com.glxp.udi.admin.entity.inout; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; /** * 仓库字典-单据类型关联表 */ @Data +@TableName("inv_warehouse_bussiness_type") public class WarehouseBussinessTypeEntity { /** diff --git a/src/main/java/com/glxp/udi/admin/entity/inout/WarehouseUserEntity.java b/src/main/java/com/glxp/udi/admin/entity/inout/WarehouseUserEntity.java index 398f639..45e797e 100644 --- a/src/main/java/com/glxp/udi/admin/entity/inout/WarehouseUserEntity.java +++ b/src/main/java/com/glxp/udi/admin/entity/inout/WarehouseUserEntity.java @@ -1,11 +1,13 @@ package com.glxp.udi.admin.entity.inout; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; /** * 仓库字典-用户关联表 */ @Data +@TableName("inv_warehouse_user") public class WarehouseUserEntity { /** diff --git a/src/main/java/com/glxp/udi/admin/entity/inventory/InvWarehouseEntity.java b/src/main/java/com/glxp/udi/admin/entity/inventory/InvWarehouseEntity.java index 326e74d..3445075 100644 --- a/src/main/java/com/glxp/udi/admin/entity/inventory/InvWarehouseEntity.java +++ b/src/main/java/com/glxp/udi/admin/entity/inventory/InvWarehouseEntity.java @@ -1,10 +1,14 @@ package com.glxp.udi.admin.entity.inventory; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.util.Date; + @Data +@TableName("inv_warehouse") public class InvWarehouseEntity { private Integer id; @@ -29,6 +33,7 @@ public class InvWarehouseEntity { private String pcode; + @TableField(exist = false) private String pName; //关联公司ID @@ -37,14 +42,19 @@ public class InvWarehouseEntity { /** * 第三方仓库ID */ + @TableField(exist = false) private String thirdId; + @TableField(exist = false) private String thirdId1; + @TableField(exist = false) private String thirdId2; + @TableField(exist = false) private String thirdId3; + @TableField(exist = false) private String thirdId4; } diff --git a/src/main/java/com/glxp/udi/admin/entity/inventory/StockPrintTempEntity.java b/src/main/java/com/glxp/udi/admin/entity/inventory/StockPrintTempEntity.java index d27cc36..9203d6b 100644 --- a/src/main/java/com/glxp/udi/admin/entity/inventory/StockPrintTempEntity.java +++ b/src/main/java/com/glxp/udi/admin/entity/inventory/StockPrintTempEntity.java @@ -1,8 +1,10 @@ package com.glxp.udi.admin.entity.inventory; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @Data +@TableName("inv_stockprint_pdf_temp") public class StockPrintTempEntity { private Integer id; diff --git a/src/main/java/com/glxp/udi/admin/entity/param/SystemExcelTemplateEntity.java b/src/main/java/com/glxp/udi/admin/entity/param/SystemExcelTemplateEntity.java index 6791436..58a319c 100644 --- a/src/main/java/com/glxp/udi/admin/entity/param/SystemExcelTemplateEntity.java +++ b/src/main/java/com/glxp/udi/admin/entity/param/SystemExcelTemplateEntity.java @@ -1,11 +1,13 @@ package com.glxp.udi.admin.entity.param; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.util.Date; @Data +@TableName("system_excel_template") public class SystemExcelTemplateEntity { private Integer id; diff --git a/src/main/java/com/glxp/udi/admin/entity/param/SystemPDFModuleEntity.java b/src/main/java/com/glxp/udi/admin/entity/param/SystemPDFModuleEntity.java index 9b7e4e2..6bb42e0 100644 --- a/src/main/java/com/glxp/udi/admin/entity/param/SystemPDFModuleEntity.java +++ b/src/main/java/com/glxp/udi/admin/entity/param/SystemPDFModuleEntity.java @@ -1,10 +1,12 @@ package com.glxp.udi.admin.entity.param; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.util.Date; @Data +@TableName("system_pdf_module") public class SystemPDFModuleEntity { private int id; diff --git a/src/main/java/com/glxp/udi/admin/entity/param/SystemPDFTemplateEntity.java b/src/main/java/com/glxp/udi/admin/entity/param/SystemPDFTemplateEntity.java index a4ae4a3..44f30b9 100644 --- a/src/main/java/com/glxp/udi/admin/entity/param/SystemPDFTemplateEntity.java +++ b/src/main/java/com/glxp/udi/admin/entity/param/SystemPDFTemplateEntity.java @@ -1,10 +1,12 @@ package com.glxp.udi.admin.entity.param; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.util.Date; @Data +@TableName("system_pdf_template") public class SystemPDFTemplateEntity { private int id; diff --git a/src/main/java/com/glxp/udi/admin/entity/param/SystemPDFTemplateRelevanceEntity.java b/src/main/java/com/glxp/udi/admin/entity/param/SystemPDFTemplateRelevanceEntity.java index 305adc0..104d2db 100644 --- a/src/main/java/com/glxp/udi/admin/entity/param/SystemPDFTemplateRelevanceEntity.java +++ b/src/main/java/com/glxp/udi/admin/entity/param/SystemPDFTemplateRelevanceEntity.java @@ -1,11 +1,13 @@ package com.glxp.udi.admin.entity.param; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; /** * 用户角色对应表 */ @Data +@TableName("system_pdf_template_relevance") public class SystemPDFTemplateRelevanceEntity { private int id; diff --git a/src/main/java/com/glxp/udi/admin/entity/param/SystemParamConfigCustomerEntity.java b/src/main/java/com/glxp/udi/admin/entity/param/SystemParamConfigCustomerEntity.java index 72be973..b8e43a7 100644 --- a/src/main/java/com/glxp/udi/admin/entity/param/SystemParamConfigCustomerEntity.java +++ b/src/main/java/com/glxp/udi/admin/entity/param/SystemParamConfigCustomerEntity.java @@ -1,11 +1,13 @@ package com.glxp.udi.admin.entity.param; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; /** * 客户自定义参数设置表 */ @Data +@TableName("system_param_config_customer") public class SystemParamConfigCustomerEntity { /** diff --git a/src/main/java/com/glxp/udi/admin/entity/param/SystemParamConfigEntity.java b/src/main/java/com/glxp/udi/admin/entity/param/SystemParamConfigEntity.java index 95caad0..7f51c6c 100644 --- a/src/main/java/com/glxp/udi/admin/entity/param/SystemParamConfigEntity.java +++ b/src/main/java/com/glxp/udi/admin/entity/param/SystemParamConfigEntity.java @@ -1,8 +1,10 @@ package com.glxp.udi.admin.entity.param; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @Data +@TableName("system_param_config") public class SystemParamConfigEntity { private int id; diff --git a/src/main/java/com/glxp/udi/admin/req/param/SystemPDFTemplateRequest.java b/src/main/java/com/glxp/udi/admin/req/param/SystemPDFTemplateRequest.java index 22709b9..ce5d6df 100644 --- a/src/main/java/com/glxp/udi/admin/req/param/SystemPDFTemplateRequest.java +++ b/src/main/java/com/glxp/udi/admin/req/param/SystemPDFTemplateRequest.java @@ -10,7 +10,7 @@ import java.util.Date; @Data public class SystemPDFTemplateRequest extends ListPageRequest { - private int id; + private Integer id; private String name; private Integer type; private Integer module; diff --git a/src/main/java/com/glxp/udi/admin/service/auth/AuthAdminService.java b/src/main/java/com/glxp/udi/admin/service/auth/AuthAdminService.java index 20bd4bd..db88498 100644 --- a/src/main/java/com/glxp/udi/admin/service/auth/AuthAdminService.java +++ b/src/main/java/com/glxp/udi/admin/service/auth/AuthAdminService.java @@ -1,5 +1,9 @@ package com.glxp.udi.admin.service.auth; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.glxp.udi.admin.dao.auth.AuthAdminDao; import com.glxp.udi.admin.entity.auth.AuthAdmin; @@ -15,22 +19,29 @@ import org.springframework.web.context.request.ServletRequestAttributes; import javax.annotation.Resource; import java.util.Date; +import java.util.List; @Slf4j @Service @Transactional(rollbackFor = Exception.class) -public class AuthAdminService{ +public class AuthAdminService { @Resource private AuthAdminDao authAdminDao; - public Page listAdminPage(AuthAdminQueryRequest authAdminQueryRequest) { + public IPage listAdminPage(AuthAdminQueryRequest authAdminQueryRequest) { if (authAdminQueryRequest == null) { - return new Page(); + return new Page<>(); } - Page page = new Page<>(authAdminQueryRequest.getPage(), authAdminQueryRequest.getLimit()); - return authAdminDao.listAdminPage(page, authAdminQueryRequest); + IPage page = new Page<>(authAdminQueryRequest.getPage(), authAdminQueryRequest.getLimit()); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.in(CollUtil.isNotEmpty(authAdminQueryRequest.getIds()), "id", authAdminQueryRequest.getIds()) + .eq(null != authAdminQueryRequest.getUserFlag(), "userFlag", authAdminQueryRequest.getUserFlag()) + .like(StrUtil.isNotBlank(authAdminQueryRequest.getUserName()), "userName", authAdminQueryRequest.getUserName()) + .eq(StrUtil.isNotBlank(authAdminQueryRequest.getCustomerId()), "CustomerId", authAdminQueryRequest.getCustomerId()) + .orderByDesc("id"); + return authAdminDao.selectPage(page, wrapper); } public AuthAdmin findByUserName(String userName) { @@ -104,12 +115,20 @@ public class AuthAdminService{ return authAdminDao.deleteByCustomerId(customerId); } - public Page getUserList(QueryRequest queryRequest) { + public IPage getUserList(QueryRequest queryRequest) { if (queryRequest == null) { return new Page<>(); } - Page page = new Page<>(queryRequest.getPage(), queryRequest.getLimit()); - return authAdminDao.getUserList(page, queryRequest.getCustomerId()); + if (null != queryRequest.getPage()) { + Page page = new Page<>(queryRequest.getPage(), queryRequest.getLimit()); + return authAdminDao.getUserList(page, queryRequest.getCustomerId()); + } else { + List list = authAdminDao.selectList(new QueryWrapper().eq("CustomerId", queryRequest.getCustomerId())); + IPage page = new Page<>(); + page.setTotal(list.size()); + page.setRecords(list); + return page; + } } public AuthAdmin getCurrentUser() { diff --git a/src/main/java/com/glxp/udi/admin/service/auth/AuthRoleService.java b/src/main/java/com/glxp/udi/admin/service/auth/AuthRoleService.java index 23d9c2f..23facda 100644 --- a/src/main/java/com/glxp/udi/admin/service/auth/AuthRoleService.java +++ b/src/main/java/com/glxp/udi/admin/service/auth/AuthRoleService.java @@ -1,5 +1,8 @@ package com.glxp.udi.admin.service.auth; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.glxp.udi.admin.dao.auth.AuthRoleDao; import com.glxp.udi.admin.dao.basic.BasicBussinessTypeRoleDao; @@ -30,9 +33,12 @@ public class AuthRoleService { * * @return */ - public Page listAdminPage(AuthRoleQueryRequest authRoleQueryRequest) { - Page authRolePage = new Page<>(authRoleQueryRequest.getPage(), authRoleQueryRequest.getLimit()); - return authRoleDao.listAdminPage(authRolePage, authRoleQueryRequest); + public IPage listAdminPage(AuthRoleQueryRequest authRoleQueryRequest) { + IPage page = new Page<>(authRoleQueryRequest.getPage(), authRoleQueryRequest.getLimit()); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(null != authRoleQueryRequest.getStatus(), "status", authRoleQueryRequest.getStatus()) + .like(StrUtil.isNotBlank(authRoleQueryRequest.getName()), "name", authRoleQueryRequest.getName()); + return authRoleDao.selectPage(page, wrapper); } /** diff --git a/src/main/java/com/glxp/udi/admin/service/auth/CustomerInfoService.java b/src/main/java/com/glxp/udi/admin/service/auth/CustomerInfoService.java index 31a020b..bd8ea17 100644 --- a/src/main/java/com/glxp/udi/admin/service/auth/CustomerInfoService.java +++ b/src/main/java/com/glxp/udi/admin/service/auth/CustomerInfoService.java @@ -1,6 +1,7 @@ package com.glxp.udi.admin.service.auth; import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.glxp.udi.admin.dao.auth.AuthAdminDao; import com.glxp.udi.admin.dao.auth.AuthRoleAdminDao; @@ -27,12 +28,13 @@ public class CustomerInfoService { @Resource private AuthAdminDao authAdminDao; - public Page filterDetailCustomer(CustomerInfoFilterRequest customerInfoFilterRequest) { + public IPage filterDetailCustomer(CustomerInfoFilterRequest customerInfoFilterRequest) { if (customerInfoFilterRequest == null) { return new Page<>(); } Page page = new Page<>(customerInfoFilterRequest.getPage(), customerInfoFilterRequest.getLimit()); - return customerInfoDao.filterDetailCustomerInfo(page, customerInfoFilterRequest); + return customerInfoDao.filterDetailCustomerInfo(page, customerInfoFilterRequest.getKey(), customerInfoFilterRequest.getCustomerName(), customerInfoFilterRequest.getCompanyName(), + customerInfoFilterRequest.getUserFlag(), customerInfoFilterRequest.getBussinessStatus()); } public boolean insertCustomerInfo(CustomerInfoEntity customerInfoEntity) { diff --git a/src/main/java/com/glxp/udi/admin/service/auth/UserRegisterService.java b/src/main/java/com/glxp/udi/admin/service/auth/UserRegisterService.java index 62eb66f..69b6380 100644 --- a/src/main/java/com/glxp/udi/admin/service/auth/UserRegisterService.java +++ b/src/main/java/com/glxp/udi/admin/service/auth/UserRegisterService.java @@ -1,5 +1,7 @@ package com.glxp.udi.admin.service.auth; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.glxp.udi.admin.dao.auth.UserRegisterDao; import com.glxp.udi.admin.entity.auth.UserRegisterEntity; @@ -23,7 +25,10 @@ public class UserRegisterService { return new Page<>(); } Page page = new Page<>(userResisterFilterRequest.getPage(), userResisterFilterRequest.getLimit()); - return userRegisterDao.filterUserRegisters(page, userResisterFilterRequest); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.like(StrUtil.isNotBlank(userResisterFilterRequest.getCompanyName()), "companyName", userResisterFilterRequest.getCompanyName()) + .eq(StrUtil.isNotBlank(userResisterFilterRequest.getCheckType()), "checkType", userResisterFilterRequest.getCheckType()); + return userRegisterDao.selectPage(page, wrapper); } public boolean insertUserRegister(UserRegisterEntity userRegisterEntity) { diff --git a/src/main/java/com/glxp/udi/admin/service/basic/BussinessTypeService.java b/src/main/java/com/glxp/udi/admin/service/basic/BussinessTypeService.java index 5f98a0f..b061940 100644 --- a/src/main/java/com/glxp/udi/admin/service/basic/BussinessTypeService.java +++ b/src/main/java/com/glxp/udi/admin/service/basic/BussinessTypeService.java @@ -1,6 +1,8 @@ package com.glxp.udi.admin.service.basic; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.glxp.udi.admin.common.res.BaseResponse; import com.glxp.udi.admin.constant.TypeConstant; @@ -28,12 +30,31 @@ public class BussinessTypeService { @Resource private BussinessTypeDao bussinessTypeDao; - public Page filterList(BussinessTypeFilterRequest bussinessTypeFilterRequest) { + public IPage filterList(BussinessTypeFilterRequest bussinessTypeFilterRequest) { if (bussinessTypeFilterRequest == null) { return new Page<>(); } - Page page = new Page<>(bussinessTypeFilterRequest.getPage(), bussinessTypeFilterRequest.getLimit()); - return bussinessTypeDao.filterList(page, bussinessTypeFilterRequest); + + if (null == bussinessTypeFilterRequest.getPage()) { + IPage page = new Page<>(); + List bussinessTypeEntities = bussinessTypeDao.selectList(buildQueryWrapper(bussinessTypeFilterRequest)); + page.setRecords(bussinessTypeEntities); + page.setTotal(bussinessTypeEntities.size()); + return page; + } else { + Page page = new Page<>(bussinessTypeFilterRequest.getPage(), bussinessTypeFilterRequest.getLimit()); + return bussinessTypeDao.selectPage(page, buildQueryWrapper(bussinessTypeFilterRequest)); + } + } + + private QueryWrapper buildQueryWrapper(BussinessTypeFilterRequest bussinessTypeFilterRequest) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.like(StrUtil.isNotBlank(bussinessTypeFilterRequest.getName()), "name", bussinessTypeFilterRequest.getName()) + .like(StrUtil.isNotBlank(bussinessTypeFilterRequest.getAction()), "action", bussinessTypeFilterRequest.getAction()) + .like(StrUtil.isNotBlank(bussinessTypeFilterRequest.getMainAction()), "mainAction", bussinessTypeFilterRequest.getMainAction()) + .eq(null != bussinessTypeFilterRequest.getEnabled(), "enable", bussinessTypeFilterRequest.getEnabled()) + .eq(StrUtil.isNotBlank(bussinessTypeFilterRequest.getCustomerId()), "customerId", bussinessTypeFilterRequest.getCustomerId()); + return wrapper; } public Page filterJoinList(BussinessTypeFilterRequest bussinessTypeFilterRequest) { @@ -44,12 +65,21 @@ public class BussinessTypeService { return bussinessTypeDao.filterJoinList(page, bussinessTypeFilterRequest); } - public Page filterAllByUser(BussinessTypeFilterRequest bussinessTypeFilterRequest) { + public IPage filterAllByUser(BussinessTypeFilterRequest bussinessTypeFilterRequest) { if (bussinessTypeFilterRequest == null) { return new Page<>(); } - Page page = new Page<>(bussinessTypeFilterRequest.getPage(), bussinessTypeFilterRequest.getLimit()); - return bussinessTypeDao.filterAllByUser(page, bussinessTypeFilterRequest); + if (null != bussinessTypeFilterRequest.getPage()) { + IPage page = new Page<>(bussinessTypeFilterRequest.getPage(), bussinessTypeFilterRequest.getLimit()); + return bussinessTypeDao.filterAllByUser(page, bussinessTypeFilterRequest.getName(), bussinessTypeFilterRequest.getAction(), bussinessTypeFilterRequest.getMainAction(), + bussinessTypeFilterRequest.getLocInvCode(), bussinessTypeFilterRequest.getCustomerId(), bussinessTypeFilterRequest.getEnabled()); + } else { + IPage page = new Page<>(); + List bussinessTypeEntities = bussinessTypeDao.filterAllByUserList(bussinessTypeFilterRequest); + page.setRecords(bussinessTypeEntities); + page.setTotal(bussinessTypeEntities.size()); + return page; + } } public BussinessTypeEntity selectById(String id) { @@ -97,7 +127,7 @@ public class BussinessTypeService { * @param id * @return */ - public List candidateBussinessType(String mainAction,String customerId) { + public List candidateBussinessType(String mainAction, String customerId) { if (mainAction.equals(TypeConstant.TYPE_OUT)) { mainAction = TypeConstant.TYPE_PUT; } else { @@ -129,7 +159,7 @@ public class BussinessTypeService { * @return */ public boolean getSecCheckEnable(String action, Long customerId) { - int secCheckEnable = bussinessTypeDao.selectSecCheckEnable(action, customerId); + int secCheckEnable = bussinessTypeDao.selectSecCheckEnable(action, customerId); if (secCheckEnable == 1) { return true; } diff --git a/src/main/java/com/glxp/udi/admin/service/inout/StockQRCodeTextService.java b/src/main/java/com/glxp/udi/admin/service/inout/StockQRCodeTextService.java index 1bdbfb6..b1ed390 100644 --- a/src/main/java/com/glxp/udi/admin/service/inout/StockQRCodeTextService.java +++ b/src/main/java/com/glxp/udi/admin/service/inout/StockQRCodeTextService.java @@ -17,7 +17,7 @@ public class StockQRCodeTextService { private StockQRCodeTextDao stockQRCodeTextDao; public boolean updateById(StockQRCodeTextEntity stockQRCodeTextEntity) { - return stockQRCodeTextDao.updateById(stockQRCodeTextEntity); + return stockQRCodeTextDao.update(stockQRCodeTextEntity, null) > 0; } public boolean deleteById(String id) { diff --git a/src/main/java/com/glxp/udi/admin/service/inout/UdiInfoService.java b/src/main/java/com/glxp/udi/admin/service/inout/UdiInfoService.java index 810059a..1036740 100644 --- a/src/main/java/com/glxp/udi/admin/service/inout/UdiInfoService.java +++ b/src/main/java/com/glxp/udi/admin/service/inout/UdiInfoService.java @@ -1,6 +1,9 @@ package com.glxp.udi.admin.service.inout; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.glxp.udi.admin.dao.inout.UdiInfoDao; import com.glxp.udi.admin.entity.inout.UdiInfoEntity; @@ -25,12 +28,20 @@ public class UdiInfoService { @Resource private UdiInfoDao udiInfoDao; - public Page filterUdiInfo(FilterUdiInfoRequest filterUdiInfoRequest) { + public IPage filterUdiInfo(FilterUdiInfoRequest filterUdiInfoRequest) { if (filterUdiInfoRequest == null) { return new Page<>(); } - Page page = new Page<>(filterUdiInfoRequest.getPage(), filterUdiInfoRequest.getLimit()); - return udiInfoDao.filterUdiInfo(page, filterUdiInfoRequest); + if (null == filterUdiInfoRequest.getPage()) { + List udiInfoEntities = udiInfoDao.selectList(builderQueryWrapper(filterUdiInfoRequest)); + IPage page = new Page<>(); + page.setTotal(udiInfoEntities.size()); + page.setRecords(udiInfoEntities); + return page; + } else { + IPage page = new Page<>(filterUdiInfoRequest.getPage(), filterUdiInfoRequest.getLimit()); + return udiInfoDao.selectPage(page, builderQueryWrapper(filterUdiInfoRequest)); + } } public boolean insertUdiInfos(List udiInfoEntities) { @@ -38,30 +49,45 @@ public class UdiInfoService { Date date = new Date(); udiInfoEntities.forEach(el -> { el.setLastUpdateTime(date); - el.setDisable(false); + el.setIsDisable(false); }); } return udiInfoDao.insertUdiInfos(udiInfoEntities); } - public Page filterUdiInfoGp(FilterUdiInfoRequest filterUdiInfoRequest) { + public IPage filterUdiInfoGp(FilterUdiInfoRequest filterUdiInfoRequest) { if (filterUdiInfoRequest == null) { return new Page<>(); } - Page page = new Page<>(filterUdiInfoRequest.getPage(), filterUdiInfoRequest.getLimit()); - return udiInfoDao.filterUdiInfoGp(page, filterUdiInfoRequest); + IPage page = new Page<>(filterUdiInfoRequest.getPage(), filterUdiInfoRequest.getLimit()); + QueryWrapper wrapper = builderQueryWrapper(filterUdiInfoRequest); + return udiInfoDao.selectPage(page, wrapper); } - public List findByUuids(String uuid, String customerId) { - return udiInfoDao.findByUuids(uuid, customerId); + /** + * 根据查询对象参数，构造查询条件 + * + * @param filterUdiInfoRequest + * @return + */ + private static QueryWrapper builderQueryWrapper(FilterUdiInfoRequest filterUdiInfoRequest) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.like(StrUtil.isNotBlank(filterUdiInfoRequest.getYlqxzcrbarmc()), "ylqxzcrbarmc", filterUdiInfoRequest.getYlqxzcrbarmc()) + .like(StrUtil.isNotBlank(filterUdiInfoRequest.getCpmctymc()), "cpmctymc", filterUdiInfoRequest.getCpmctymc()) + .like(StrUtil.isNotBlank(filterUdiInfoRequest.getNameCode()), "nameCode", filterUdiInfoRequest.getNameCode()) + .like(StrUtil.isNotBlank(filterUdiInfoRequest.getGgxh()), "ggxh", filterUdiInfoRequest.getGgxh()) + .like(StrUtil.isNotBlank(filterUdiInfoRequest.getCpms()), "cpms", filterUdiInfoRequest.getCpms()) + .like(StrUtil.isNotBlank(filterUdiInfoRequest.getZczbhhzbapzbh()), "zczbhhzbapzbh", filterUdiInfoRequest.getZczbhhzbapzbh()) + .like(StrUtil.isNotBlank(filterUdiInfoRequest.getManufactory()), "ylqxzcrbarmc", filterUdiInfoRequest.getManufactory()) + .like(StrUtil.isNotBlank(filterUdiInfoRequest.getUuid()), "uuid", filterUdiInfoRequest.getUuid()) + .eq(StrUtil.isNotBlank(filterUdiInfoRequest.getCustomerId()), "customerId", filterUdiInfoRequest.getCustomerId()) + .eq(null != filterUdiInfoRequest.getDiType(), "diType", filterUdiInfoRequest.getDiType()) + .groupBy("uuid").orderByDesc("lastUpdateTime"); + return wrapper; } - public Page filterAllUdiInfo(FilterUdiInfoRequest filterUdiInfoRequest) { - if (filterUdiInfoRequest == null) { - return new Page<>(); - } - Page page = new Page<>(filterUdiInfoRequest.getPage(), filterUdiInfoRequest.getLimit()); - return udiInfoDao.filterUdiInfo(page, filterUdiInfoRequest); + public List findByUuids(String uuid, String customerId) { + return udiInfoDao.findByUuids(uuid, customerId); } public boolean deleteByUuid(String uuid, String customerId) { diff --git a/src/main/java/com/glxp/udi/admin/service/inout/UnitMaintainService.java b/src/main/java/com/glxp/udi/admin/service/inout/UnitMaintainService.java index 9aec30b..e578788 100644 --- a/src/main/java/com/glxp/udi/admin/service/inout/UnitMaintainService.java +++ b/src/main/java/com/glxp/udi/admin/service/inout/UnitMaintainService.java @@ -1,5 +1,6 @@ package com.glxp.udi.admin.service.inout; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.glxp.udi.admin.dao.inout.UnitMaintainDao; import com.glxp.udi.admin.entity.inout.UnitMaintainEntity; @@ -16,7 +17,7 @@ import java.util.List; @Slf4j @Service @Transactional(rollbackFor = Exception.class) -public class UnitMaintainService { +public class UnitMaintainService { @Lazy @Resource @@ -24,12 +25,13 @@ public class UnitMaintainService { @Resource private UnitMaintainDao unitMaintainDao; - public Page filterList(UnitMaintainFilterRequest unitMaintainFilterRequest) { + public IPage filterList(UnitMaintainFilterRequest unitMaintainFilterRequest) { if (unitMaintainFilterRequest == null) { return new Page<>(); } - Page page = new Page<>(unitMaintainFilterRequest.getPage(), unitMaintainFilterRequest.getLimit()); - return unitMaintainDao.filterList(page, unitMaintainFilterRequest); + IPage page = new Page<>(unitMaintainFilterRequest.getPage(), unitMaintainFilterRequest.getLimit()); + + return unitMaintainDao.filterList(page, unitMaintainFilterRequest.getKey(), unitMaintainFilterRequest.getCustomerId(), unitMaintainFilterRequest.getCorpType()); } public boolean insertUnitMaintain(UnitMaintainEntity unitMaintainEntity) { @@ -61,7 +63,7 @@ public class UnitMaintainService { return new Page<>(); } Page page = new Page<>(unitMaintainFilterRequest.getPage(), unitMaintainFilterRequest.getLimit()); - return unitMaintainDao.getUnbindUnitMaintain(page,unitMaintainFilterRequest); + return unitMaintainDao.getUnbindUnitMaintain(page, unitMaintainFilterRequest.getCustomerId()); } /** diff --git a/src/main/java/com/glxp/udi/admin/service/inventory/InvStockPrintService.java b/src/main/java/com/glxp/udi/admin/service/inventory/InvStockPrintService.java index 98aa1dc..4487583 100644 --- a/src/main/java/com/glxp/udi/admin/service/inventory/InvStockPrintService.java +++ b/src/main/java/com/glxp/udi/admin/service/inventory/InvStockPrintService.java @@ -24,7 +24,10 @@ public class InvStockPrintService { if (filterStockprintRequest == null) { return new Page<>(); } - Page page = new Page<>(filterStockprintRequest.getPage(), filterStockprintRequest.getLimit()); + Page page = new Page<>(-1, -1); + if (null != filterStockprintRequest.getPage() && null != filterStockprintRequest.getLimit()) { + page = new Page<>(filterStockprintRequest.getPage(), filterStockprintRequest.getLimit()); + } return stockPrintDao.filterJoinStockPrint(page, filterStockprintRequest); } diff --git a/src/main/java/com/glxp/udi/admin/service/inventory/InvWarehouseService.java b/src/main/java/com/glxp/udi/admin/service/inventory/InvWarehouseService.java index 6e68cbb..e5e82c1 100644 --- a/src/main/java/com/glxp/udi/admin/service/inventory/InvWarehouseService.java +++ b/src/main/java/com/glxp/udi/admin/service/inventory/InvWarehouseService.java @@ -1,16 +1,15 @@ package com.glxp.udi.admin.service.inventory; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.github.pagehelper.PageHelper; import com.glxp.udi.admin.dao.inout.WarehouseUserDao; import com.glxp.udi.admin.dao.inventory.InvWarehouseDao; import com.glxp.udi.admin.entity.inout.WarehouseUserEntity; import com.glxp.udi.admin.entity.inventory.InvWarehouseEntity; import com.glxp.udi.admin.req.inventory.FilterInvWarehouseRequest; -import com.glxp.udi.admin.service.inout.WarehouseUserService; import lombok.extern.slf4j.Slf4j; -import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -22,11 +21,8 @@ import java.util.List; @Slf4j @Service @Transactional(rollbackFor = Exception.class) -public class InvWarehouseService { +public class InvWarehouseService { - @Lazy - @Resource - private WarehouseUserService warehouseUserService; @Resource private InvWarehouseDao invWarehouseDao; @Resource @@ -36,22 +32,48 @@ public class InvWarehouseService { return invWarehouseDao.selectMaxCode(filterInvWarehouseRequest); } - public Page filterInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest) { + public IPage filterInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest) { if (filterInvWarehouseRequest == null) { return new Page<>(); } - Page page = new Page<>(filterInvWarehouseRequest.getPage(), filterInvWarehouseRequest.getLimit()); - return invWarehouseDao.filterInvWarehouse(page, filterInvWarehouseRequest); + if (null != filterInvWarehouseRequest.getPage()) { + IPage page = new Page<>(filterInvWarehouseRequest.getPage(), filterInvWarehouseRequest.getLimit()); + return invWarehouseDao.selectPage(page, buildQueryWrapper(filterInvWarehouseRequest)); + } else { + List invWarehouseEntities = invWarehouseDao.selectList(buildQueryWrapper(filterInvWarehouseRequest)); + IPage page = new Page<>(); + page.setTotal(invWarehouseEntities.size()); + page.setRecords(invWarehouseEntities); + return page; + } + } + + /** + * 构造查询条件 + * + * @param filterInvWarehouseRequest + * @return + */ + private QueryWrapper buildQueryWrapper(FilterInvWarehouseRequest filterInvWarehouseRequest) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.select("id, pId, code, name, advanceType, isDefault, status, updateTime, remark, level, pcode, customerId,(select name from inv_warehouse WHERE inv_warehouse.pcode = code) pName ") + .eq(null != filterInvWarehouseRequest.getId(), "id", filterInvWarehouseRequest.getId()) + .eq(null != filterInvWarehouseRequest.getPid(), "pid", filterInvWarehouseRequest.getPid()) + .eq(StrUtil.isNotBlank(filterInvWarehouseRequest.getCode()), "code", filterInvWarehouseRequest.getCode()) + .eq(StrUtil.isNotBlank(filterInvWarehouseRequest.getName()), "name", filterInvWarehouseRequest.getName()) + .eq(null != filterInvWarehouseRequest.getAdvanceType(), "advanceType", filterInvWarehouseRequest.getAdvanceType()) + .eq(null != filterInvWarehouseRequest.getStatus(), "status", filterInvWarehouseRequest.getStatus()) + .eq(null != filterInvWarehouseRequest.getIsDefault(), "isDefault", filterInvWarehouseRequest.getIsDefault()) + .eq(StrUtil.isNotBlank(filterInvWarehouseRequest.getPcode()), "pcode", filterInvWarehouseRequest.getPcode()) + .eq(null != filterInvWarehouseRequest.getLevel(), "level", filterInvWarehouseRequest.getLevel()) + .eq(StrUtil.isNotBlank(filterInvWarehouseRequest.getCustomerId()), "customerId", filterInvWarehouseRequest.getCustomerId()); + return wrapper; } public List filterAllByUser(FilterInvWarehouseRequest filterInvWarehouseRequest) { if (filterInvWarehouseRequest == null) { return Collections.emptyList(); } - if (filterInvWarehouseRequest.getPage() != null) { - int offset = (filterInvWarehouseRequest.getPage() - 1) * filterInvWarehouseRequest.getLimit(); - PageHelper.offsetPage(offset, filterInvWarehouseRequest.getLimit()); - } List data = invWarehouseDao.filterAllByUser(filterInvWarehouseRequest); return data; } @@ -83,14 +105,7 @@ public class InvWarehouseService { } public InvWarehouseEntity selectByCode(String code) { - FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest(); - filterInvWarehouseRequest.setCode(code); - Page page = new Page<>(0, 1); - Page pageResult = invWarehouseDao.filterInvWarehouse(page, filterInvWarehouseRequest); - if (pageResult.getTotal() > 0) { - return pageResult.getRecords().get(0); - } - return null; + return invWarehouseDao.selectOne(new QueryWrapper().eq("code", code)); } public boolean deleteById(String id) { diff --git a/src/main/java/com/glxp/udi/admin/service/inventory/StockPrintTempService.java b/src/main/java/com/glxp/udi/admin/service/inventory/StockPrintTempService.java index 9093ccc..9d7e6ae 100644 --- a/src/main/java/com/glxp/udi/admin/service/inventory/StockPrintTempService.java +++ b/src/main/java/com/glxp/udi/admin/service/inventory/StockPrintTempService.java @@ -1,6 +1,6 @@ package com.glxp.udi.admin.service.inventory; -import com.github.pagehelper.PageHelper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.glxp.udi.admin.dao.inventory.StockPrintTempDao; import com.glxp.udi.admin.entity.inventory.StockPrintTempEntity; import com.glxp.udi.admin.req.inventory.DeleteStPrintTempRequest; @@ -10,8 +10,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.util.Collections; -import java.util.List; @Slf4j @Service @@ -21,16 +19,16 @@ public class StockPrintTempService { @Resource private StockPrintTempDao stockPrintTempDao; - public List filterStockPrintTempEntity(FilterStPrintTempRequest filterStockprintRequest) { + public Page filterStockPrintTempEntity(FilterStPrintTempRequest filterStockprintRequest) { if (filterStockprintRequest == null) { - return Collections.emptyList(); - } - if (filterStockprintRequest.getPage() != null) { - int offset = (filterStockprintRequest.getPage() - 1) * filterStockprintRequest.getLimit(); - PageHelper.offsetPage(offset, filterStockprintRequest.getLimit()); + return new Page<>(); } - return stockPrintTempDao.filterStockPrintTempEntity(filterStockprintRequest); + Page page = new Page<>(-1, -1); + if (filterStockprintRequest.getPage() != null && null != filterStockprintRequest.getLimit()) { + page = new Page<>(filterStockprintRequest.getPage(), filterStockprintRequest.getLimit()); + } + return stockPrintTempDao.filterStockPrintTempEntity(page, filterStockprintRequest); } public boolean deleteById(DeleteStPrintTempRequest deleteStPrintTempRequest) { diff --git a/src/main/java/com/glxp/udi/admin/service/param/SystemPDFModuleService.java b/src/main/java/com/glxp/udi/admin/service/param/SystemPDFModuleService.java index e6b4600..10fe4d1 100644 --- a/src/main/java/com/glxp/udi/admin/service/param/SystemPDFModuleService.java +++ b/src/main/java/com/glxp/udi/admin/service/param/SystemPDFModuleService.java @@ -42,7 +42,7 @@ public class SystemPDFModuleService { } public boolean insert(SystemPDFModuleEntity systemPDFModuleEntity) { - return systemPDFModuleDao.insert(systemPDFModuleEntity); + return systemPDFModuleDao.insertData(systemPDFModuleEntity); } public boolean deleteById(Integer id) { diff --git a/src/main/java/com/glxp/udi/admin/service/param/SystemPDFTemplateRelevanceService.java b/src/main/java/com/glxp/udi/admin/service/param/SystemPDFTemplateRelevanceService.java index afa416a..0fd15ed 100644 --- a/src/main/java/com/glxp/udi/admin/service/param/SystemPDFTemplateRelevanceService.java +++ b/src/main/java/com/glxp/udi/admin/service/param/SystemPDFTemplateRelevanceService.java @@ -25,7 +25,10 @@ public class SystemPDFTemplateRelevanceService { if (null == systemPDFModuleRequest) { return new Page<>(); } - Page page = new Page<>(systemPDFModuleRequest.getPage(), systemPDFModuleRequest.getLimit()); + Page page = new Page<>(-1, -1); + if (null != systemPDFModuleRequest.getPage() && null != systemPDFModuleRequest.getLimit()) { + page = new Page<>(systemPDFModuleRequest.getPage(), systemPDFModuleRequest.getLimit()); + } return systemPDFTemplateRelevanceDao.filterList(page, systemPDFModuleRequest); } @@ -43,7 +46,7 @@ public class SystemPDFTemplateRelevanceService { } public boolean insert(SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntity) { - return systemPDFTemplateRelevanceDao.insert(systemPDFTemplateRelevanceEntity); + return systemPDFTemplateRelevanceDao.insertData(systemPDFTemplateRelevanceEntity); } /** diff --git a/src/main/java/com/glxp/udi/admin/service/param/SystemPDFTemplateService.java b/src/main/java/com/glxp/udi/admin/service/param/SystemPDFTemplateService.java index 2a258b1..c5d5107 100644 --- a/src/main/java/com/glxp/udi/admin/service/param/SystemPDFTemplateService.java +++ b/src/main/java/com/glxp/udi/admin/service/param/SystemPDFTemplateService.java @@ -1,6 +1,8 @@ package com.glxp.udi.admin.service.param; -import com.github.pagehelper.PageHelper; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.glxp.udi.admin.dao.param.SystemPDFTemplateDao; import com.glxp.udi.admin.entity.param.SystemPDFTemplateEntity; import com.glxp.udi.admin.req.param.SystemPDFTemplateRequest; @@ -10,7 +12,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.util.List; @Slf4j @Service @@ -20,19 +21,26 @@ public class SystemPDFTemplateService { @Resource private SystemPDFTemplateDao systemPDFTemplateDao; - public List queryPage(SystemPDFTemplateRequest SystemPDFTemplateRequest) { - int offset = (SystemPDFTemplateRequest.getPage() - 1) * SystemPDFTemplateRequest.getLimit(); - PageHelper.offsetPage(offset, SystemPDFTemplateRequest.getLimit()); - return systemPDFTemplateDao.queryPage(SystemPDFTemplateRequest); + public Page queryPage(SystemPDFTemplateRequest systemPDFTemplateRequest) { + Page page = new Page<>(systemPDFTemplateRequest.getPage(), systemPDFTemplateRequest.getLimit()); + return systemPDFTemplateDao.selectPage(page, buildQueryWrapper(systemPDFTemplateRequest)); } - public List listPDFTemplates(Integer page, Integer limit) { - page = page != null && page > 0 ? page : 1; - limit = limit != null && limit > 0 && limit < 100 ? limit : 100; - int offset = (page - 1) * limit; - PageHelper.offsetPage(offset, limit); - List list = systemPDFTemplateDao.listPDFTemplates(); - return list; + private QueryWrapper buildQueryWrapper(SystemPDFTemplateRequest systemPDFTemplateRequest) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.like(StrUtil.isNotBlank(systemPDFTemplateRequest.getName()), "name", systemPDFTemplateRequest.getName()) + .eq(null != systemPDFTemplateRequest.getModule(), "module", systemPDFTemplateRequest.getModule()) + .eq(null != systemPDFTemplateRequest.getId(), "id", systemPDFTemplateRequest.getId()) + .orderByDesc("update_time"); + return wrapper; + } + + public Page listPDFTemplates(Integer page, Integer limit) { + Page pageParam = new Page<>(page, limit); + if (null == page || null == limit) { + pageParam = new Page<>(0, 100); + } + return systemPDFTemplateDao.listPDFTemplates(pageParam); } public SystemPDFTemplateEntity selectById(String id) { @@ -44,7 +52,7 @@ public class SystemPDFTemplateService { } public boolean insert(SystemPDFTemplateEntity systemPDFTemplateEntity) { - return systemPDFTemplateDao.insert(systemPDFTemplateEntity); + return systemPDFTemplateDao.insertData(systemPDFTemplateEntity); } public boolean deleteById(Integer id) { diff --git a/src/main/java/com/glxp/udi/admin/service/param/SystemParamConfigService.java b/src/main/java/com/glxp/udi/admin/service/param/SystemParamConfigService.java index 08b1d7f..061293f 100644 --- a/src/main/java/com/glxp/udi/admin/service/param/SystemParamConfigService.java +++ b/src/main/java/com/glxp/udi/admin/service/param/SystemParamConfigService.java @@ -1,10 +1,8 @@ package com.glxp.udi.admin.service.param; -import com.github.pagehelper.PageHelper; import com.glxp.udi.admin.dao.param.SystemParamConfigCustomerDao; import com.glxp.udi.admin.dao.param.SystemParamConfigDao; import com.glxp.udi.admin.entity.param.SystemParamConfigEntity; -import com.glxp.udi.admin.req.param.SystemParamConfigRequest; import com.glxp.udi.admin.req.param.SystemParamConfigSaveRequest; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -24,13 +22,6 @@ public class SystemParamConfigService { @Resource private SystemParamConfigCustomerDao systemParamConfigCustomerDao; - public List queryPage(SystemParamConfigRequest SystemParamConfigRequest) { - int offset = (SystemParamConfigRequest.getPage() - 1) * SystemParamConfigRequest.getLimit(); - PageHelper.offsetPage(offset, SystemParamConfigRequest.getLimit()); - List list = systemParamConfigDao.queryPage(SystemParamConfigRequest); - return list; - } - public SystemParamConfigEntity selectByParamKey(String key) { return systemParamConfigDao.selectByParamKey(key); } @@ -40,7 +31,7 @@ public class SystemParamConfigService { } public boolean insert(SystemParamConfigEntity systemParamConfigEntity) { - return systemParamConfigDao.insert(systemParamConfigEntity); + return systemParamConfigDao.insertData(systemParamConfigEntity); } /** diff --git a/src/main/java/com/glxp/udi/admin/service/param/SystemParamCustomerConfigService.java b/src/main/java/com/glxp/udi/admin/service/param/SystemParamCustomerConfigService.java index 962abb3..d48d307 100644 --- a/src/main/java/com/glxp/udi/admin/service/param/SystemParamCustomerConfigService.java +++ b/src/main/java/com/glxp/udi/admin/service/param/SystemParamCustomerConfigService.java @@ -1,7 +1,7 @@ package com.glxp.udi.admin.service.param; import cn.hutool.core.bean.BeanUtil; -import com.github.pagehelper.PageHelper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.glxp.udi.admin.common.res.BaseResponse; import com.glxp.udi.admin.constant.SystemParamConstant; import com.glxp.udi.admin.dao.param.SystemParamConfigCustomerDao; @@ -16,7 +16,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.util.List; /** * 客户自定义系统参数 @@ -37,10 +36,9 @@ public class SystemParamCustomerConfigService { * @param systemParamConfigRequest * @return */ - public List getSystemParams(SystemParamConfigRequest systemParamConfigRequest) { - int offset = (systemParamConfigRequest.getPage() - 1) * systemParamConfigRequest.getLimit(); - PageHelper.offsetPage(offset, systemParamConfigRequest.getLimit()); - return systemParamConfigCustomerDao.selectCustomizeParam(systemParamConfigRequest, SystemParamConstant.SYSTEM_PARAMS); + public Page getSystemParams(SystemParamConfigRequest systemParamConfigRequest) { + Page page = new Page<>(systemParamConfigRequest.getPage(), systemParamConfigRequest.getLimit()); + return systemParamConfigCustomerDao.selectCustomizeParam(page, systemParamConfigRequest, SystemParamConstant.SYSTEM_PARAMS); } /** diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index eb06e97..9ae9ae4 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -3,12 +3,12 @@ spring: pathmatch: matching-strategy: ant_path_matcher datasource: - url: jdbc:mysql://192.168.235.137:33306/udims?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + url: jdbc:mysql://192.168.235.137:3306/udims?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root password: root data: mongodb: - uri: mongodb://udims:123456@192.168.235.137:27017/udiwms + uri: mongodb://192.168.0.66:27017/udiwms redis: database: 4 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 6bd907c..148b1ce 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -3,7 +3,7 @@ server: spring: profiles: - active: dev + active: test datasource: driver-class-name: com.mysql.cj.jdbc.Driver diff --git a/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml b/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml index 9b4ffe2..0385421 100644 --- a/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml +++ b/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml @@ -2,31 +2,6 @@ - - SELECT * - FROM customer_info - - - AND customerName LIKE concat('%',#{customerName},'%') - - - AND companyName LIKE concat('%',#{companyName},'%') - - - - SELECT * - FROM user_register - - - AND companyName like concat('%', #{companyName}, '%') - - - AND checkType = #{checkType} - - - INSERT INTO user_register diff --git a/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml b/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml index 0ff77d4..a315bb4 100644 --- a/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml @@ -64,6 +64,7 @@ + + + + + replace diff --git a/src/main/resources/mybatis/mapper/inout/StockQRCodeText.xml b/src/main/resources/mybatis/mapper/inout/StockQRCodeText.xml index 8f25d70..d3aabb0 100644 --- a/src/main/resources/mybatis/mapper/inout/StockQRCodeText.xml +++ b/src/main/resources/mybatis/mapper/inout/StockQRCodeText.xml @@ -58,21 +58,6 @@ - - UPDATE stock_qrcode_text - - orderId=#{orderId}, - detailId=#{detailId}, - text=#{text}, - textTag=#{textTag}, - status=#{status}, - param=#{param}, - create_time=#{create_time}, - update_time=#{update_time}, - - WHERE id = #{id} - - DELETE FROM stock_qrcode_text diff --git a/src/main/resources/mybatis/mapper/inout/UdiInfoDao.xml b/src/main/resources/mybatis/mapper/inout/UdiInfoDao.xml index 6031811..84726b3 100644 --- a/src/main/resources/mybatis/mapper/inout/UdiInfoDao.xml +++ b/src/main/resources/mybatis/mapper/inout/UdiInfoDao.xml @@ -2,85 +2,19 @@ - - @@ -97,7 +31,7 @@ FROM io_productinfo - AND customerId = #{customerId} + AND customerId = #{customerId} AND nameCode = #{nameCode} diff --git a/src/main/resources/mybatis/mapper/inout/WarehouseBussinessTypeDao.xml b/src/main/resources/mybatis/mapper/inout/WarehouseBussinessTypeDao.xml index 4632167..914acd1 100644 --- a/src/main/resources/mybatis/mapper/inout/WarehouseBussinessTypeDao.xml +++ b/src/main/resources/mybatis/mapper/inout/WarehouseBussinessTypeDao.xml @@ -27,7 +27,6 @@ - insert into inv_warehouse_bussiness_type (code, `action`, `name` ) values (#{code,jdbcType=VARCHAR}, #{action,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR} diff --git a/src/main/resources/mybatis/mapper/inventory/InvWarehouseDao.xml b/src/main/resources/mybatis/mapper/inventory/InvWarehouseDao.xml index 51b8ebd..75109a6 100644 --- a/src/main/resources/mybatis/mapper/inventory/InvWarehouseDao.xml +++ b/src/main/resources/mybatis/mapper/inventory/InvWarehouseDao.xml @@ -9,37 +9,36 @@ FROM inv_warehouse a - AND a.id = #{id} + AND a.id = #{request.id} - AND a.pid = #{pid} + AND a.pid = #{request.pid} - AND a.code = #{code} + AND a.code = #{request.code} - AND a.name like concat('%',#{name},'%') + AND a.name like concat('%',#{request.name},'%') - AND a.advanceType = #{advanceType} + AND a.advanceType = #{request.advanceType} - AND a.status = #{status} + AND a.status = #{request.status} - AND a.isDefault = #{isDefault} + AND a.isDefault = #{request.isDefault} - AND a.pcode = #{pcode} + AND a.pcode = #{request.pcode} - AND a.level = #{level} + AND a.level = #{request.level} - AND a.customerId = #{customerId} + AND a.customerId = #{request.customerId} - - SELECT id,name,type,module,param,path,rowCount,qrcodeCount,remark,create_time,update_time,jrxmlPath - FROM system_pdf_template - - - AND `name` LIKE CONCAT(#{name},'%') - - - AND `module` = #{module} - - - order by update_time desc - - - - SELECT id,paramName,paramKey,paramValue,paramStatus,paramType,paramExplain - FROM system_param_config - - AND `paramStatus` = #{paramStatus} - - AND `paramName` LIKE CONCAT(#{paramName},'%') - - - -