From 2272d6df410f89e75b1b97485e344e18c4e5a17d Mon Sep 17 00:00:00 2001 From: nmy <849173236@qq.com> Date: Wed, 6 Dec 2023 10:57:43 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9B=B4=E6=96=B0=E3=80=91feign?= =?UTF-8?q?=E6=8A=BD=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/zlpt/company/api/domain/BaseAddress.java | 5 ++++- .../com/bonus/zlpt/company/api/domain/SysDic.java | 10 +++++++++- .../zlpt/company/api/domain/dto/BmCompanyDto.java | 3 ++- .../bonus/zlpt/common/core/web/page/PageDomain.java | 6 ++++-- .../company/controller/BmCompanyInfoController.java | 9 +++------ .../company/controller/BmCompanyTypeController.java | 6 +++--- .../company/controller/BusinessMenuController.java | 11 +++++------ .../company/controller/BusinessOpenController.java | 2 +- .../zlpt/equip/controller/DevInfoController.java | 2 +- 9 files changed, 32 insertions(+), 22 deletions(-) diff --git a/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/BaseAddress.java b/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/BaseAddress.java index a968f36..6def265 100644 --- a/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/BaseAddress.java +++ b/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/BaseAddress.java @@ -1,12 +1,15 @@ package com.bonus.zlpt.company.api.domain; import com.bonus.zlpt.common.core.annotation.Excel; +import com.bonus.zlpt.common.core.web.domain.BaseEntity; import lombok.Data; +import lombok.EqualsAndHashCode; import java.time.LocalDateTime; +@EqualsAndHashCode(callSuper = true) @Data -public class BaseAddress { +public class BaseAddress extends BaseEntity { @Excel(name = "id") diff --git a/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/SysDic.java b/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/SysDic.java index 30fc638..6fe078a 100644 --- a/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/SysDic.java +++ b/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/SysDic.java @@ -1,16 +1,24 @@ package com.bonus.zlpt.company.api.domain; import com.bonus.zlpt.common.core.annotation.Excel; +import com.bonus.zlpt.common.core.web.domain.BaseEntity; +import com.bonus.zlpt.common.core.web.page.PageDomain; +import com.fasterxml.jackson.databind.ser.Serializers; import lombok.Data; +import lombok.EqualsAndHashCode; /** * 数据字典（企业类型管理） */ +@EqualsAndHashCode(callSuper = true) @Data -public class SysDic { +public class SysDic extends PageDomain { private static final long serialVersionUID = 1L; + + private PageDomain pageDomain; + @Excel(name = "id") private Integer id; diff --git a/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/dto/BmCompanyDto.java b/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/dto/BmCompanyDto.java index 559d25f..e2b4898 100644 --- a/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/dto/BmCompanyDto.java +++ b/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/dto/BmCompanyDto.java @@ -1,9 +1,10 @@ package com.bonus.zlpt.company.api.domain.dto; +import com.bonus.zlpt.common.core.web.page.PageDomain; import lombok.Data; @Data -public class BmCompanyDto { +public class BmCompanyDto extends PageDomain { /** diff --git a/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/web/page/PageDomain.java b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/web/page/PageDomain.java index 8b2e927..8c61f23 100644 --- a/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/web/page/PageDomain.java +++ b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/web/page/PageDomain.java @@ -9,11 +9,13 @@ import com.bonus.zlpt.common.core.utils.StringUtils; */ public class PageDomain { + + /** 当前记录起始索引 */ - private Integer pageNum; + private Integer pageNum = 1; /** 每页显示记录数 */ - private Integer pageSize; + private Integer pageSize = 15; /** 排序列 */ private String orderByColumn; diff --git a/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/BmCompanyInfoController.java b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/BmCompanyInfoController.java index e4d7f79..df668b5 100644 --- a/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/BmCompanyInfoController.java +++ b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/BmCompanyInfoController.java @@ -2,6 +2,7 @@ package com.bonus.zlpt.company.controller; import com.bonus.zlpt.common.core.utils.poi.ExcelUtil; import com.bonus.zlpt.common.core.web.controller.BaseController; import com.bonus.zlpt.common.core.web.domain.AjaxResult; +import com.bonus.zlpt.common.core.web.domain.BaseEntity; import com.bonus.zlpt.common.core.web.page.TableDataInfo; import com.bonus.zlpt.common.log.enums.BusinessType; import com.bonus.zlpt.common.security.annotation.RequiresPermissions; @@ -98,7 +99,7 @@ public class BmCompanyInfoController extends BaseController { @PostMapping("/selectList") public TableDataInfo selectList(@RequestBody BmCompanyDto bmCompanyDto){ - startPage(); + startPage(bmCompanyDto.getPageNum(), bmCompanyDto.getPageSize()); List list = bmCompanyInfoService.selectList(bmCompanyDto); return getDataTable(list); } @@ -133,12 +134,8 @@ public class BmCompanyInfoController extends BaseController { @PostMapping("/selectCompanyInfo") public TableDataInfo selectCompanyInfo(@RequestBody BmCompanyDto bmCompanyDto){ - startPage(); + startPage(bmCompanyDto.getPageNum(), bmCompanyDto.getPageSize()); List list = bmCompanyInfoService.selectCompanyInfo(bmCompanyDto); return getDataTable(list); } - - - - } diff --git a/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/BmCompanyTypeController.java b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/BmCompanyTypeController.java index 7bba8da..0b17da5 100644 --- a/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/BmCompanyTypeController.java +++ b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/BmCompanyTypeController.java @@ -39,7 +39,7 @@ public class BmCompanyTypeController extends BaseController { @PostMapping("/selectCompanyTypeList") public TableDataInfo selectCompanyTypeList(@RequestBody SysDic sysDic){ - startPage(); + startPage(sysDic.getPageNum(),sysDic.getPageSize()); sysDic.setPId(1); List list = bmCompanyTypeService.selectCompanyTypeList(sysDic); return getDataTable(list); @@ -53,7 +53,7 @@ public class BmCompanyTypeController extends BaseController { @PostMapping("/selectCompanyLtd") public TableDataInfo selectCompanyLtd(@RequestBody SysDic sysDic){ - startPage(); + startPage(sysDic.getPageNum(),sysDic.getPageSize()); sysDic.setPId(5); List list = bmCompanyTypeService.selectCompanyTypeList(sysDic); return getDataTable(list); @@ -67,7 +67,7 @@ public class BmCompanyTypeController extends BaseController { @PostMapping("/selectIdCard") public TableDataInfo selectIdCard(@RequestBody SysDic sysDic){ - startPage(); + startPage(sysDic.getPageNum(),sysDic.getPageSize()); sysDic.setPId(23); List list = bmCompanyTypeService.selectCompanyTypeList(sysDic); return getDataTable(list); diff --git a/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/BusinessMenuController.java b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/BusinessMenuController.java index 63f9207..ea6493c 100644 --- a/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/BusinessMenuController.java +++ b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/BusinessMenuController.java @@ -1,13 +1,12 @@ package com.bonus.zlpt.company.controller; import com.bonus.zlpt.common.core.web.controller.BaseController; +import com.bonus.zlpt.common.core.web.page.PageDomain; import com.bonus.zlpt.common.core.web.page.TableDataInfo; import com.bonus.zlpt.company.api.domain.BusinessMenu; import com.bonus.zlpt.company.service.BusinessMenuService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -26,10 +25,10 @@ public class BusinessMenuController extends BaseController { * 查询所有业务类型 * @return */ - @GetMapping("/selectList") - public TableDataInfo selectList(){ + @PostMapping("/selectList") + public TableDataInfo selectList(@RequestBody PageDomain pageDomain){ - startPage(); + startPage(pageDomain.getPageNum(), pageDomain.getPageSize()); List businessMenus = businessMenuService.selectList(); return getDataTable(businessMenus); } diff --git a/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/BusinessOpenController.java b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/BusinessOpenController.java index e5eca0d..439ea54 100644 --- a/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/BusinessOpenController.java +++ b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/BusinessOpenController.java @@ -37,7 +37,7 @@ public class BusinessOpenController extends BaseController { @PostMapping("/selectList") public TableDataInfo selectList(@RequestBody BmCompanyDto bmCompanyDto){ - startPage(); + startPage(bmCompanyDto.getPageNum(),bmCompanyDto.getPageSize()); List list = businessOpenService.selectList(bmCompanyDto); return getDataTable(list); } diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/DevInfoController.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/DevInfoController.java index b5e47d5..5e7310c 100644 --- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/DevInfoController.java +++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/controller/DevInfoController.java @@ -47,7 +47,7 @@ public class DevInfoController extends BaseController @GetMapping("/hotList") public TableDataInfo hotList(DevInfoVo devInfo) { - startPage(1, 3); + startPage(devInfo.getPageNum(),devInfo.getPageSize()); List list = devInfoService.selectDevInfoHotList(devInfo); return getDataTable(list); }