From 450725293a10ef095239d218f59fe1bb551c7e50 Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Mon, 19 Aug 2024 20:23:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E9=AA=8C=E6=94=B6=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/system/api/RemoteUserService.java | 3 +-- .../com/bonus/common/core/domain/ResultBean.java | 13 +++++++++++++ .../com/bonus/common/core/utils/NumberUtils.java | 6 +----- .../bonus/base/controller/BmProjectController.java | 10 ++++------ .../material/controller/MaHouseController.java | 10 ++++++++++ .../controller/BpmPurchaseInfoController.java | 12 +++++++----- .../purchase/mapper/BpmPurchaseInfoMapper.java | 3 +-- .../service/impl/BpmPurchaseInfoService.java | 8 +++++--- .../BpmPurchaseInfoMapper.xml | 1 - 9 files changed, 42 insertions(+), 24 deletions(-) rename bonus-modules/bonus-purchase/src/main/resources/{mapper.purchase => mapper}/BpmPurchaseInfoMapper.xml (99%) diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/RemoteUserService.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/RemoteUserService.java index 5c19cec..1fca5e1 100644 --- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/RemoteUserService.java +++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/RemoteUserService.java @@ -19,8 +19,7 @@ import com.bonus.system.api.model.LoginUser; * @author bonus */ @FeignClient(contextId = "remoteUserService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteUserFallbackFactory.class) -public interface RemoteUserService -{ +public interface RemoteUserService { /** * 通过用户名查询用户信息 * diff --git a/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/domain/ResultBean.java b/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/domain/ResultBean.java index 71f15e0..d17fbd6 100644 --- a/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/domain/ResultBean.java +++ b/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/domain/ResultBean.java @@ -82,4 +82,17 @@ public final class ResultBean implements java.io.Serializable{ return new ResultBean<>(record > 0 ? HttpStatus.SUCCESS : HttpStatus.NO_CONTENT, "error", data); } + /** + * 删除/修改/新增操作 根据影响条数返回响应内容 + * + * @return 构建的ResultBean实例 + */ + public static ResultBean toIsSuccess(int record) { + if (record > 0) { + return new ResultBean<>(HttpStatus.SUCCESS, "success", null); + } else { + return new ResultBean<>(HttpStatus.NOT_MODIFIED, "error", null); + } + } + } diff --git a/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/utils/NumberUtils.java b/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/utils/NumberUtils.java index 8b8e729..e7b9cd5 100644 --- a/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/utils/NumberUtils.java +++ b/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/utils/NumberUtils.java @@ -9,7 +9,6 @@ package com.bonus.common.core.utils; */ public class NumberUtils { - /** * 将对象转换为int * @param obj 对象 @@ -43,18 +42,15 @@ public class NumberUtils { * @return 运算结果 */ public static int operate(int amount1, int amount2, char operation, int scale) { - int result; - if (scale != 100 && scale != 1000) { throw new IllegalArgumentException("此方法只适用于100倍，1000倍的计算方法"); } if (operation == '*') { - result = (amount1 / scale) * (amount2 / scale) * scale; + return (amount1 / scale) * (amount2 / scale) * scale; } else { throw new IllegalArgumentException("请输入正确的(*)运算符: " + operation); } - return result; } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmProjectController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmProjectController.java index 9a8bc59..20709f6 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmProjectController.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmProjectController.java @@ -61,8 +61,7 @@ public class BmProjectController extends BaseController { @ApiOperation(value = "获取工程下拉选") @GetMapping("/getProjectSelect") public AjaxResult getUnitInfoSelect(BmProject bmProject) { - List list = bmProjectService.selectAll(bmProject); - return AjaxResult.success(list); + return AjaxResult.success(bmProjectService.selectAll(bmProject)); } @@ -104,12 +103,11 @@ public class BmProjectController extends BaseController { */ @PutMapping(value = "/update") @RequiresPermissions("base:project:edit") - public ResultBean edit(@NotNull @Valid @RequestBody BmProject obj) { + public ResultBean edit(@NotNull @Valid @RequestBody BmProject obj) { if (this.bmProjectService.selectByName(obj.getName()) > 1) { return ResultBean.error("工程名称重复"); } - this.bmProjectService.updateByPrimaryKeySelective(obj); - return ResultBean.success(true); + return ResultBean.toIsSuccess(this.bmProjectService.updateByPrimaryKeySelective(obj)); } @@ -124,7 +122,7 @@ public class BmProjectController extends BaseController { public ResultBean deleteById(@PathVariable("id") @NotNull(message = "ID不能为空") @Positive(message = "ID必须为正整数") Integer id) { - return ResultBean.toIsSuccess(this.bmProjectService.updateIsActive(id),"删除失败"); + return ResultBean.toIsSuccess(this.bmProjectService.updateIsActive(id)); } /** diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/material/controller/MaHouseController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/material/controller/MaHouseController.java index be4ca20..f1d4387 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/material/controller/MaHouseController.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/material/controller/MaHouseController.java @@ -49,6 +49,16 @@ public class MaHouseController extends BaseController { return getDataTable(list); } + /** + * 全部查询 + */ + @ApiOperation(value = "全部查询") + @GetMapping("/all") + @RequiresPermissions("material:maHouse:query") + public AjaxResult queryAll() { + return success(maHouseService.queryByPage(new MaHouse())); + } + /** * 通过主键查询单条数据 * diff --git a/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/controller/BpmPurchaseInfoController.java b/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/controller/BpmPurchaseInfoController.java index dfb2710..98019e9 100644 --- a/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/controller/BpmPurchaseInfoController.java +++ b/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/controller/BpmPurchaseInfoController.java @@ -7,6 +7,8 @@ import com.bonus.purchase.service.impl.BpmPurchaseInfoService; import org.springframework.web.bind.annotation.*; import org.springframework.beans.factory.annotation.Autowired; +import javax.validation.Valid; +import javax.validation.constraints.NotNull; import java.util.List; /** @@ -31,7 +33,7 @@ public class BpmPurchaseInfoController extends BaseController { @GetMapping(value = "/list") public TableDataInfo getList(BpmPurchaseInfo bpmPurchaseInfo) { startPage(); - List list = this.bpmPurchaseInfoService.selectAll(); + List list = this.bpmPurchaseInfoService.selectAll(bpmPurchaseInfo); return getDataTable(list); } @@ -43,7 +45,7 @@ public class BpmPurchaseInfoController extends BaseController { * @return 单条数据 */ @GetMapping("{id}") - public ResultBean queryById(@PathVariable("id") Integer id) { + public ResultBean queryById(@NotNull(message = "ID不能为空") @PathVariable("id") Integer id) { return ResultBean.success(this.bpmPurchaseInfoService.selectByPrimaryKey(id)); } @@ -54,7 +56,7 @@ public class BpmPurchaseInfoController extends BaseController { * @return 新增结果 */ @PostMapping(value = "/add") - public ResultBean< Boolean> add(@RequestBody BpmPurchaseInfo bpmPurchaseInfo) { + public ResultBean< Boolean> add(@NotNull @Valid @RequestBody BpmPurchaseInfo bpmPurchaseInfo) { this.bpmPurchaseInfoService.insertSelective(bpmPurchaseInfo); return ResultBean.success(true); } @@ -66,7 +68,7 @@ public class BpmPurchaseInfoController extends BaseController { * @return 编辑结果 */ @PutMapping(value = "/update") - public ResultBean< Boolean> edit(@RequestBody BpmPurchaseInfo bpmPurchaseInfo) { + public ResultBean< Boolean> edit(@NotNull @RequestBody BpmPurchaseInfo bpmPurchaseInfo) { this.bpmPurchaseInfoService.updateByPrimaryKeySelective(bpmPurchaseInfo); return ResultBean.success(true); } @@ -77,7 +79,7 @@ public class BpmPurchaseInfoController extends BaseController { * @param id 主键 * @return 删除是否成功 */ - @PostMapping(value = "/delete/{id}") + @DeleteMapping(value = "/delete/{id}") public ResultBean< Boolean> deleteById(@PathVariable("id") Integer id) { this.bpmPurchaseInfoService.deleteByPrimaryKey(id); return ResultBean.success(true); diff --git a/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/mapper/BpmPurchaseInfoMapper.java b/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/mapper/BpmPurchaseInfoMapper.java index f662403..e019186 100644 --- a/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/mapper/BpmPurchaseInfoMapper.java +++ b/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/mapper/BpmPurchaseInfoMapper.java @@ -15,8 +15,7 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface BpmPurchaseInfoMapper { - List selectAll(); - + List selectAll(BpmPurchaseInfo bpmPurchaseInfo); /** diff --git a/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/service/impl/BpmPurchaseInfoService.java b/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/service/impl/BpmPurchaseInfoService.java index d9fdf70..562ccc4 100644 --- a/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/service/impl/BpmPurchaseInfoService.java +++ b/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/service/impl/BpmPurchaseInfoService.java @@ -8,6 +8,8 @@ import org.springframework.beans.factory.annotation.Autowired; import com.bonus.purchase.domain.BpmPurchaseInfo; +import javax.annotation.Resource; + /** *@PackagePath: com.bonus.purchase *@author : 阮世耀 @@ -18,7 +20,7 @@ import com.bonus.purchase.domain.BpmPurchaseInfo; @Service public class BpmPurchaseInfoService{ - @Autowired + @Resource private BpmPurchaseInfoMapper bpmPurchaseInfoMapper; @@ -61,8 +63,8 @@ public class BpmPurchaseInfoService{ return bpmPurchaseInfoMapper.updateByPrimaryKey(record); } - public List selectAll(){ - return bpmPurchaseInfoMapper.selectAll(); + public List selectAll(BpmPurchaseInfo bpmPurchaseInfo){ + return bpmPurchaseInfoMapper.selectAll(bpmPurchaseInfo); } diff --git a/bonus-modules/bonus-purchase/src/main/resources/mapper.purchase/BpmPurchaseInfoMapper.xml b/bonus-modules/bonus-purchase/src/main/resources/mapper/BpmPurchaseInfoMapper.xml similarity index 99% rename from bonus-modules/bonus-purchase/src/main/resources/mapper.purchase/BpmPurchaseInfoMapper.xml rename to bonus-modules/bonus-purchase/src/main/resources/mapper/BpmPurchaseInfoMapper.xml index 0f8247b..d89148a 100644 --- a/bonus-modules/bonus-purchase/src/main/resources/mapper.purchase/BpmPurchaseInfoMapper.xml +++ b/bonus-modules/bonus-purchase/src/main/resources/mapper/BpmPurchaseInfoMapper.xml @@ -541,7 +541,6 @@ -