diff --git a/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/dto/ServiceDto.java b/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/dto/ServiceDto.java index 37fffd9..eb5cd20 100644 --- a/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/dto/ServiceDto.java +++ b/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/dto/ServiceDto.java @@ -1,15 +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 ServiceDto { - - //页面 - private Integer page; - - //条数 - private Integer pageSize; +public class ServiceDto extends PageDomain { //是否启用 private String status; 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 df668b5..30865b7 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 @@ -58,7 +58,7 @@ public class BmCompanyInfoController extends BaseController { /** * 新增 -- 录入企业信息 */ - //@RequiresPermissions("system:company:add") + @RequiresPermissions("system:company:add") @Log(title = "企业管理", businessType = BusinessType.INSERT) @PostMapping("addCompanyInfo") public AjaxResult add(@RequestBody BmCompanyInfoDto obj) { diff --git a/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/ServiceGreementInfoController.java b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/ServiceGreementInfoController.java index 6ca2280..5733b1f 100644 --- a/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/ServiceGreementInfoController.java +++ b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/ServiceGreementInfoController.java @@ -39,7 +39,7 @@ public class ServiceGreementInfoController extends BaseController { @PostMapping("/list") public TableDataInfo getPrivacyAgreementTemplateList(@RequestBody ServiceDto dto) { - startPage(dto.getPage(), dto.getPageSize()); + startPage(dto.getPageNum(), dto.getPageSize()); List list = serviceGreementInfoService.selectGreementInfoList(dto); return getDataTable(list); } diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java index 81d564c..6ae4ce0 100644 --- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java +++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java @@ -151,6 +151,11 @@ public class DevInfoServiceImpl implements IDevInfoService return devInfoMapper.deleteDevInfoByMaId(maId); } + /** + * 信息录入 + * @param inforMationDto + * @return + */ @Override public int insertInforMationDto(InforMationDto inforMationDto) { DevInfo devInfo = new DevInfo(); diff --git a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/controller/BmCarouselSetController.java b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/controller/BmCarouselSetController.java index bf62eb2..5a1f51e 100644 --- a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/controller/BmCarouselSetController.java +++ b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/controller/BmCarouselSetController.java @@ -35,7 +35,7 @@ public class BmCarouselSetController extends BaseController { @PostMapping("/list") public TableDataInfo getCarouselChartList(@RequestBody BmCarouselDto bmCarouselDto) { - startPage(bmCarouselDto.getPage(), bmCarouselDto.getPageSize()); + startPage(bmCarouselDto.getPageNum(), bmCarouselDto.getPageSize()); List list = bmCarouselSetService.selectBmCarouseList(bmCarouselDto); return getDataTable(list); } diff --git a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/controller/BmTopicInfoController.java b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/controller/BmTopicInfoController.java index 54d5be1..52a3fe3 100644 --- a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/controller/BmTopicInfoController.java +++ b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/controller/BmTopicInfoController.java @@ -39,7 +39,7 @@ public class BmTopicInfoController extends BaseController { @PostMapping("/list") public TableDataInfo getSpecialInfoList(@RequestBody BmTopicDto bmTopicDto) { - startPage(bmTopicDto.getPage(), bmTopicDto.getPageSize()); + startPage(bmTopicDto.getPageNum(), bmTopicDto.getPageSize()); List list = bmTopicInfoService.selectSpecialInfoList(bmTopicDto); return getDataTable(list); } diff --git a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/pojo/BmCarouselDto.java b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/pojo/BmCarouselDto.java index 0089cf9..050d2b0 100644 --- a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/pojo/BmCarouselDto.java +++ b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/pojo/BmCarouselDto.java @@ -1,9 +1,10 @@ package com.bonus.zlpt.home.pojo; +import com.bonus.zlpt.common.core.web.page.PageDomain; import lombok.Data; @Data -public class BmCarouselDto { +public class BmCarouselDto extends PageDomain { //轮播图名称 private String carName; @@ -14,9 +15,4 @@ public class BmCarouselDto { //结束时间 private String endTime; - //页面 - private Integer page; - - //条数 - private Integer pageSize; } diff --git a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/pojo/BmTopicDto.java b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/pojo/BmTopicDto.java index a16c74b..d8c06c5 100644 --- a/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/pojo/BmTopicDto.java +++ b/zlpt-modules/zlpt-home/src/main/java/com/bonus/zlpt/home/pojo/BmTopicDto.java @@ -1,9 +1,11 @@ package com.bonus.zlpt.home.pojo; +import com.bonus.zlpt.common.core.web.domain.BaseEntity; +import com.bonus.zlpt.common.core.web.page.PageDomain; import lombok.Data; @Data -public class BmTopicDto { +public class BmTopicDto extends PageDomain { //名称 private String topicName; @@ -17,11 +19,6 @@ public class BmTopicDto { //结束时间 private String endTime; - //页面 - private Integer page; - - //条数 - private Integer pageSize; }