From 177bbe5a8f5909b1b11457d40607717fedb2013e Mon Sep 17 00:00:00 2001 From: zcxlsm Date: Thu, 17 Jul 2025 11:56:35 +0800 Subject: [PATCH] =?UTF-8?q?refactor(sis):=20-=20=E7=94=B5=E6=A2=AF?= =?UTF-8?q?=E2=87=84=E6=A5=BC=E5=B1=82=E5=85=B3=E8=81=94=E8=A1=A8=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=8F=98=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SisElevatorFloorRefController.java | 106 ------------------ .../controller/SisElevatorInfoController.java | 17 ++- .../sis/domain/SisElevatorFloorRef.java | 2 +- .../sis/domain/bo/SisElevatorFloorRefBo.java | 6 +- .../sis/domain/vo/SisElevatorFloorRefVo.java | 2 +- .../sis/mapper/SisElevatorFloorRefMapper.java | 4 +- .../impl/SisElevatorFloorRefServiceImpl.java | 18 +-- 7 files changed, 36 insertions(+), 119 deletions(-) delete mode 100644 ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisElevatorFloorRefController.java diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisElevatorFloorRefController.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisElevatorFloorRefController.java deleted file mode 100644 index 93daebb..0000000 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisElevatorFloorRefController.java +++ /dev/null @@ -1,106 +0,0 @@ -package org.dromara.sis.controller; - -import java.util.List; - -import lombok.RequiredArgsConstructor; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.constraints.*; -import cn.dev33.satoken.annotation.SaCheckPermission; -import org.springframework.web.bind.annotation.*; -import org.springframework.validation.annotation.Validated; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.sis.domain.vo.SisElevatorFloorRefVo; -import org.dromara.sis.domain.bo.SisElevatorFloorRefBo; -import org.dromara.sis.service.ISisElevatorFloorRefService; -import org.dromara.common.mybatis.core.page.TableDataInfo; - -/** - * 电梯⇄楼层关联 - * 前端访问路由地址为:/sis/elevatorFloorRef - * - * @author lsm - * @since 2025-07-15 - */ -@Validated -@RequiredArgsConstructor -@RestController -@RequestMapping("/elevatorFloorRef") -public class SisElevatorFloorRefController extends BaseController { - - private final ISisElevatorFloorRefService sisElevatorFloorRefService; - - /** - * 查询电梯⇄楼层关联列表 - */ - @SaCheckPermission("sis:elevatorFloorRef:list") - @GetMapping("/list") - public TableDataInfo list(SisElevatorFloorRefBo bo, PageQuery pageQuery) { - return sisElevatorFloorRefService.queryPageList(bo, pageQuery); - } - - /** - * 导出电梯⇄楼层关联列表 - */ - @SaCheckPermission("sis:elevatorFloorRef:export") - @Log(title = "电梯⇄楼层关联", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(SisElevatorFloorRefBo bo, HttpServletResponse response) { - List list = sisElevatorFloorRefService.queryList(bo); - ExcelUtil.exportExcel(list, "电梯⇄楼层关联", SisElevatorFloorRefVo.class, response); - } - - /** - * 获取电梯⇄楼层关联详细信息 - * - * @param id 主键 - */ - @SaCheckPermission("sis:elevatorFloorRef:query") - @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable("id") Long id) { - return R.ok(sisElevatorFloorRefService.queryById(id)); - } - - /** - * 新增电梯⇄楼层关联 - */ - @SaCheckPermission("sis:elevatorFloorRef:add") - @Log(title = "电梯⇄楼层关联", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody SisElevatorFloorRefBo bo) { - return toAjax(sisElevatorFloorRefService.insertByBo(bo)); - } - - /** - * 修改电梯⇄楼层关联 - */ - @SaCheckPermission("sis:elevatorFloorRef:edit") - @Log(title = "电梯⇄楼层关联", businessType = BusinessType.UPDATE) - @RepeatSubmit() - @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody SisElevatorFloorRefBo bo) { - return toAjax(sisElevatorFloorRefService.updateByBo(bo)); - } - - /** - * 删除电梯⇄楼层关联 - * - * @param ids 主键串 - */ - @SaCheckPermission("sis:elevatorFloorRef:remove") - @Log(title = "电梯⇄楼层关联", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable("ids") Long[] ids) { - return toAjax(sisElevatorFloorRefService.deleteWithValidByIds(List.of(ids), true)); - } -} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisElevatorInfoController.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisElevatorInfoController.java index c96c39e..5572482 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisElevatorInfoController.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisElevatorInfoController.java @@ -6,6 +6,8 @@ import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; +import org.dromara.sis.domain.bo.SisElevatorFloorRefBo; +import org.dromara.sis.service.ISisElevatorFloorRefService; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.dromara.common.idempotent.annotation.RepeatSubmit; @@ -27,7 +29,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; * 前端访问路由地址为:/sis/elevatorInfo * * @author lxj - * @date 2025-07-10 + * @since 2025-07-10 */ @Validated @RequiredArgsConstructor @@ -37,6 +39,8 @@ public class SisElevatorInfoController extends BaseController { private final ISisElevatorInfoService sisElevatorInfoService; + private final ISisElevatorFloorRefService sisElevatorFloorRefService; + /** * 查询电梯基本信息列表 */ @@ -103,4 +107,15 @@ public class SisElevatorInfoController extends BaseController { @PathVariable("elevatorIds") Long[] elevatorIds) { return toAjax(sisElevatorInfoService.deleteWithValidByIds(List.of(elevatorIds), true)); } + + /** + * 新增电梯⇄楼层关联 + * + * @param bo 电梯⇄楼层关联 + */ + @RepeatSubmit() + @PostMapping("/ref/add") + public R add(@Validated(AddGroup.class) @RequestBody SisElevatorFloorRefBo bo) { + return toAjax(sisElevatorFloorRefService.insertByBo(bo)); + } } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisElevatorFloorRef.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisElevatorFloorRef.java index 59f93ee..a855f6c 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisElevatorFloorRef.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisElevatorFloorRef.java @@ -35,7 +35,7 @@ public class SisElevatorFloorRef extends TenantEntity { /** * 楼层层数 */ - private Long layerNum; + private Long floorNum; } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisElevatorFloorRefBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisElevatorFloorRefBo.java index 3da9c32..d4537d7 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisElevatorFloorRefBo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisElevatorFloorRefBo.java @@ -9,6 +9,8 @@ import lombok.Data; import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; +import java.util.Collection; + /** * 电梯⇄楼层关联业务对象 sis_elevator_floor_ref * @@ -35,8 +37,8 @@ public class SisElevatorFloorRefBo extends BaseEntity { /** * 楼层层数 */ - @NotNull(message = "楼层层数不能为空", groups = { AddGroup.class, EditGroup.class }) - private Long layerNum; + @NotEmpty(message = "楼层层数不能为空", groups = { AddGroup.class, EditGroup.class }) + private Collection floorNums; } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisElevatorFloorRefVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisElevatorFloorRefVo.java index 31d5b63..27c95cd 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisElevatorFloorRefVo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisElevatorFloorRefVo.java @@ -44,7 +44,7 @@ public class SisElevatorFloorRefVo implements Serializable { * 楼层层数 */ @ExcelProperty(value = "楼层层数") - private Long layerNum; + private Long floorNum; } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisElevatorFloorRefMapper.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisElevatorFloorRefMapper.java index 3381838..c2fecf4 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisElevatorFloorRefMapper.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisElevatorFloorRefMapper.java @@ -1,5 +1,6 @@ package org.dromara.sis.mapper; +import org.apache.ibatis.annotations.Mapper; import org.dromara.sis.domain.SisElevatorFloorRef; import org.dromara.sis.domain.vo.SisElevatorFloorRefVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -8,8 +9,9 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * 电梯⇄楼层关联Mapper接口 * * @author lsm - * @date 2025-07-15 + * @since 2025-07-15 */ +@Mapper public interface SisElevatorFloorRefMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisElevatorFloorRefServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisElevatorFloorRefServiceImpl.java index 524fae9..eefa029 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisElevatorFloorRefServiceImpl.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisElevatorFloorRefServiceImpl.java @@ -1,5 +1,6 @@ package org.dromara.sis.service.impl; +import cn.hutool.core.lang.Assert; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -15,6 +16,7 @@ import org.dromara.sis.domain.vo.SisElevatorFloorRefVo; import org.dromara.sis.domain.SisElevatorFloorRef; import org.dromara.sis.mapper.SisElevatorFloorRefMapper; import org.dromara.sis.service.ISisElevatorFloorRefService; +import org.springframework.transaction.annotation.Transactional; import java.util.List; import java.util.Map; @@ -24,7 +26,7 @@ import java.util.Collection; * 电梯⇄楼层关联Service业务层处理 * * @author lsm - * @date 2025-07-15 + * @since 2025-07-15 */ @Slf4j @RequiredArgsConstructor @@ -75,7 +77,6 @@ public class SisElevatorFloorRefServiceImpl implements ISisElevatorFloorRefServi LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.orderByAsc(SisElevatorFloorRef::getId); lqw.eq(bo.getElevatorId() != null, SisElevatorFloorRef::getElevatorId, bo.getElevatorId()); - lqw.eq(bo.getLayerNum() != null, SisElevatorFloorRef::getLayerNum, bo.getLayerNum()); return lqw; } @@ -86,13 +87,16 @@ public class SisElevatorFloorRefServiceImpl implements ISisElevatorFloorRefServi * @return 是否新增成功 */ @Override + @Transactional(rollbackFor = Exception.class) public Boolean insertByBo(SisElevatorFloorRefBo bo) { - SisElevatorFloorRef add = MapstructUtils.convert(bo, SisElevatorFloorRef.class); - validEntityBeforeSave(add); - boolean flag = baseMapper.insert(add) > 0; - if (flag) { - bo.setId(add.getId()); + boolean flag = false; + for (Long num : bo.getFloorNums()){ + SisElevatorFloorRef add = new SisElevatorFloorRef(); + add.setLayerNum(num); + add.setElevatorId(bo.getElevatorId()); + flag = baseMapper.insert(add) > 0; } + Assert.isTrue(flag, "新增电梯⇄楼层关联关系失败"); return flag; }