From 49cbcb303656f7c31cac46450c91f19905281fb4 Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Wed, 14 Aug 2024 09:27:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=93=E5=BA=93=E7=89=A9?= =?UTF-8?q?=E8=B5=84=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/controller/BmCustomerController.java | 8 +- .../controller/MaHouseSetController.java | 91 +++++++++++ .../controller/MaUserSetController.java | 6 + .../com/bonus/material/domain/MaHouseSet.java | 40 +++++ .../material/mapper/MaHouseSetMapper.java | 63 ++++++++ .../service/impl/MaHouseSetService.java | 68 ++++++++ .../resources/mapper/MaHouseSetMapper.xml | 147 ++++++++++++++++++ 7 files changed, 418 insertions(+), 5 deletions(-) create mode 100644 bonus-modules/bonus-material/src/main/java/com/bonus/material/controller/MaHouseSetController.java create mode 100644 bonus-modules/bonus-material/src/main/java/com/bonus/material/domain/MaHouseSet.java create mode 100644 bonus-modules/bonus-material/src/main/java/com/bonus/material/mapper/MaHouseSetMapper.java create mode 100644 bonus-modules/bonus-material/src/main/java/com/bonus/material/service/impl/MaHouseSetService.java create mode 100644 bonus-modules/bonus-material/src/main/resources/mapper/MaHouseSetMapper.xml diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmCustomerController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmCustomerController.java index 8c6dc1e..d4f4075 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmCustomerController.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/BmCustomerController.java @@ -56,11 +56,9 @@ public class BmCustomerController extends BaseController { */ @ApiOperation(value = "获取往来单位下拉选") @GetMapping("/getUnitInfoSelect") - public AjaxResult getUnitInfoSelect(BmCustomer bmCustomer) - { + public AjaxResult getUnitInfoSelect(BmCustomer bmCustomer) { List list = customerService.selectCustomerList(bmCustomer); return AjaxResult.success(list); - } /** @@ -128,9 +126,9 @@ public class BmCustomerController extends BaseController { * 导出往来单位列表 */ @ApiOperation(value = "导出往来单位列表") + @RequiresPermissions("base:customer:export") @PostMapping("/export") - public void export(HttpServletResponse response, BmCustomer bmCustomer) - { + public void export(HttpServletResponse response, BmCustomer bmCustomer) { List list = customerService.selectCustomerList(bmCustomer); list.forEach(item->{ item.setStatusName(Objects.equals(item.getIsActive(), "1") ? "启用":"不启用"); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/controller/MaHouseSetController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/controller/MaHouseSetController.java new file mode 100644 index 0000000..42d0458 --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/controller/MaHouseSetController.java @@ -0,0 +1,91 @@ +package com.bonus.material.controller; +import com.bonus.common.core.domain.ResultBean; +import com.bonus.common.core.web.controller.BaseController; +import com.bonus.common.core.web.page.TableDataInfo; +import com.bonus.common.security.annotation.RequiresPermissions; +import com.bonus.material.service.impl.MaHouseSetService; +import com.bonus.material.domain.MaHouseSet; +import org.springframework.web.bind.annotation.*; +import org.springframework.beans.factory.annotation.Autowired; + +import java.util.List; + +/** +* 仓库和物资配置(ma_house_set)表控制层 +* +* @author 阮世耀 +*/ +@RestController +@RequestMapping("/ma_house_set") +public class MaHouseSetController extends BaseController { + + /** + * 服务对象 + */ + @Autowired + private MaHouseSetService maHouseSetService; + + + /** + * 分页查询数据 + */ + @GetMapping(value = "/list") + @RequiresPermissions("material:maHouseSet:query") + public TableDataInfo getList(MaHouseSet maHouseSet) { + startPage(); + List list = this.maHouseSetService.selectAll(maHouseSet); + return getDataTable(list); + } + + + /** + * 通过主键查询单条数据 + * + * @param id 主键 + * @return 单条数据 + */ + @GetMapping("{id}") + @RequiresPermissions("material:maHouseSet:query") + public ResultBean queryById(@PathVariable("id") Integer id) { + return ResultBean.success(this.maHouseSetService.selectByPrimaryKey(id)); + } + + /** + * 新增数据 + * + * @param maHouseSet 实体 + * @return 新增结果 + */ + @PostMapping(value = "/add") + @RequiresPermissions("material:maHouseSet:add") + public ResultBean< Boolean> add(@RequestBody MaHouseSet maHouseSet) { + this.maHouseSetService.insertSelective(maHouseSet); + return ResultBean.success(true); + } + + /** + * 编辑数据 + * + * @param maHouseSet 实体 + * @return 编辑结果 + */ + @PutMapping(value = "/update") + @RequiresPermissions("material:maHouseSet:edit") + public ResultBean< Boolean> edit(@RequestBody MaHouseSet maHouseSet) { + this.maHouseSetService.updateByPrimaryKeySelective(maHouseSet); + return ResultBean.success(true); + } + + /** + * 删除数据 + * + * @param id 主键 + * @return 删除是否成功 + */ + @PostMapping(value = "/delete/{id}") + @RequiresPermissions("material:maHouseSet:remove") + public ResultBean< Boolean> deleteById(@PathVariable("id") Integer id) { + this.maHouseSetService.deleteByPrimaryKey(id); + return ResultBean.success(true); + } +} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/controller/MaUserSetController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/controller/MaUserSetController.java index f9a2e8a..7d43b3e 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/controller/MaUserSetController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/controller/MaUserSetController.java @@ -2,6 +2,7 @@ package com.bonus.material.controller; import com.bonus.common.core.domain.ResultBean; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.page.TableDataInfo; +import com.bonus.common.security.annotation.RequiresPermissions; import com.bonus.material.service.impl.MaUserSetService; import com.bonus.material.domain.MaUserSet; import org.springframework.web.bind.annotation.*; @@ -29,6 +30,7 @@ public class MaUserSetController extends BaseController { * 分页查询数据 */ @GetMapping(value = "/list") + @RequiresPermissions("material:maUserSet:query") public TableDataInfo getList(MaUserSet maUserSet) { startPage(); List list = this.maUserSetService.selectAll(maUserSet); @@ -42,6 +44,7 @@ public class MaUserSetController extends BaseController { * @return 单条数据 */ @GetMapping("{id}") + @RequiresPermissions("material:maUserSet:query") public ResultBean queryById(@PathVariable("id") Integer id) { return ResultBean.success(this.maUserSetService.selectByPrimaryKey(id)); } @@ -53,6 +56,7 @@ public class MaUserSetController extends BaseController { * @return 新增结果 */ @PostMapping(value = "/add") + @RequiresPermissions("material:maUserSet:add") public ResultBean< Boolean> add(@RequestBody MaUserSet maUserSet) { this.maUserSetService.insertSelective(maUserSet); return ResultBean.success(true); @@ -65,6 +69,7 @@ public class MaUserSetController extends BaseController { * @return 编辑结果 */ @PutMapping(value = "/update") + @RequiresPermissions("material:maUserSet:edit") public ResultBean< Boolean> edit(@RequestBody MaUserSet maUserSet) { this.maUserSetService.updateByPrimaryKeySelective(maUserSet); return ResultBean.success(true); @@ -77,6 +82,7 @@ public class MaUserSetController extends BaseController { * @return 删除是否成功 */ @PostMapping(value = "/delete/{id}") + @RequiresPermissions("material:maUserSet:remove") public ResultBean< Boolean> deleteById(@PathVariable("id") Integer id) { this.maUserSetService.deleteByPrimaryKey(id); return ResultBean.success(true); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/domain/MaHouseSet.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/domain/MaHouseSet.java new file mode 100644 index 0000000..9da3474 --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/domain/MaHouseSet.java @@ -0,0 +1,40 @@ +package com.bonus.material.domain; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; +import lombok.Data; + + +/** + * 仓库和物资配置 + * @author 阮世耀 + */ +@ApiModel(description="仓库和物资配置") +@Data +public class MaHouseSet implements Serializable { + + private static final long serialVersionUID = 6368040076262260197L; + + @ApiModelProperty(value="") + private Integer id; + + /** + * 机具规格id + */ + @ApiModelProperty(value="机具规格id") + private Integer typeId; + + @ApiModelProperty(value="机具规格名称") + private String typeName; + + /** + * 仓库id + */ + @ApiModelProperty(value="仓库id") + private Integer houseId; + + @ApiModelProperty(value="仓库名称") + private String houseName; + +} \ No newline at end of file diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/mapper/MaHouseSetMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/mapper/MaHouseSetMapper.java new file mode 100644 index 0000000..35b66b6 --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/mapper/MaHouseSetMapper.java @@ -0,0 +1,63 @@ +package com.bonus.material.mapper; + +import com.bonus.material.domain.MaHouseSet; +import java.util.List; +import org.apache.ibatis.annotations.Mapper; + +/** + *@PackagePath: com.bonus.material + *@author : 阮世耀 + *@CreateTime: 2024-08-13 16:47 + *@Description: 描述 + *@version : 1.0 +*/ +@Mapper +public interface MaHouseSetMapper { + /** + * delete by primary key + * @param id primaryKey + * @return deleteCount + */ + int deleteByPrimaryKey(Integer id); + + /** + * insert record to table + * @param record the record + * @return insert count + */ + int insert(MaHouseSet record); + + int insertOrUpdate(MaHouseSet record); + + int insertOrUpdateSelective(MaHouseSet record); + + /** + * insert record to table selective + * @param record the record + * @return insert count + */ + int insertSelective(MaHouseSet record); + + /** + * select by primary key + * @param id primary key + * @return object by primary key + */ + MaHouseSet selectByPrimaryKey(Integer id); + + /** + * update record selective + * @param record the updated record + * @return update count + */ + int updateByPrimaryKeySelective(MaHouseSet record); + + /** + * update record + * @param record the updated record + * @return update count + */ + int updateByPrimaryKey(MaHouseSet record); + + List selectAll(MaHouseSet record); +} \ No newline at end of file diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/service/impl/MaHouseSetService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/service/impl/MaHouseSetService.java new file mode 100644 index 0000000..6ec0917 --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/service/impl/MaHouseSetService.java @@ -0,0 +1,68 @@ +package com.bonus.material.service.impl; + +import com.bonus.material.mapper.MaHouseSetMapper; +import org.springframework.stereotype.Service; + +import org.springframework.beans.factory.annotation.Autowired; + +import java.util.List; + +import com.bonus.material.domain.MaHouseSet; +/** + * @PackagePath: com.bonus.material + * @author : 阮世耀 + * @CreateTime: 2024-08-13 16:47 + * @version : 1.0 +*/ +@Service +public class MaHouseSetService{ + + @Autowired + private MaHouseSetMapper maHouseSetMapper; + + + public int deleteByPrimaryKey(Integer id) { + return maHouseSetMapper.deleteByPrimaryKey(id); + } + + + public int insert(MaHouseSet record) { + return maHouseSetMapper.insert(record); + } + + + public int insertOrUpdate(MaHouseSet record) { + return maHouseSetMapper.insertOrUpdate(record); + } + + + public int insertOrUpdateSelective(MaHouseSet record) { + return maHouseSetMapper.insertOrUpdateSelective(record); + } + + + public int insertSelective(MaHouseSet record) { + return maHouseSetMapper.insertSelective(record); + } + + + public MaHouseSet selectByPrimaryKey(Integer id) { + return maHouseSetMapper.selectByPrimaryKey(id); + } + + + public int updateByPrimaryKeySelective(MaHouseSet record) { + return maHouseSetMapper.updateByPrimaryKeySelective(record); + } + + + public int updateByPrimaryKey(MaHouseSet record) { + return maHouseSetMapper.updateByPrimaryKey(record); + } + + + public List selectAll(MaHouseSet maHouseSet) { + return maHouseSetMapper.selectAll(maHouseSet); + } + +} diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/MaHouseSetMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/MaHouseSetMapper.xml new file mode 100644 index 0000000..ea2df25 --- /dev/null +++ b/bonus-modules/bonus-material/src/main/resources/mapper/MaHouseSetMapper.xml @@ -0,0 +1,147 @@ + + + + + + + + + + + + + + + + ma_house_set.id, ma_house_set.type_id, ma_house_set.house_id + + + + + + + delete from ma_house_set + where id = #{id,jdbcType=INTEGER} + + + + + insert into ma_house_set (id, type_id, house_id) + values (#{id,jdbcType=INTEGER}, #{typeId,jdbcType=INTEGER}, #{houseId,jdbcType=INTEGER}) + + + + + insert into ma_house_set + + + id, + + + type_id, + + + house_id, + + + + + #{id,jdbcType=INTEGER}, + + + #{typeId,jdbcType=INTEGER}, + + + #{houseId,jdbcType=INTEGER}, + + + + + + + update ma_house_set + + + type_id = #{typeId,jdbcType=INTEGER}, + + + house_id = #{houseId,jdbcType=INTEGER}, + + + where id = #{id,jdbcType=INTEGER} + + + + + update ma_house_set + set type_id = #{typeId,jdbcType=INTEGER},house_id = #{houseId,jdbcType=INTEGER} + where id = #{id,jdbcType=INTEGER} + + + + + + + insert into ma_house_set(id, type_id, house_id) + values + (#{id,jdbcType=INTEGER}, #{typeId,jdbcType=INTEGER}, #{houseId,jdbcType=INTEGER}) + on duplicate key update + id = #{id,jdbcType=INTEGER}, type_id = #{typeId,jdbcType=INTEGER}, house_id = #{houseId,jdbcType=INTEGER} + + + + + insert into ma_house_set + + + id, + + + type_id, + + + house_id, + + + values + + + #{id,jdbcType=INTEGER}, + + + #{typeId,jdbcType=INTEGER}, + + + #{houseId,jdbcType=INTEGER}, + + + on duplicate key update + + + id = #{id,jdbcType=INTEGER}, + + + type_id = #{typeId,jdbcType=INTEGER}, + + + house_id = #{houseId,jdbcType=INTEGER}, + + + + + \ No newline at end of file