refactor(sis): - 电梯⇄楼层关联表字段变动

ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisElevatorFloorRefController.java

@@ -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<SisElevatorFloorRefVo> 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<SisElevatorFloorRefVo> list = sisElevatorFloorRefService.queryList(bo);
-        ExcelUtil.exportExcel(list, "电梯⇄楼层关联", SisElevatorFloorRefVo.class, response);
-    }
-
-    /**
-     * 获取电梯⇄楼层关联详细信息
-     *
-     * @param id 主键
-     */
-    @SaCheckPermission("sis:elevatorFloorRef:query")
-    @GetMapping("/{id}")
-    public R<SisElevatorFloorRefVo> 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<Void> 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<Void> 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<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable("ids") Long[] ids) {
-        return toAjax(sisElevatorFloorRefService.deleteWithValidByIds(List.of(ids), true));
-    }
-}

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<Void> add(@Validated(AddGroup.class) @RequestBody SisElevatorFloorRefBo bo) {
+        return toAjax(sisElevatorFloorRefService.insertByBo(bo));
+    }
 }

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;
 
 
 }

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 })
+    @NotEmpty(message = "楼层层数不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Long layerNum;
+    private Collection<Long> floorNums;
 
 
 }

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;
 
 
 }

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<SisElevatorFloorRef, SisElevatorFloorRefVo> {
 
 }

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<SisElevatorFloorRef> 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);
+        boolean flag = false;
-        validEntityBeforeSave(add);
+        for (Long num : bo.getFloorNums()){
-        boolean flag = baseMapper.insert(add) > 0;
+            SisElevatorFloorRef add = new SisElevatorFloorRef();
-        if (flag) {
+            add.setLayerNum(num);
-            bo.setId(add.getId());
+            add.setElevatorId(bo.getElevatorId());
+            flag = baseMapper.insert(add) > 0;
         }
+        Assert.isTrue(flag, "新增电梯⇄楼层关联关系失败");
         return flag;
     }