room 房间表相关类调整优化

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/LedgerRoomController.java

 package com.censoft.censoftrongtong.controller;
 
+import java.util.Arrays;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.censoft.censoftrongtong.domain.LedgerRoom;
 import com.censoft.censoftrongtong.service.ILedgerRoomService;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -42,8 +44,9 @@ public class LedgerRoomController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(LedgerRoom ledgerRoom)
     {
+        QueryWrapper<LedgerRoom> queryWrapper = new QueryWrapper<>();
         startPage();
-        List<LedgerRoom> list = ledgerRoomService.selectLedgerRoomList(ledgerRoom);
+        List<LedgerRoom> list = ledgerRoomService.list(queryWrapper);
         return getDataTable(list);
     }
 
@@ -55,7 +58,8 @@ public class LedgerRoomController extends BaseController
     @PostMapping("/export")
     public void export(HttpServletResponse response, LedgerRoom ledgerRoom)
     {
-        List<LedgerRoom> list = ledgerRoomService.selectLedgerRoomList(ledgerRoom);
+        QueryWrapper<LedgerRoom> queryWrapper = new QueryWrapper<>();
+        List<LedgerRoom> list = ledgerRoomService.list(queryWrapper);
         ExcelUtil<LedgerRoom> util = new ExcelUtil<LedgerRoom>(LedgerRoom.class);
         util.exportExcel(response, list, "基础数据-楼层数据");
     }
@@ -67,7 +71,7 @@ public class LedgerRoomController extends BaseController
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
-        return success(ledgerRoomService.selectLedgerRoomById(id));
+        return success(ledgerRoomService.getById(id));
     }
 
     /**
@@ -78,7 +82,7 @@ public class LedgerRoomController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody LedgerRoom ledgerRoom)
     {
-        return toAjax(ledgerRoomService.insertLedgerRoom(ledgerRoom));
+        return toAjax(ledgerRoomService.save(ledgerRoom));
     }
 
     /**
@@ -89,7 +93,7 @@ public class LedgerRoomController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody LedgerRoom ledgerRoom)
     {
-        return toAjax(ledgerRoomService.updateLedgerRoom(ledgerRoom));
+        return toAjax(ledgerRoomService.updateById(ledgerRoom));
     }
 
     /**
@@ -100,6 +104,7 @@ public class LedgerRoomController extends BaseController
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(ledgerRoomService.deleteLedgerRoomByIds(ids));
+        ledgerRoomService.removeBatchByIds(Arrays.asList(ids));
+        return AjaxResult.success();
     }
 }

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/LedgerRoom.java

@@ -3,6 +3,7 @@ package com.censoft.censoftrongtong.domain;
 import java.math.BigDecimal;
 
 import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -14,6 +15,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * @author ruoyi
  * @date 2023-06-26
  */
+@Data
 @TableName("ledger_room")
 public class LedgerRoom extends BaseEntity
 {
@@ -43,6 +45,21 @@ public class LedgerRoom extends BaseEntity
     @TableField("area")
     private BigDecimal area;
 
+    /** 房屋类型 */
+    @Excel(name = "房屋类型")
+    @TableField("room_type")
+    private  String  roomType;
+
+    /** 楼层id */
+    @Excel(name = "颜色")
+    @TableField("color")
+    private String color;
+
+    /** 房屋平面图位置 */
+    @Excel(name = "房屋平面图位置")
+    @TableField(" position")
+    private String position;
+
     /** 状态（0正常 1停用） */
     @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
     @TableField("status")
@@ -52,85 +69,4 @@ public class LedgerRoom extends BaseEntity
     @TableField("del_flag")
     @TableLogic
     private String delFlag;
-
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setFloorId(Long floorId) 
-    {
-        this.floorId = floorId;
-    }
-
-    public Long getFloorId() 
-    {
-        return floorId;
-    }
-    public void setName(String name) 
-    {
-        this.name = name;
-    }
-
-    public String getName() 
-    {
-        return name;
-    }
-    public void setNumber(String number) 
-    {
-        this.number = number;
-    }
-
-    public String getNumber() 
-    {
-        return number;
-    }
-    public void setArea(BigDecimal area) 
-    {
-        this.area = area;
-    }
-
-    public BigDecimal getArea() 
-    {
-        return area;
-    }
-    public void setStatus(String status) 
-    {
-        this.status = status;
-    }
-
-    public String getStatus() 
-    {
-        return status;
-    }
-    public void setDelFlag(String delFlag) 
-    {
-        this.delFlag = delFlag;
-    }
-
-    public String getDelFlag() 
-    {
-        return delFlag;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("floorId", getFloorId())
-            .append("name", getName())
-            .append("number", getNumber())
-            .append("area", getArea())
-            .append("status", getStatus())
-            .append("delFlag", getDelFlag())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .toString();
-    }
 }

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/mapper/LedgerRoomMapper.java

@@ -13,51 +13,5 @@ import java.util.List;
  */
 public interface LedgerRoomMapper extends BaseMapper<LedgerRoom>
 {
-    /**
-     * 查询基础数据-楼层
-     * 
-     * @param id 基础数据-楼层主键
-     * @return 基础数据-楼层
-     */
-    public LedgerRoom selectLedgerRoomById(Long id);
 
-    /**
-     * 查询基础数据-楼层列表
-     * 
-     * @param ledgerRoom 基础数据-楼层
-     * @return 基础数据-楼层集合
-     */
-    public List<LedgerRoom> selectLedgerRoomList(LedgerRoom ledgerRoom);
-
-    /**
-     * 新增基础数据-楼层
-     * 
-     * @param ledgerRoom 基础数据-楼层
-     * @return 结果
-     */
-    public int insertLedgerRoom(LedgerRoom ledgerRoom);
-
-    /**
-     * 修改基础数据-楼层
-     * 
-     * @param ledgerRoom 基础数据-楼层
-     * @return 结果
-     */
-    public int updateLedgerRoom(LedgerRoom ledgerRoom);
-
-    /**
-     * 删除基础数据-楼层
-     * 
-     * @param id 基础数据-楼层主键
-     * @return 结果
-     */
-    public int deleteLedgerRoomById(Long id);
-
-    /**
-     * 批量删除基础数据-楼层
-     * 
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteLedgerRoomByIds(Long[] ids);
 }

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/ILedgerRoomService.java

@@ -13,53 +13,6 @@ import java.util.List;
  */
 public interface ILedgerRoomService extends IService<LedgerRoom>
 {
-    /**
-     * 查询基础数据-楼层
-     * 
-     * @param id 基础数据-楼层主键
-     * @return 基础数据-楼层
-     */
-    public LedgerRoom selectLedgerRoomById(Long id);
-
-    /**
-     * 查询基础数据-楼层列表
-     * 
-     * @param ledgerRoom 基础数据-楼层
-     * @return 基础数据-楼层集合
-     */
-    public List<LedgerRoom> selectLedgerRoomList(LedgerRoom ledgerRoom);
-
-    /**
-     * 新增基础数据-楼层
-     * 
-     * @param ledgerRoom 基础数据-楼层
-     * @return 结果
-     */
-    public int insertLedgerRoom(LedgerRoom ledgerRoom);
-
-    /**
-     * 修改基础数据-楼层
-     * 
-     * @param ledgerRoom 基础数据-楼层
-     * @return 结果
-     */
-    public int updateLedgerRoom(LedgerRoom ledgerRoom);
-
-    /**
-     * 批量删除基础数据-楼层
-     * 
-     * @param ids 需要删除的基础数据-楼层主键集合
-     * @return 结果
-     */
-    public int deleteLedgerRoomByIds(Long[] ids);
-
-    /**
-     * 删除基础数据-楼层信息
-     * 
-     * @param id 基础数据-楼层主键
-     * @return 结果
-     */
-    public int deleteLedgerRoomById(Long id);
 
     List<LedgerRoom> getRoomListByBuildingId(Long floorId);
 }

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/LedgerRoomServiceImpl.java

@@ -12,6 +12,8 @@ import com.ruoyi.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+
 /**
  * 基础数据-楼层Service业务层处理
  * 
@@ -20,82 +22,9 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class LedgerRoomServiceImpl extends ServiceImpl<LedgerRoomMapper, LedgerRoom> implements ILedgerRoomService {
-    @Autowired
-    private LedgerRoomMapper ledgerRoomMapper;
-
-    /**
-     * 查询基础数据-楼层
-     * 
-     * @param id 基础数据-楼层主键
-     * @return 基础数据-楼层
-     */
-    @Override
-    public LedgerRoom selectLedgerRoomById(Long id)
-    {
-        return ledgerRoomMapper.selectLedgerRoomById(id);
-    }
-
-    /**
-     * 查询基础数据-楼层列表
-     * 
-     * @param ledgerRoom 基础数据-楼层
-     * @return 基础数据-楼层
-     */
-    @Override
-    public List<LedgerRoom> selectLedgerRoomList(LedgerRoom ledgerRoom)
-    {
-        return ledgerRoomMapper.selectLedgerRoomList(ledgerRoom);
-    }
-
-    /**
-     * 新增基础数据-楼层
-     * 
-     * @param ledgerRoom 基础数据-楼层
-     * @return 结果
-     */
-    @Override
-    public int insertLedgerRoom(LedgerRoom ledgerRoom)
-    {
-        ledgerRoom.setCreateTime(DateUtils.getNowDate());
-        return ledgerRoomMapper.insertLedgerRoom(ledgerRoom);
-    }
-
-    /**
-     * 修改基础数据-楼层
-     * 
-     * @param ledgerRoom 基础数据-楼层
-     * @return 结果
-     */
-    @Override
-    public int updateLedgerRoom(LedgerRoom ledgerRoom)
-    {
-        ledgerRoom.setUpdateTime(DateUtils.getNowDate());
-        return ledgerRoomMapper.updateLedgerRoom(ledgerRoom);
-    }
-
-    /**
-     * 批量删除基础数据-楼层
-     * 
-     * @param ids 需要删除的基础数据-楼层主键
-     * @return 结果
-     */
-    @Override
-    public int deleteLedgerRoomByIds(Long[] ids)
-    {
-        return ledgerRoomMapper.deleteLedgerRoomByIds(ids);
-    }
 
-    /**
-     * 删除基础数据-楼层信息
-     * 
-     * @param id 基础数据-楼层主键
-     * @return 结果
-     */
-    @Override
-    public int deleteLedgerRoomById(Long id)
-    {
-        return ledgerRoomMapper.deleteLedgerRoomById(id);
-    }
+    @Resource
+    private LedgerRoomMapper ledgerRoomMapper;
 
     @Override
     public List<LedgerRoom> getRoomListByBuildingId(Long floorId) {

censoft-rongtong/src/main/resources/mapper/system/LedgerRoomMapper.xml

@@ -3,94 +3,5 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.censoft.censoftrongtong.mapper.LedgerRoomMapper">
-    
-    <resultMap type="com.censoft.censoftrongtong.domain.LedgerRoom" id="LedgerRoomResult">
-        <result property="id"    column="id"    />
-        <result property="floorId"    column="floor_id"    />
-        <result property="name"    column="name"    />
-        <result property="number"    column="number"    />
-        <result property="area"    column="area"    />
-        <result property="status"    column="status"    />
-        <result property="delFlag"    column="del_flag"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-    </resultMap>
 
-    <sql id="selectLedgerRoomVo">
-        select id, floor_id, name, number, area, status, del_flag, create_by, create_time, update_by, update_time from ledger_room
-    </sql>
-
-    <select id="selectLedgerRoomList" parameterType="com.censoft.censoftrongtong.domain.LedgerRoom" resultMap="LedgerRoomResult">
-        <include refid="selectLedgerRoomVo"/>
-        <where>  
-            <if test="floorId != null "> and floor_id = #{floorId}</if>
-            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="number != null  and number != ''"> and number = #{number}</if>
-            <if test="area != null "> and area = #{area}</if>
-            <if test="status != null  and status != ''"> and status = #{status}</if>
-        </where>
-    </select>
-    
-    <select id="selectLedgerRoomById" parameterType="Long" resultMap="LedgerRoomResult">
-        <include refid="selectLedgerRoomVo"/>
-        where id = #{id}
-    </select>
-        
-    <insert id="insertLedgerRoom" parameterType="com.censoft.censoftrongtong.domain.LedgerRoom" useGeneratedKeys="true" keyProperty="id">
-        insert into ledger_room
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="floorId != null">floor_id,</if>
-            <if test="name != null">name,</if>
-            <if test="number != null">number,</if>
-            <if test="area != null">area,</if>
-            <if test="status != null">status,</if>
-            <if test="delFlag != null">del_flag,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="updateTime != null">update_time,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="floorId != null">#{floorId},</if>
-            <if test="name != null">#{name},</if>
-            <if test="number != null">#{number},</if>
-            <if test="area != null">#{area},</if>
-            <if test="status != null">#{status},</if>
-            <if test="delFlag != null">#{delFlag},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-         </trim>
-    </insert>
-
-    <update id="updateLedgerRoom" parameterType="com.censoft.censoftrongtong.domain.LedgerRoom">
-        update ledger_room
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="floorId != null">floor_id = #{floorId},</if>
-            <if test="name != null">name = #{name},</if>
-            <if test="number != null">number = #{number},</if>
-            <if test="area != null">area = #{area},</if>
-            <if test="status != null">status = #{status},</if>
-            <if test="delFlag != null">del_flag = #{delFlag},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteLedgerRoomById" parameterType="Long">
-        delete from ledger_room where id = #{id}
-    </delete>
-
-    <delete id="deleteLedgerRoomByIds" parameterType="String">
-        delete from ledger_room where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
 </mapper>
\ No newline at end of file