小区与房间crud

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZUnitController.java

@@ -47,6 +47,14 @@ public class ZUnitController extends BaseController {
     public TableDataInfo<ZUnitVo> list(ZUnitBo bo, PageQuery pageQuery) {
         return iZUnitService.queryPageList(bo, pageQuery);
     }
+    /**
+     * 查询单元管理下拉
+     */
+    @SaCheckPermission("zdsz:unit:list")
+    @GetMapping("/units")
+    public R list(ZUnitVo vo) {
+        return R.ok(iZUnitService.getUnitList(vo.getBuildingId()));
+    }
 
     /**
      * 导出单元管理列表

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/bo/ZAreaBo.java

@@ -52,7 +52,7 @@ public class ZAreaBo extends BaseEntity {
     /**
      * 释放人
      */
-    @NotBlank(message = "释放人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "释放人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String releaseBy;
 
     /**
@@ -76,7 +76,7 @@ public class ZAreaBo extends BaseEntity {
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
 

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/bo/ZHouseBo.java

@@ -1,5 +1,7 @@
 package com.ruoyi.zdsz.domain.bo;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import lombok.Data;
@@ -22,31 +24,32 @@ import com.ruoyi.common.core.domain.BaseEntity;
 public class ZHouseBo extends BaseEntity {
 
     /**
-     * 
+     *
      */
     @NotBlank(message = "不能为空", groups = { EditGroup.class })
+    @TableId(type = IdType.ASSIGN_UUID)
     private String id;
 
     /**
-     * 
+     *
      */
     @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String areaId;
 
     /**
-     * 
+     *
      */
     @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String buildingId;
 
     /**
-     * 
+     *
      */
     @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String unitId;
 
     /**
-     * 
+     *
      */
     @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String name;
@@ -54,7 +57,7 @@ public class ZHouseBo extends BaseEntity {
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
 

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/vo/ZHouseVo.java

@@ -22,31 +22,31 @@ public class ZHouseVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
     @ExcelProperty(value = "")
     private String id;
 
     /**
-     * 
+     *
      */
     @ExcelProperty(value = "")
     private String areaId;
 
     /**
-     * 
+     *
      */
     @ExcelProperty(value = "")
     private String buildingId;
 
     /**
-     * 
+     *
      */
     @ExcelProperty(value = "")
     private String unitId;
 
     /**
-     * 
+     *
      */
     @ExcelProperty(value = "")
     private String name;
@@ -58,4 +58,12 @@ public class ZHouseVo implements Serializable {
     private String remark;
 
 
+    @ExcelProperty(value = "小区")
+    private String areaName;
+
+    @ExcelProperty(value = "楼栋")
+    private String buildingName;
+
+    @ExcelProperty(value = "单元")
+    private String unitName;
 }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/mapper/ZHouseMapper.java

@@ -1,8 +1,13 @@
 package com.ruoyi.zdsz.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.zdsz.domain.ZHouse;
+import com.ruoyi.zdsz.domain.bo.ZBuildingBo;
+import com.ruoyi.zdsz.domain.bo.ZHouseBo;
+import com.ruoyi.zdsz.domain.vo.ZBuildingVo;
 import com.ruoyi.zdsz.domain.vo.ZHouseVo;
 import com.ruoyi.common.core.mapper.BaseMapperPlus;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 房间管理Mapper接口
@@ -11,5 +16,6 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
  * @date 2023-12-27
  */
 public interface ZHouseMapper extends BaseMapperPlus<ZHouseMapper, ZHouse, ZHouseVo> {
+    Page<ZHouseVo> getPageList(@Param("p") ZHouseBo bo, Page<?> page);
 
 }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/mapper/ZUnitMapper.java

@@ -1,9 +1,12 @@
 package com.ruoyi.zdsz.mapper;
 
 import com.ruoyi.zdsz.domain.ZUnit;
+import com.ruoyi.zdsz.domain.vo.ZBuildingVo;
 import com.ruoyi.zdsz.domain.vo.ZUnitVo;
 import com.ruoyi.common.core.mapper.BaseMapperPlus;
 
+import java.util.List;
+
 /**
  * 单元管理Mapper接口
  *
@@ -11,5 +14,5 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
  * @date 2023-12-27
  */
 public interface ZUnitMapper extends BaseMapperPlus<ZUnitMapper, ZUnit, ZUnitVo> {
-
+    List<ZUnitVo> getUnitList(String buildingId);
 }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/IZUnitService.java

@@ -46,4 +46,6 @@ public interface IZUnitService {
      * 校验并批量删除单元管理信息
      */
     Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
+
+    List<ZUnitVo> getUnitList(String buildingId);
 }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZHouseServiceImpl.java

@@ -1,12 +1,15 @@
 package com.ruoyi.zdsz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.zdsz.domain.bo.ZBuildingBo;
+import com.ruoyi.zdsz.domain.vo.ZBuildingVo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import com.ruoyi.zdsz.domain.bo.ZHouseBo;
@@ -15,6 +18,7 @@ import com.ruoyi.zdsz.domain.ZHouse;
 import com.ruoyi.zdsz.mapper.ZHouseMapper;
 import com.ruoyi.zdsz.service.IZHouseService;
 
+import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
 import java.util.Collection;
@@ -29,6 +33,7 @@ import java.util.Collection;
 @Service
 public class ZHouseServiceImpl implements IZHouseService {
 
+    @Resource
     private final ZHouseMapper baseMapper;
 
     /**
@@ -44,9 +49,12 @@ public class ZHouseServiceImpl implements IZHouseService {
      */
     @Override
     public TableDataInfo<ZHouseVo> queryPageList(ZHouseBo bo, PageQuery pageQuery) {
-        LambdaQueryWrapper<ZHouse> lqw = buildQueryWrapper(bo);
-        Page<ZHouseVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
-        return TableDataInfo.build(result);
+//        LambdaQueryWrapper<ZHouse> lqw = buildQueryWrapper(bo);
+//        Page<ZHouseVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+//        return TableDataInfo.build(result);
+        Page<ZHouseBo> page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize());
+        Page<ZHouseVo> list = baseMapper.getPageList(bo,page);
+        return PageUtils.buildDataInfo(list);
     }
 
     /**

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZUnitServiceImpl.java

@@ -108,4 +108,9 @@ public class ZUnitServiceImpl implements IZUnitService {
         }
         return baseMapper.deleteBatchIds(ids) > 0;
     }
+
+    @Override
+    public List<ZUnitVo> getUnitList(String buildingId) {
+        return baseMapper.getUnitList(buildingId);
+    }
 }

ruoyi-zdsz/src/main/resources/mapper/zdsz/zdsz/ZAreaMapper.xml

@@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                name as name
         from z_area
         where del_flag = '0'
-        <if test="district != null district != ''">
+        <if test="district != null and district != ''">
             and a.district = #{district}
         </if>
     </select>

ruoyi-zdsz/src/main/resources/mapper/zdsz/zdsz/ZBuildingMapper.xml

@@ -21,8 +21,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                name as name
         from z_building
         where del_flag = '0'
-        <if test="areaId != null areaId != ''">
-            and a.area_id = #{areaId}
+        <if test="areaId != null and areaId != ''">
+            and area_id = #{areaId}
         </if>
     </select>
 

ruoyi-zdsz/src/main/resources/mapper/zdsz/zdsz/ZHouseMapper.xml

@@ -18,5 +18,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime" column="update_time"/>
     </resultMap>
 
+    <select id="getPageList" resultType="com.ruoyi.zdsz.domain.vo.ZHouseVo">
+        SELECT
+            zh.*,zt.name unitName,zb.name buildingName,za.name areaName
+        FROM
+            (
+                select a.* from z_house as a
+                <where>
+                    a.del_flag = '0'
+                    <if test="p.areaId != null  and p.areaId != ''">
+                        and a.area_id = #{p.areaId}
+                    </if>
+                    <if test="p.buildingId != null  and p.buildingId != ''">
+                        and a.building_id = #{p.buildingId}
+                    </if>
+                    <if test="p.unitId != null  and p.unitId != ''">
+                        and a.unit_id = #{p.unitId}
+                    </if>
+                </where>
+
+        ) as zh
+                LEFT JOIN z_unit as zt on zh.area_id = zt.id
+                LEFT JOIN z_building as zb on zt.building_id = zb.id
+                LEFT JOIN z_area as za on zb.area_id = za.id
+    </select>
 
 </mapper>

ruoyi-zdsz/src/main/resources/mapper/zdsz/zdsz/ZUnitMapper.xml

@@ -17,5 +17,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime" column="update_time"/>
     </resultMap>
 
+    <select id="getUnitList" resultType="com.ruoyi.zdsz.domain.vo.ZUnitVo">
+        select id as id,
+        name as name
+        from z_unit
+        where del_flag = '0'
+        <if test="buildingId != null and buildingId != ''">
+            and building_id = #{buildingId}
+        </if>
+    </select>
 
 </mapper>