diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmAgreementController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmAgreementController.java index 788c1bd..bd0ffc1 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmAgreementController.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmAgreementController.java @@ -3,9 +3,14 @@ package com.bonus.base.controller; import com.bonus.base.domain.BmAgreement; import com.bonus.base.service.BmAgreementService; import com.bonus.base.utils.ResultBean; +import com.bonus.common.core.constant.HttpStatus; +import com.bonus.common.core.web.controller.BaseController; +import com.bonus.common.core.web.page.TableDataInfo; import org.springframework.web.bind.annotation.*; import org.springframework.beans.factory.annotation.Autowired; +import java.util.List; + /** * 协议管理(bm_agreement)表控制层 * @@ -13,7 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired; */ @RestController @RequestMapping("/bm_agreement") -public class BmAgreementController { +public class BmAgreementController extends BaseController { /** * 服务对象 @@ -21,6 +26,18 @@ public class BmAgreementController { @Autowired private BmAgreementService bmAgreementService; + + /** + * 分页查询 + */ + @GetMapping("/list") + public TableDataInfo list(BmAgreement bmAgreement) { + startPage(); + List list = this.bmAgreementService.selectAll(); + return getDataTable(list); + } + + /** * 通过主键查询单条数据 * @@ -41,7 +58,7 @@ public class BmAgreementController { @PostMapping(value = "/add") public ResultBean add(BmAgreement bmAgreement) { int result = this.bmAgreementService.insertSelective(bmAgreement); - return result > 0 ? ResultBean.success(true) : ResultBean.error(0, "删除失败"); + return result > 0 ? ResultBean.success(true) : ResultBean.error("删除失败"); } /** diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/BmAgreementMapper.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/BmAgreementMapper.java index 051c30d..6e40514 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/BmAgreementMapper.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/BmAgreementMapper.java @@ -3,6 +3,8 @@ package com.bonus.base.mapper; import com.bonus.base.domain.BmAgreement; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** *@PackagePath: com.bonus.base.mapper *@author : 阮世耀 @@ -44,6 +46,8 @@ public interface BmAgreementMapper { */ BmAgreement selectByPrimaryKey(Integer id); + List selectAll(); + /** * update record selective * @param record the updated record diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/BmAgreementService.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/BmAgreementService.java index be1a323..21e239d 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/BmAgreementService.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/service/BmAgreementService.java @@ -9,6 +9,7 @@ import com.bonus.base.domain.BmAgreement; import com.bonus.base.mapper.BmAgreementMapper; import javax.annotation.Resource; +import java.util.List; /** * @PackagePath: com.bonus.base @@ -24,6 +25,8 @@ public class BmAgreementService{ @Resource private BmAgreementMapper bmAgreementMapper; + public List selectAll() {return bmAgreementMapper.selectAll();} + public int deleteByPrimaryKey(Integer id) { return bmAgreementMapper.deleteByPrimaryKey(id); } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/utils/ResultBean.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/utils/ResultBean.java index 0cd58ce..77dea27 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/utils/ResultBean.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/utils/ResultBean.java @@ -16,7 +16,9 @@ import lombok.RequiredArgsConstructor; public final class ResultBean { private final int code; + private final String message; + private final T data; /** @@ -37,7 +39,7 @@ public final class ResultBean { * @return 构建的ResultBean实例 */ public static ResultBean error(String message) { - return new ResultBean<>(500, message, null); + return new ResultBean<>(HttpStatus.ERROR, message, null); } diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/BmAgreementMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/BmAgreementMapper.xml index db96aea..1c1e076 100644 --- a/bonus-modules/bonus-base/src/main/resources/mapper/BmAgreementMapper.xml +++ b/bonus-modules/bonus-base/src/main/resources/mapper/BmAgreementMapper.xml @@ -37,6 +37,13 @@ from bm_agreement where id = #{id,jdbcType=INTEGER} + + + delete from bm_agreement @@ -484,4 +491,5 @@ + \ No newline at end of file