diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/service/impl/BasicAreaServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/service/impl/BasicAreaServiceImpl.java index 9663c34..a82485c 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/service/impl/BasicAreaServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/service/impl/BasicAreaServiceImpl.java @@ -7,7 +7,7 @@ import java.util.Objects; import java.util.stream.Collectors; import com.bonus.canteen.core.basic.mapper.BasicCanteenMapper; import com.bonus.canteen.core.common.domain.TreeSelect; -import com.bonus.canteen.core.ims.mapper.ImsWarehouseInfoMapper; +import com.bonus.canteen.core.ims.mapper.WarehouseInfoMapper; import com.bonus.canteen.core.supermarket.mapper.SupermarketInfoMapper; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.DateUtils; @@ -33,7 +33,7 @@ public class BasicAreaServiceImpl implements IBasicAreaService { @Autowired private SupermarketInfoMapper supermarketInfoMapper; @Autowired - ImsWarehouseInfoMapper imsWarehouseInfoMapper; + WarehouseInfoMapper imsWarehouseInfoMapper; /** * 查询区域 diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/controller/ImsWarehouseInfoController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/controller/WarehouseInfoController.java similarity index 77% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/controller/ImsWarehouseInfoController.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/controller/WarehouseInfoController.java index 7b787bf..d8a8d2a 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/controller/ImsWarehouseInfoController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/controller/WarehouseInfoController.java @@ -9,16 +9,13 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.bonus.common.log.annotation.SysLog; -import com.bonus.common.security.annotation.RequiresPermissions; -import com.bonus.canteen.core.ims.domain.ImsWarehouseInfo; -import com.bonus.canteen.core.ims.service.IImsWarehouseInfoService; +import com.bonus.canteen.core.ims.domain.WarehouseInfo; +import com.bonus.canteen.core.ims.service.IWarehouseInfoService; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.core.utils.poi.ExcelUtil; @@ -33,9 +30,9 @@ import com.bonus.common.core.web.page.TableDataInfo; @Api(tags = "仓库信息接口") @RestController @RequestMapping("/ims_warehouse_info") -public class ImsWarehouseInfoController extends BaseController { +public class WarehouseInfoController extends BaseController { @Autowired - private IImsWarehouseInfoService imsWarehouseInfoService; + private IWarehouseInfoService imsWarehouseInfoService; /** * 查询仓库信息列表 @@ -43,9 +40,9 @@ public class ImsWarehouseInfoController extends BaseController { @ApiOperation(value = "查询仓库信息列表") //@RequiresPermissions("iws:info:list") @GetMapping("/list") - public TableDataInfo list(ImsWarehouseInfo imsWarehouseInfo) { + public TableDataInfo list(WarehouseInfo imsWarehouseInfo) { startPage(); - List list = imsWarehouseInfoService.selectImsWarehouseInfoList(imsWarehouseInfo); + List list = imsWarehouseInfoService.selectImsWarehouseInfoList(imsWarehouseInfo); return getDataTable(list); } @@ -57,9 +54,9 @@ public class ImsWarehouseInfoController extends BaseController { //@RequiresPermissions("iws:info:export") @SysLog(title = "仓库信息", businessType = OperaType.EXPORT, logType = 1,module = "仓储管理->导出仓库信息") @PostMapping("/export") - public void export(HttpServletResponse response, ImsWarehouseInfo imsWarehouseInfo) { - List list = imsWarehouseInfoService.selectImsWarehouseInfoList(imsWarehouseInfo); - ExcelUtil util = new ExcelUtil(ImsWarehouseInfo.class); + public void export(HttpServletResponse response, WarehouseInfo imsWarehouseInfo) { + List list = imsWarehouseInfoService.selectImsWarehouseInfoList(imsWarehouseInfo); + ExcelUtil util = new ExcelUtil(WarehouseInfo.class); util.exportExcel(response, list, "仓库信息数据"); } @@ -81,7 +78,7 @@ public class ImsWarehouseInfoController extends BaseController { //@RequiresPermissions("iws:info:add") @SysLog(title = "仓库信息", businessType = OperaType.INSERT, logType = 1,module = "仓储管理->新增仓库信息") @PostMapping - public AjaxResult add(@RequestBody ImsWarehouseInfo imsWarehouseInfo) { + public AjaxResult add(@RequestBody WarehouseInfo imsWarehouseInfo) { try { return toAjax(imsWarehouseInfoService.insertImsWarehouseInfo(imsWarehouseInfo)); } catch (Exception e) { @@ -97,7 +94,7 @@ public class ImsWarehouseInfoController extends BaseController { //@RequiresPermissions("iws:info:edit") @SysLog(title = "仓库信息", businessType = OperaType.UPDATE, logType = 1,module = "仓储管理->修改仓库信息") @PostMapping("/edit") - public AjaxResult edit(@RequestBody ImsWarehouseInfo imsWarehouseInfo) { + public AjaxResult edit(@RequestBody WarehouseInfo imsWarehouseInfo) { try { return toAjax(imsWarehouseInfoService.updateImsWarehouseInfo(imsWarehouseInfo)); } catch (Exception e) { diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/ImsWarehouseInfo.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/WarehouseInfo.java similarity index 98% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/ImsWarehouseInfo.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/WarehouseInfo.java index ffe5136..89e8664 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/ImsWarehouseInfo.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/WarehouseInfo.java @@ -16,7 +16,7 @@ import com.bonus.common.core.web.domain.BaseEntity; @Data @ToString -public class ImsWarehouseInfo extends BaseEntity { +public class WarehouseInfo extends BaseEntity { private static final long serialVersionUID = 1L; /** 仓库id */ diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/ImsWarehouseInfoMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/WarehouseInfoMapper.java similarity index 72% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/ImsWarehouseInfoMapper.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/WarehouseInfoMapper.java index aa4a5bf..4ae71fc 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/ImsWarehouseInfoMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/WarehouseInfoMapper.java @@ -1,7 +1,7 @@ package com.bonus.canteen.core.ims.mapper; import java.util.List; -import com.bonus.canteen.core.ims.domain.ImsWarehouseInfo; +import com.bonus.canteen.core.ims.domain.WarehouseInfo; /** * 仓库信息Mapper接口 @@ -9,14 +9,14 @@ import com.bonus.canteen.core.ims.domain.ImsWarehouseInfo; * @author xsheng * @date 2025-06-19 */ -public interface ImsWarehouseInfoMapper { +public interface WarehouseInfoMapper { /** * 查询仓库信息 * * @param warehouseId 仓库信息主键 * @return 仓库信息 */ - public ImsWarehouseInfo selectImsWarehouseInfoByWarehouseId(Long warehouseId); + public WarehouseInfo selectImsWarehouseInfoByWarehouseId(Long warehouseId); public int getImsWarehouseCountByAreaIds(Long[] areaIds); @@ -26,7 +26,7 @@ public interface ImsWarehouseInfoMapper { * @param imsWarehouseInfo 仓库信息 * @return 仓库信息集合 */ - public List selectImsWarehouseInfoList(ImsWarehouseInfo imsWarehouseInfo); + public List selectImsWarehouseInfoList(WarehouseInfo imsWarehouseInfo); /** * 新增仓库信息 @@ -34,7 +34,7 @@ public interface ImsWarehouseInfoMapper { * @param imsWarehouseInfo 仓库信息 * @return 结果 */ - public int insertImsWarehouseInfo(ImsWarehouseInfo imsWarehouseInfo); + public int insertImsWarehouseInfo(WarehouseInfo imsWarehouseInfo); /** * 修改仓库信息 @@ -42,7 +42,7 @@ public interface ImsWarehouseInfoMapper { * @param imsWarehouseInfo 仓库信息 * @return 结果 */ - public int updateImsWarehouseInfo(ImsWarehouseInfo imsWarehouseInfo); + public int updateImsWarehouseInfo(WarehouseInfo imsWarehouseInfo); /** * 删除仓库信息 diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/IImsWarehouseInfoService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/IWarehouseInfoService.java similarity index 71% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/IImsWarehouseInfoService.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/IWarehouseInfoService.java index 4709f13..38f2564 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/IImsWarehouseInfoService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/IWarehouseInfoService.java @@ -1,7 +1,7 @@ package com.bonus.canteen.core.ims.service; import java.util.List; -import com.bonus.canteen.core.ims.domain.ImsWarehouseInfo; +import com.bonus.canteen.core.ims.domain.WarehouseInfo; /** * 仓库信息Service接口 @@ -9,14 +9,14 @@ import com.bonus.canteen.core.ims.domain.ImsWarehouseInfo; * @author xsheng * @date 2025-06-19 */ -public interface IImsWarehouseInfoService { +public interface IWarehouseInfoService { /** * 查询仓库信息 * * @param warehouseId 仓库信息主键 * @return 仓库信息 */ - public ImsWarehouseInfo selectImsWarehouseInfoByWarehouseId(Long warehouseId); + public WarehouseInfo selectImsWarehouseInfoByWarehouseId(Long warehouseId); /** * 查询仓库信息列表 @@ -24,7 +24,7 @@ public interface IImsWarehouseInfoService { * @param imsWarehouseInfo 仓库信息 * @return 仓库信息集合 */ - public List selectImsWarehouseInfoList(ImsWarehouseInfo imsWarehouseInfo); + public List selectImsWarehouseInfoList(WarehouseInfo imsWarehouseInfo); /** * 新增仓库信息 @@ -32,7 +32,7 @@ public interface IImsWarehouseInfoService { * @param imsWarehouseInfo 仓库信息 * @return 结果 */ - public int insertImsWarehouseInfo(ImsWarehouseInfo imsWarehouseInfo); + public int insertImsWarehouseInfo(WarehouseInfo imsWarehouseInfo); /** * 修改仓库信息 @@ -40,7 +40,7 @@ public interface IImsWarehouseInfoService { * @param imsWarehouseInfo 仓库信息 * @return 结果 */ - public int updateImsWarehouseInfo(ImsWarehouseInfo imsWarehouseInfo); + public int updateImsWarehouseInfo(WarehouseInfo imsWarehouseInfo); /** * 批量删除仓库信息 diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/ImsWarehouseInfoServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/WarehouseInfoServiceImpl.java similarity index 77% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/ImsWarehouseInfoServiceImpl.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/WarehouseInfoServiceImpl.java index 1d8e05d..44b36e9 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/ImsWarehouseInfoServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/WarehouseInfoServiceImpl.java @@ -5,9 +5,9 @@ import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.bonus.canteen.core.ims.mapper.ImsWarehouseInfoMapper; -import com.bonus.canteen.core.ims.domain.ImsWarehouseInfo; -import com.bonus.canteen.core.ims.service.IImsWarehouseInfoService; +import com.bonus.canteen.core.ims.mapper.WarehouseInfoMapper; +import com.bonus.canteen.core.ims.domain.WarehouseInfo; +import com.bonus.canteen.core.ims.service.IWarehouseInfoService; /** * 仓库信息Service业务层处理 @@ -16,9 +16,9 @@ import com.bonus.canteen.core.ims.service.IImsWarehouseInfoService; * @date 2025-06-19 */ @Service -public class ImsWarehouseInfoServiceImpl implements IImsWarehouseInfoService { +public class WarehouseInfoServiceImpl implements IWarehouseInfoService { @Autowired - private ImsWarehouseInfoMapper imsWarehouseInfoMapper; + private WarehouseInfoMapper imsWarehouseInfoMapper; /** * 查询仓库信息 @@ -27,7 +27,7 @@ public class ImsWarehouseInfoServiceImpl implements IImsWarehouseInfoService { * @return 仓库信息 */ @Override - public ImsWarehouseInfo selectImsWarehouseInfoByWarehouseId(Long warehouseId) { + public WarehouseInfo selectImsWarehouseInfoByWarehouseId(Long warehouseId) { return imsWarehouseInfoMapper.selectImsWarehouseInfoByWarehouseId(warehouseId); } @@ -38,7 +38,7 @@ public class ImsWarehouseInfoServiceImpl implements IImsWarehouseInfoService { * @return 仓库信息 */ @Override - public List selectImsWarehouseInfoList(ImsWarehouseInfo imsWarehouseInfo) { + public List selectImsWarehouseInfoList(WarehouseInfo imsWarehouseInfo) { return imsWarehouseInfoMapper.selectImsWarehouseInfoList(imsWarehouseInfo); } @@ -49,7 +49,7 @@ public class ImsWarehouseInfoServiceImpl implements IImsWarehouseInfoService { * @return 结果 */ @Override - public int insertImsWarehouseInfo(ImsWarehouseInfo imsWarehouseInfo) { + public int insertImsWarehouseInfo(WarehouseInfo imsWarehouseInfo) { imsWarehouseInfo.setCreateTime(DateUtils.getNowDate()); try { return imsWarehouseInfoMapper.insertImsWarehouseInfo(imsWarehouseInfo); @@ -65,7 +65,7 @@ public class ImsWarehouseInfoServiceImpl implements IImsWarehouseInfoService { * @return 结果 */ @Override - public int updateImsWarehouseInfo(ImsWarehouseInfo imsWarehouseInfo) { + public int updateImsWarehouseInfo(WarehouseInfo imsWarehouseInfo) { imsWarehouseInfo.setUpdateTime(DateUtils.getNowDate()); try { return imsWarehouseInfoMapper.updateImsWarehouseInfo(imsWarehouseInfo); diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ImsWarehouseInfoMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/WarehouseInfoMapper.xml similarity index 95% rename from bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ImsWarehouseInfoMapper.xml rename to bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/WarehouseInfoMapper.xml index 14d0f0f..9a4b91b 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ImsWarehouseInfoMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/WarehouseInfoMapper.xml @@ -2,8 +2,8 @@ - - + + @@ -32,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select warehouse_id, parent_id, category_id, area_id, canteen_id, warehouse_code, warehouse_name, user_id, manager, fetch_user_id, region_province, region_city, region_district, address, warehouse_type, if_use_warehouse_area, if_use_warehouse_location, del_flag, create_by, create_time, update_by, update_time from ims_warehouse_info - and parent_id = #{parentId} @@ -68,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + insert into ims_warehouse_info parent_id, @@ -118,7 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update ims_warehouse_info parent_id = #{parentId},