【更新】feign抽取

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")

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;
 

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 {
 
 
     /**

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;

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<BmCompanyInfo> 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<BmCompanyInfoVo> list = bmCompanyInfoService.selectCompanyInfo(bmCompanyDto);
         return getDataTable(list);
     }
-
-
-
-
 }

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<SysDic> 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<SysDic> 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<SysDic> list = bmCompanyTypeService.selectCompanyTypeList(sysDic);
         return getDataTable(list);

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.*;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -26,10 +25,10 @@ public class BusinessMenuController extends BaseController {
      * 查询所有业务类型
      * @return
      */
-    @GetMapping("/selectList")
+    @PostMapping("/selectList")
-    public TableDataInfo selectList(){
+    public TableDataInfo selectList(@RequestBody PageDomain pageDomain){
 
-        startPage();
+        startPage(pageDomain.getPageNum(), pageDomain.getPageSize());
         List<BusinessMenu> businessMenus = businessMenuService.selectList();
         return getDataTable(businessMenus);
     }

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<BusinessOpenVo> list = businessOpenService.selectList(bmCompanyDto);
         return getDataTable(list);
     }

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<DevInfoVo> list = devInfoService.selectDevInfoHotList(devInfo);
         return getDataTable(list);
     }