by2025/SmartParks
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks

Browse Source 
# Conflicts:
#	ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbBuildingVo.java
This commit is contained in:
dy
2025-06-30 20:09:22 +08:00
parent b8ccb255d5 86503753bb
commit 1b158eb6ae
165 changed files with 4882 additions and 1290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/PlantsOrderChargeController.java Normal file
View File

@@ -0,0 +1,106 @@
package org.dromara.property.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.property.domain.vo.PlantsOrderChargeVo;
import org.dromara.property.domain.bo.PlantsOrderChargeBo;
import org.dromara.property.service.IPlantsOrderChargeService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
/**
* 绿植租赁-订单收费
* 前端访问路由地址为:/property/orderCharge
*
* @author mocheng
* @date 2025-06-30
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/orderCharge")
public class PlantsOrderChargeController extends BaseController {
private final IPlantsOrderChargeService plantsOrderChargeService;
/**
* 查询绿植租赁-订单收费列表
*/
@SaCheckPermission("property:orderCharge:list")
@GetMapping("/list")
public TableDataInfo<PlantsOrderChargeVo> list(PlantsOrderChargeBo bo, PageQuery pageQuery) {
return plantsOrderChargeService.queryPageList(bo, pageQuery);
}
/**
* 导出绿植租赁-订单收费列表
*/
@SaCheckPermission("property:orderCharge:export")
@Log(title = "绿植租赁-订单收费", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(PlantsOrderChargeBo bo, HttpServletResponse response) {
List<PlantsOrderChargeVo> list = plantsOrderChargeService.queryList(bo);
ExcelUtil.exportExcel(list, "绿植租赁-订单收费", PlantsOrderChargeVo.class, response);
}
/**
* 获取绿植租赁-订单收费详细信息
*
* @param id 主键
*/
@SaCheckPermission("property:orderCharge:query")
@GetMapping("/{id}")
public R<PlantsOrderChargeVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable("id") Long id) {
return R.ok(plantsOrderChargeService.queryById(id));
}
/**
* 新增绿植租赁-订单收费
*/
@SaCheckPermission("property:orderCharge:add")
@Log(title = "绿植租赁-订单收费", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody PlantsOrderChargeBo bo) {
return toAjax(plantsOrderChargeService.insertByBo(bo));
}
/**
* 修改绿植租赁-订单收费
*/
@SaCheckPermission("property:orderCharge:edit")
@Log(title = "绿植租赁-订单收费", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody PlantsOrderChargeBo bo) {
return toAjax(plantsOrderChargeService.updateByBo(bo));
}
/**
* 删除绿植租赁-订单收费
*
* @param ids 主键串
*/
@SaCheckPermission("property:orderCharge:remove")
@Log(title = "绿植租赁-订单收费", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable("ids") Long[] ids) {
return toAjax(plantsOrderChargeService.deleteWithValidByIds(List.of(ids), true));
}
}

106
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/PlantsOrderMaintainController.java Normal file
View File

@@ -0,0 +1,106 @@
package org.dromara.property.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.property.domain.vo.PlantsOrderMaintainVo;
import org.dromara.property.domain.bo.PlantsOrderMaintainBo;
import org.dromara.property.service.IPlantsOrderMaintainService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
/**
* 绿植租赁-订单养护管理
* 前端访问路由地址为:/property/orderMaintain
*
* @author mocheng
* @date 2025-06-30
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/orderMaintain")
public class PlantsOrderMaintainController extends BaseController {
private final IPlantsOrderMaintainService plantsOrderMaintainService;
/**
* 查询绿植租赁-订单养护管理列表
*/
@SaCheckPermission("property:orderMaintain:list")
@GetMapping("/list")
public TableDataInfo<PlantsOrderMaintainVo> list(PlantsOrderMaintainBo bo, PageQuery pageQuery) {
return plantsOrderMaintainService.queryPageList(bo, pageQuery);
}
/**
* 导出绿植租赁-订单养护管理列表
*/
@SaCheckPermission("property:orderMaintain:export")
@Log(title = "绿植租赁-订单养护管理", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(PlantsOrderMaintainBo bo, HttpServletResponse response) {
List<PlantsOrderMaintainVo> list = plantsOrderMaintainService.queryList(bo);
ExcelUtil.exportExcel(list, "绿植租赁-订单养护管理", PlantsOrderMaintainVo.class, response);
}
/**
* 获取绿植租赁-订单养护管理详细信息
*
* @param id 主键
*/
@SaCheckPermission("property:orderMaintain:query")
@GetMapping("/{id}")
public R<PlantsOrderMaintainVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable("id") Long id) {
return R.ok(plantsOrderMaintainService.queryById(id));
}
/**
* 新增绿植租赁-订单养护管理
*/
@SaCheckPermission("property:orderMaintain:add")
@Log(title = "绿植租赁-订单养护管理", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody PlantsOrderMaintainBo bo) {
return toAjax(plantsOrderMaintainService.insertByBo(bo));
}
/**
* 修改绿植租赁-订单养护管理
*/
@SaCheckPermission("property:orderMaintain:edit")
@Log(title = "绿植租赁-订单养护管理", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody PlantsOrderMaintainBo bo) {
return toAjax(plantsOrderMaintainService.updateByBo(bo));
}
/**
* 删除绿植租赁-订单养护管理
*
* @param ids 主键串
*/
@SaCheckPermission("property:orderMaintain:remove")
@Log(title = "绿植租赁-订单养护管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable("ids") Long[] ids) {
return toAjax(plantsOrderMaintainService.deleteWithValidByIds(List.of(ids), true));
}
}

106
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/PlantsRentalOrderController.java Normal file
View File

@@ -0,0 +1,106 @@
package org.dromara.property.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.property.domain.vo.PlantsRentalOrderVo;
import org.dromara.property.domain.bo.PlantsRentalOrderBo;
import org.dromara.property.service.IPlantsRentalOrderService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
/**
* 绿植租赁-订单管理
* 前端访问路由地址为:/property/rentalOrder
*
* @author mocheng
* @date 2025-06-30
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/rentalOrder")
public class PlantsRentalOrderController extends BaseController {
private final IPlantsRentalOrderService plantsRentalOrderService;
/**
* 查询绿植租赁-订单管理列表
*/
@SaCheckPermission("property:rentalOrder:list")
@GetMapping("/list")
public TableDataInfo<PlantsRentalOrderVo> list(PlantsRentalOrderBo bo, PageQuery pageQuery) {
return plantsRentalOrderService.queryPageList(bo, pageQuery);
}
/**
* 导出绿植租赁-订单管理列表
*/
@SaCheckPermission("property:rentalOrder:export")
@Log(title = "绿植租赁-订单管理", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(PlantsRentalOrderBo bo, HttpServletResponse response) {
List<PlantsRentalOrderVo> list = plantsRentalOrderService.queryList(bo);
ExcelUtil.exportExcel(list, "绿植租赁-订单管理", PlantsRentalOrderVo.class, response);
}
/**
* 获取绿植租赁-订单管理详细信息
*
* @param id 主键
*/
@SaCheckPermission("property:rentalOrder:query")
@GetMapping("/{id}")
public R<PlantsRentalOrderVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable("id") Long id) {
return R.ok(plantsRentalOrderService.queryById(id));
}
/**
* 新增绿植租赁-订单管理
*/
@SaCheckPermission("property:rentalOrder:add")
@Log(title = "绿植租赁-订单管理", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody PlantsRentalOrderBo bo) {
return toAjax(plantsRentalOrderService.insertByBo(bo));
}
/**
* 修改绿植租赁-订单管理
*/
@SaCheckPermission("property:rentalOrder:edit")
@Log(title = "绿植租赁-订单管理", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody PlantsRentalOrderBo bo) {
return toAjax(plantsRentalOrderService.updateByBo(bo));
}
/**
* 删除绿植租赁-订单管理
*
* @param ids 主键串
*/
@SaCheckPermission("property:rentalOrder:remove")
@Log(title = "绿植租赁-订单管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable("ids") Long[] ids) {
return toAjax(plantsRentalOrderService.deleteWithValidByIds(List.of(ids), true));
}
}

4
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbCommunityController.java
View File

@@ -62,11 +62,11 @@ public class TbCommunityController extends BaseController {
* @return 树结构数据
*/
@GetMapping("/tree/{level}")
public List<TreeNode<String>> tree(@PathVariable("level") Integer level) {
public R<List<TreeNode<Long>>> tree(@PathVariable("level") Integer level) {
LoginUser loginUser = LoginHelper.getLoginUser();
Assert.notNull(loginUser, "获取账户信息失败!");
Assert.notEmpty(loginUser.getTenantId(), "获取租户信息失败");
return tbCommunityService.tree(level, loginUser.getTenantId());
return R.ok(tbCommunityService.tree(level, loginUser.getTenantId()));
}

93
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/PlantsOrderCharge.java Normal file
View File

@@ -0,0 +1,93 @@
package org.dromara.property.domain;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.io.Serial;
/**
* 绿植租赁-订单收费对象 plants_order_charge
*
* @author mocheng
* @date 2025-06-30
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("plants_order_charge")
public class PlantsOrderCharge extends BaseEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* 主键
*/
@TableId(value = "id")
private Long id;
/**
* 订单id
*/
private Long orderId;
/**
* 租赁人id（系统用户）
*/
private Long userId;
/**
* 租赁人名称
*/
private String userName;
/**
* 租金
*/
private Long rent;
/**
* 押金
*/
private Long deposit;
/**
* 违约金
*/
private Long penalty;
/**
* 总金额
*/
private Long totalAmount;
/**
* 收费日期
*/
private Date chargeDate;
/**
* 支付方式
*/
private Long paymentMethod;
/**
* 开票状态
*/
private Long invoiceStatus;
/**
* 发票类型
*/
private Long invoiceType;
/**
* 收费状态
*/
private Long chargeStatus;
}

108
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/PlantsOrderMaintain.java Normal file
View File

@@ -0,0 +1,108 @@
package org.dromara.property.domain;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.io.Serial;
/**
* 绿植租赁-订单养护管理对象 plants_order_maintain
*
* @author mocheng
* @date 2025-06-30
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("plants_order_maintain")
public class PlantsOrderMaintain extends BaseEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* 主键
*/
@TableId(value = "id")
private Long id;
/**
* 养护名称
*/
private String maintainName;
/**
* 小区id
*/
private Long communityId;
/**
* 建筑id
*/
private Long buildingId;
/**
* 楼层id
*/
private Long floorId;
/**
* 服务类型
*/
private Long serveType;
/**
* 养护周期类型
*/
private Long periodType;
/**
* 养护周期频次
*/
private Long periodFrequency;
/**
* 订单id
*/
private Long orderId;
/**
* 计划执行时间
*/
private Date startTime;
/**
* 计划完成时间
*/
private Date endTime;
/**
* 巡检结果
*/
private Long inspectResult;
/**
* 处理措施
*/
private String measure;
/**
* 客户评分
*/
private Long customerScore;
/**
* 客户反馈
*/
private String customerAdvice;
/**
* 处理状态
*/
private Long state;
}

108
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/PlantsRentalOrder.java Normal file
View File

@@ -0,0 +1,108 @@
package org.dromara.property.domain;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.io.Serial;
/**
* 绿植租赁-订单管理对象 plants_rental_order
*
* @author mocheng
* @date 2025-06-30
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("plants_rental_order")
public class PlantsRentalOrder extends BaseEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* 主键
*/
@TableId(value = "id")
private Long id;
/**
* 订单号
*/
private String orderNo;
/**
* 客户名称
*/
private String customerName;
/**
* 客户类型
*/
private Long customerType;
/**
* 租赁周期
*/
private Long rentalPeriod;
/**
* 租赁开始时间
*/
private Date startTime;
/**
* 租赁结束时间
*/
private Date endTime;
/**
* 应付总额
*/
private Long totalAmount;
/**
* 租赁方式
*/
private Long rentalType;
/**
* 租赁方案id
*/
private Long planId;
/**
* 绿植产品id
*/
private Long productId;
/**
* 租赁产品数量
*/
private Long productNum;
/**
* 支付状态
*/
private Long paymentStatus;
/**
* 是否续租
*/
private Long isRelet;
/**
* 合同状态
*/
private Long contractStatus;
/**
* 签署时间
*/
private Date signTime;
}

5
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/SysCityArea.java
View File

@@ -62,9 +62,4 @@ public class SysCityArea implements Serializable {
*/
private String lat;
/**
* 数据状态：1有效，0无效
*/
private Long dataState;
}

102
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbBuilding.java
View File

@@ -1,19 +1,19 @@
package org.dromara.property.domain;
import org.dromara.common.tenant.core.TenantEntity;
import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.common.tenant.core.TenantEntity;
import java.io.Serial;
import java.util.Date;
/**
* 建筑对象 tb_building
*
* @author mocheng
* @date 2025-06-26
* @date 2025-06-28
*/
@Data
@EqualsAndHashCode(callSuper = true)
@@ -32,52 +32,32 @@ public class TbBuilding extends TenantEntity {
/**
* 园区编码
*/
private String communityCode;
/**
* 建筑编码
*/
private String buildingCode;
private Long communityId;
/**
* 建筑名称
*/
private String buildingName;
/**
* 省
*/
private String province;
/**
* 市
*/
private String city;
/**
* 区
*/
private String district;
/**
* 总层数
*/
private Long floorCount;
private Integer floorCount;
/**
* 单元数
*/
private Long unitCount;
private Integer unitCount;
/**
* 建筑类型('1：住宅','2：商业','3:混合')
*/
private Long buildType;
private Integer buildType;
/**
* 电梯数量
*/
private Long elevatorCount;
private Integer elevatorCount;
/**
* 竣工日期
@@ -99,70 +79,10 @@ public class TbBuilding extends TenantEntity {
*/
private String lat;
/**
* 产权性质(1:自持，2：承租，3：自持+承租,4：政府免费使用)
*/
private Long cqxz;
/**
* 不动产编号
*/
private String bdcbh;
/**
* 产权编号
*/
private String cqbh;
/**
* 图地编号
*/
private String tdbh;
/**
* 建筑面积
*/
private Long jzmj;
/**
* 产权面积
*/
private Long cqmj;
/**
* 可租面积
*/
private Long kzmj;
/**
* 自用面积
*/
private Long zymj;
/**
* 配套面积
*/
private Long ptmj;
/**
* 车位面积
*/
private Long cwmj;
/**
* 标准层高
*/
private Long bzcg;
/**
* 排序字段
*/
private Long sort;
/**
* 修改时间
*/
private Date modifyTime;
private Integer sort;
}

23
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbCommunity.java
View File

@@ -1,19 +1,19 @@
package org.dromara.property.domain;
import org.dromara.common.tenant.core.TenantEntity;
import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.common.tenant.core.TenantEntity;
import java.io.Serial;
import java.util.Date;
/**
* 小区对象 tb_community
*
* @author mocheng
* @date 2025-06-26
* @date 2025-06-28
*/
@Data
@EqualsAndHashCode(callSuper = true)
@@ -34,15 +34,14 @@ public class TbCommunity extends TenantEntity {
*/
private String communityName;
/**
* 社区编码
*/
private String communityCode;
/**
* 社区类型 1：园区，2：小区
*/
private Long communityType;
private Integer communityType;
private String cityFullCode;
private String cityFullName;
/**
* 省
@@ -77,7 +76,7 @@ public class TbCommunity extends TenantEntity {
/**
* 占地面积(平方米)
*/
private Long area;
private Float area;
/**
*

23
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbFloor.java
View File

@@ -11,7 +11,7 @@ import java.io.Serial;
* 楼层对象 tb_floor
*
* @author mocheng
* @date 2025-06-26
* @date 2025-06-28
*/
@Data
@EqualsAndHashCode(callSuper = true)
@@ -28,14 +28,19 @@ public class TbFloor extends TenantEntity {
private Long id;
/**
* 单元编码
* 园区id
*/
private String unitCode;
private Long communityId;
/**
* 楼层编码
* 建筑id
*/
private String floorCode;
private Long buildingId;
/**
* 单元编码
*/
private Long unitId;
/**
* 楼层数名称
@@ -45,22 +50,22 @@ public class TbFloor extends TenantEntity {
/**
* 楼层号
*/
private Long floorNumber;
private Integer floorNumber;
/**
* 楼层类型
*/
private Long floorType;
private Integer floorType;
/**
* 房间数量
*/
private Long roomCount;
private Integer roomCount;
/**
* 层高
*/
private Long floorHeight;
private Integer floorHeight;
}

39
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbRoom.java
View File

@@ -1,9 +1,10 @@
package org.dromara.property.domain;
import org.dromara.common.tenant.core.TenantEntity;
import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.dromara.common.tenant.core.TenantEntity;
import java.io.Serial;
@@ -11,7 +12,7 @@ import java.io.Serial;
* 房间信息对象 tb_room
*
* @author mocheng
* @date 2025-06-26
* @date 2025-06-28
*/
@Data
@EqualsAndHashCode(callSuper = true)
@@ -21,21 +22,29 @@ public class TbRoom extends TenantEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
*
*/
@TableId(value = "id")
private Long id;
/**
* 所属楼层ID
* 园区id
*/
private String floorCode;
private Long communityId;
/**
* 房间编码
* 建筑id
*/
private String roomCode;
private Long buildingId;
/**
* 单元编码
*/
private Long unitId;
/**
* 所属楼层ID
*/
private Long floorId;
/**
* 房间号(如101,202)
@@ -45,12 +54,12 @@ public class TbRoom extends TenantEntity {
/**
* 房间类型('住宅','商铺','办公室','设备间','公共区域')
*/
private Long roomType;
private Integer roomType;
/**
* 面积(平方米)
*/
private Long area;
private Float area;
/**
* 户型(如2室1厅1卫)
@@ -60,17 +69,17 @@ public class TbRoom extends TenantEntity {
/**
* 朝向('东','南','西','北','东南','东北','西南','西北')
*/
private Long orientation;
private Integer orientation;
/**
* 是否可售
*/
private Long isForSale;
private Integer isForSale;
/**
* 状态（'空置','已售','已租','自用'）
*/
private Long status;
private Integer status;
}

16
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbUnit.java
View File

@@ -11,7 +11,7 @@ import java.io.Serial;
* 单元对象 tb_unit
*
* @author mocheng
* @date 2025-06-26
* @date 2025-06-28
*/
@Data
@EqualsAndHashCode(callSuper = true)
@@ -28,14 +28,14 @@ public class TbUnit extends TenantEntity {
private Long id;
/**
* 建筑名称
* 园区id
*/
private String buildingCode;
private Long communityId;
/**
* 单元编码
* 建筑id
*/
private String unitCode;
private Long buildingId;
/**
* 单元名称
@@ -45,17 +45,17 @@ public class TbUnit extends TenantEntity {
/**
* 单元层数
*/
private Long floorCount;
private Integer floorCount;
/**
* 单元户数
*/
private Long householdCount;
private Integer householdCount;
/**
* 楼梯数量
*/
private Long stairCount;
private Integer stairCount;
}

13
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TdFactory.java
View File

@@ -22,7 +22,7 @@ public class TdFactory extends TenantEntity {
private static final long serialVersionUID = 1L;
/**
*
*
*/
@TableId(value = "id")
private Long id;
@@ -42,15 +42,4 @@ public class TdFactory extends TenantEntity {
*/
private String remark;
/**
* 数据状态：1有效，0无效
*/
private Long dataState;
/**
* 搜索值
*/
private String searchValue;
}

103
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/PlantsOrderChargeBo.java Normal file
View File

@@ -0,0 +1,103 @@
package org.dromara.property.domain.bo;
import org.dromara.property.domain.PlantsOrderCharge;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
/**
* 绿植租赁-订单收费业务对象 plants_order_charge
*
* @author mocheng
* @date 2025-06-30
*/
@Data
@EqualsAndHashCode(callSuper = true)
@AutoMapper(target = PlantsOrderCharge.class, reverseConvertGenerate = false)
public class PlantsOrderChargeBo extends BaseEntity {
/**
* 主键
*/
private Long id;
/**
* 订单id
*/
@NotNull(message = "订单id不能为空", groups = { AddGroup.class, EditGroup.class })
private Long orderId;
/**
* 租赁人id（系统用户）
*/
@NotNull(message = "租赁人id（系统用户）不能为空", groups = { AddGroup.class, EditGroup.class })
private Long userId;
/**
* 租赁人名称
*/
@NotBlank(message = "租赁人名称不能为空", groups = { AddGroup.class, EditGroup.class })
private String userName;
/**
* 租金
*/
@NotNull(message = "租金不能为空", groups = { AddGroup.class, EditGroup.class })
private Long rent;
/**
* 押金
*/
@NotNull(message = "押金不能为空", groups = { AddGroup.class, EditGroup.class })
private Long deposit;
/**
* 违约金
*/
@NotNull(message = "违约金不能为空", groups = { AddGroup.class, EditGroup.class })
private Long penalty;
/**
* 总金额
*/
@NotNull(message = "总金额不能为空", groups = { AddGroup.class, EditGroup.class })
private Long totalAmount;
/**
* 收费日期
*/
@NotNull(message = "收费日期不能为空", groups = { AddGroup.class, EditGroup.class })
private Date chargeDate;
/**
* 支付方式
*/
@NotNull(message = "支付方式不能为空", groups = { AddGroup.class, EditGroup.class })
private Long paymentMethod;
/**
* 开票状态
*/
@NotNull(message = "开票状态不能为空", groups = { AddGroup.class, EditGroup.class })
private Long invoiceStatus;
/**
* 发票类型
*/
@NotNull(message = "发票类型不能为空", groups = { AddGroup.class, EditGroup.class })
private Long invoiceType;
/**
* 收费状态
*/
@NotNull(message = "收费状态不能为空", groups = { AddGroup.class, EditGroup.class })
private Long chargeStatus;
}

116
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/PlantsOrderMaintainBo.java Normal file
View File

@@ -0,0 +1,116 @@
package org.dromara.property.domain.bo;
import org.dromara.property.domain.PlantsOrderMaintain;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
/**
* 绿植租赁-订单养护管理业务对象 plants_order_maintain
*
* @author mocheng
* @date 2025-06-30
*/
@Data
@EqualsAndHashCode(callSuper = true)
@AutoMapper(target = PlantsOrderMaintain.class, reverseConvertGenerate = false)
public class PlantsOrderMaintainBo extends BaseEntity {
/**
* 主键
*/
private Long id;
/**
* 养护名称
*/
@NotBlank(message = "养护名称不能为空", groups = { AddGroup.class, EditGroup.class })
private String maintainName;
/**
* 小区id
*/
@NotNull(message = "小区id不能为空", groups = { AddGroup.class, EditGroup.class })
private Long communityId;
/**
* 建筑id
*/
@NotNull(message = "建筑id不能为空", groups = { AddGroup.class, EditGroup.class })
private Long buildingId;
/**
* 楼层id
*/
@NotNull(message = "楼层id不能为空", groups = { AddGroup.class, EditGroup.class })
private Long floorId;
/**
* 服务类型
*/
@NotNull(message = "服务类型不能为空", groups = { AddGroup.class, EditGroup.class })
private Long serveType;
/**
* 养护周期类型
*/
@NotNull(message = "养护周期类型不能为空", groups = { AddGroup.class, EditGroup.class })
private Long periodType;
/**
* 养护周期频次
*/
@NotNull(message = "养护周期频次不能为空", groups = { AddGroup.class, EditGroup.class })
private Long periodFrequency;
/**
* 订单id
*/
@NotNull(message = "订单id不能为空", groups = { AddGroup.class, EditGroup.class })
private Long orderId;
/**
* 计划执行时间
*/
@NotNull(message = "计划执行时间不能为空", groups = { AddGroup.class, EditGroup.class })
private Date startTime;
/**
* 计划完成时间
*/
@NotNull(message = "计划完成时间不能为空", groups = { AddGroup.class, EditGroup.class })
private Date endTime;
/**
* 巡检结果
*/
private Long inspectResult;
/**
* 处理措施
*/
private String measure;
/**
* 客户评分
*/
private Long customerScore;
/**
* 客户反馈
*/
private String customerAdvice;
/**
* 处理状态
*/
private Long state;
}

115
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/PlantsRentalOrderBo.java Normal file
View File

@@ -0,0 +1,115 @@
package org.dromara.property.domain.bo;
import org.dromara.property.domain.PlantsRentalOrder;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
/**
* 绿植租赁-订单管理业务对象 plants_rental_order
*
* @author mocheng
* @date 2025-06-30
*/
@Data
@EqualsAndHashCode(callSuper = true)
@AutoMapper(target = PlantsRentalOrder.class, reverseConvertGenerate = false)
public class PlantsRentalOrderBo extends BaseEntity {
/**
* 主键
*/
private Long id;
/**
* 订单号
*/
@NotBlank(message = "订单号不能为空", groups = { AddGroup.class, EditGroup.class })
private String orderNo;
/**
* 客户名称
*/
@NotBlank(message = "客户名称不能为空", groups = { AddGroup.class, EditGroup.class })
private String customerName;
/**
* 客户类型
*/
@NotNull(message = "客户类型不能为空", groups = { AddGroup.class, EditGroup.class })
private Long customerType;
/**
* 租赁周期
*/
@NotNull(message = "租赁周期不能为空", groups = { AddGroup.class, EditGroup.class })
private Long rentalPeriod;
/**
* 租赁开始时间
*/
@NotNull(message = "租赁开始时间不能为空", groups = { AddGroup.class, EditGroup.class })
private Date startTime;
/**
* 租赁结束时间
*/
@NotNull(message = "租赁结束时间不能为空", groups = { AddGroup.class, EditGroup.class })
private Date endTime;
/**
* 应付总额
*/
@NotNull(message = "应付总额不能为空", groups = { AddGroup.class, EditGroup.class })
private Long totalAmount;
/**
* 租赁方式
*/
@NotNull(message = "租赁方式不能为空", groups = { AddGroup.class, EditGroup.class })
private Long rentalType;
/**
* 租赁方案id
*/
private Long planId;
/**
* 绿植产品id
*/
private Long productId;
/**
* 租赁产品数量
*/
private Long productNum;
/**
* 支付状态
*/
@NotNull(message = "支付状态不能为空", groups = { AddGroup.class, EditGroup.class })
private Long paymentStatus;
/**
* 是否续租
*/
private Long isRelet;
/**
* 合同状态
*/
private Long contractStatus;
/**
* 签署时间
*/
private Date signTime;
}

6
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/SysCityAreaBo.java
View File

@@ -70,11 +70,5 @@ public class SysCityAreaBo extends BaseEntity {
@NotBlank(message = "维度不能为空", groups = { AddGroup.class, EditGroup.class })
private String lat;
/**
* 数据状态：1有效，0无效
*/
@NotNull(message = "数据状态：1有效，0无效不能为空", groups = { AddGroup.class, EditGroup.class })
private Long dataState;
}

126
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbBuildingBo.java
View File

@@ -1,21 +1,22 @@
package org.dromara.property.domain.bo;
import org.dromara.property.domain.TbBuilding;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.property.domain.TbBuilding;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
/**
* 建筑业务对象 tb_building
*
* @author mocheng
* @date 2025-06-26
* @date 2025-06-28
*/
@Data
@EqualsAndHashCode(callSuper = true)
@@ -25,64 +26,40 @@ public class TbBuildingBo extends BaseEntity {
/**
*
*/
@NotNull(message = "不能为空", groups = { EditGroup.class })
@NotNull(message = "不能为空", groups = {EditGroup.class})
private Long id;
/**
* 园区编码
*/
@NotBlank(message = "园区编码不能为空", groups = { AddGroup.class, EditGroup.class })
private String communityCode;
/**
* 建筑编码
*/
@NotBlank(message = "建筑编码不能为空", groups = { AddGroup.class, EditGroup.class })
private String buildingCode;
@NotNull(message = "园区id不能为空", groups = {AddGroup.class, EditGroup.class})
private Long communityId;
/**
* 建筑名称
*/
@NotBlank(message = "建筑名称不能为空", groups = { AddGroup.class, EditGroup.class })
@NotBlank(message = "建筑名称不能为空", groups = {AddGroup.class, EditGroup.class})
private String buildingName;
/**
* 省
*/
@NotBlank(message = "省不能为空", groups = { AddGroup.class, EditGroup.class })
private String province;
/**
* 市
*/
@NotBlank(message = "市不能为空", groups = { AddGroup.class, EditGroup.class })
private String city;
/**
* 区
*/
@NotBlank(message = "区不能为空", groups = { AddGroup.class, EditGroup.class })
private String district;
/**
* 总层数
*/
private Long floorCount;
private Integer floorCount;
/**
* 单元数
*/
private Long unitCount;
private Integer unitCount;
/**
* 建筑类型('1：住宅','2：商业','3:混合')
*/
private Long buildType;
private Integer buildType;
/**
* 电梯数量
*/
private Long elevatorCount;
private Integer elevatorCount;
/**
* 竣工日期
@@ -92,87 +69,24 @@ public class TbBuildingBo extends BaseEntity {
/**
* 地址
*/
@NotBlank(message = "地址不能为空", groups = { AddGroup.class, EditGroup.class })
@NotBlank(message = "地址不能为空", groups = {AddGroup.class, EditGroup.class})
private String addr;
/**
* 经度
*/
@NotBlank(message = "经度不能为空", groups = { AddGroup.class, EditGroup.class })
@NotBlank(message = "经度不能为空", groups = {AddGroup.class, EditGroup.class})
private String lon;
/**
* 维度
*/
@NotBlank(message = "维度不能为空", groups = { AddGroup.class, EditGroup.class })
@NotBlank(message = "维度不能为空", groups = {AddGroup.class, EditGroup.class})
private String lat;
/**
* 产权性质(1:自持，2：承租，3：自持+承租,4：政府免费使用)
*/
private Long cqxz;
/**
* 不动产编号
*/
private String bdcbh;
/**
* 产权编号
*/
private String cqbh;
/**
* 图地编号
*/
private String tdbh;
/**
* 建筑面积
*/
@NotNull(message = "建筑面积不能为空", groups = { AddGroup.class, EditGroup.class })
private Long jzmj;
/**
* 产权面积
*/
@NotNull(message = "产权面积不能为空", groups = { AddGroup.class, EditGroup.class })
private Long cqmj;
/**
* 可租面积
*/
private Long kzmj;
/**
* 自用面积
*/
private Long zymj;
/**
* 配套面积
*/
private Long ptmj;
/**
* 车位面积
*/
private Long cwmj;
/**
* 标准层高
*/
private Long bzcg;
/**
* 排序字段
*/
private Long sort;
/**
* 修改时间
*/
private Date modifyTime;
private Integer sort;
}

43
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbCommunityBo.java
View File

@@ -1,21 +1,22 @@
package org.dromara.property.domain.bo;
import org.dromara.property.domain.TbCommunity;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.property.domain.TbCommunity;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
/**
* 小区业务对象 tb_community
*
* @author mocheng
* @date 2025-06-26
* @date 2025-06-28
*/
@Data
@EqualsAndHashCode(callSuper = true)
@@ -25,61 +26,57 @@ public class TbCommunityBo extends BaseEntity {
/**
*
*/
@NotNull(message = "不能为空", groups = { EditGroup.class })
@NotNull(message = "不能为空", groups = {EditGroup.class})
private Long id;
/**
* 社区名称
*/
@NotBlank(message = "社区名称不能为空", groups = { AddGroup.class, EditGroup.class })
@NotBlank(message = "社区名称不能为空", groups = {AddGroup.class, EditGroup.class})
private String communityName;
/**
* 社区编码
*/
@NotBlank(message = "社区编码不能为空", groups = { AddGroup.class, EditGroup.class })
private String communityCode;
/**
* 社区类型 1：园区，2：小区
*/
@NotNull(message = "社区类型 1：园区，2：小区不能为空", groups = { AddGroup.class, EditGroup.class })
private Long communityType;
@NotNull(message = "社区类型 1：园区，2：小区不能为空", groups = {AddGroup.class, EditGroup.class})
private Integer communityType;
@NotBlank(message = "城市不能为null", groups = {AddGroup.class, EditGroup.class})
private String cityFullCode;
private String cityFullName;
/**
* 省
*/
@NotBlank(message = "省不能为空", groups = { AddGroup.class, EditGroup.class })
private String province;
/**
* 市
*/
@NotBlank(message = "市不能为空", groups = { AddGroup.class, EditGroup.class })
private String city;
/**
* 区
*/
@NotBlank(message = "区不能为空", groups = { AddGroup.class, EditGroup.class })
private String district;
/**
* 地址
*/
@NotBlank(message = "地址不能为空", groups = { AddGroup.class, EditGroup.class })
@NotBlank(message = "地址不能为空", groups = {AddGroup.class, EditGroup.class})
private String addr;
/**
* 经度
*/
@NotBlank(message = "经度不能为空", groups = { AddGroup.class, EditGroup.class })
@NotBlank(message = "经度不能为空", groups = {AddGroup.class, EditGroup.class})
private String lon;
/**
* 维度
*/
@NotBlank(message = "维度不能为空", groups = { AddGroup.class, EditGroup.class })
@NotBlank(message = "维度不能为空", groups = {AddGroup.class, EditGroup.class})
private String lat;
/**

20
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbFloorBo.java
View File

@@ -13,7 +13,7 @@ import jakarta.validation.constraints.*;
* 楼层业务对象 tb_floor
*
* @author mocheng
* @date 2025-06-26
* @date 2025-06-28
*/
@Data
@EqualsAndHashCode(callSuper = true)
@@ -29,14 +29,8 @@ public class TbFloorBo extends BaseEntity {
/**
* 单元编码
*/
@NotBlank(message = "单元编码不能为空", groups = { AddGroup.class, EditGroup.class })
private String unitCode;
/**
* 楼层编码
*/
@NotNull(message = "楼层编码不能为空", groups = { AddGroup.class, EditGroup.class })
private String floorCode;
@NotNull(message = "单元编码不能为空", groups = { AddGroup.class, EditGroup.class })
private Long unitId;
/**
* 楼层数名称
@@ -48,22 +42,22 @@ public class TbFloorBo extends BaseEntity {
* 楼层号
*/
@NotNull(message = "楼层号不能为空", groups = { AddGroup.class, EditGroup.class })
private Long floorNumber;
private Integer floorNumber;
/**
* 楼层类型
*/
private Long floorType;
private Integer floorType;
/**
* 房间数量
*/
private Long roomCount;
private Integer roomCount;
/**
* 层高
*/
private Long floorHeight;
private Integer floorHeight;
}

23
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbRoomBo.java
View File

@@ -13,7 +13,7 @@ import jakarta.validation.constraints.*;
* 房间信息业务对象 tb_room
*
* @author mocheng
* @date 2025-06-26
* @date 2025-06-28
*/
@Data
@EqualsAndHashCode(callSuper = true)
@@ -21,7 +21,7 @@ import jakarta.validation.constraints.*;
public class TbRoomBo extends BaseEntity {
/**
*
*
*/
@NotNull(message = "不能为空", groups = { EditGroup.class })
private Long id;
@@ -29,13 +29,8 @@ public class TbRoomBo extends BaseEntity {
/**
* 所属楼层ID
*/
@NotBlank(message = "所属楼层ID不能为空", groups = { AddGroup.class, EditGroup.class })
private String floorCode;
/**
* 房间编码
*/
private String roomCode;
@NotNull(message = "所属楼层ID不能为空", groups = { AddGroup.class, EditGroup.class })
private Long floorId;
/**
* 房间号(如101,202)
@@ -46,12 +41,12 @@ public class TbRoomBo extends BaseEntity {
/**
* 房间类型('住宅','商铺','办公室','设备间','公共区域')
*/
private Long roomType;
private Integer roomType;
/**
* 面积(平方米)
*/
private Long area;
private Float area;
/**
* 户型(如2室1厅1卫)
@@ -61,17 +56,17 @@ public class TbRoomBo extends BaseEntity {
/**
* 朝向('东','南','西','北','东南','东北','西南','西北')
*/
private Long orientation;
private Integer orientation;
/**
* 是否可售
*/
private Long isForSale;
private Integer isForSale;
/**
* 状态（'空置','已售','已租','自用'）
*/
private Long status;
private Integer status;
}

18
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbUnitBo.java
View File

@@ -13,7 +13,7 @@ import jakarta.validation.constraints.*;
* 单元业务对象 tb_unit
*
* @author mocheng
* @date 2025-06-26
* @date 2025-06-28
*/
@Data
@EqualsAndHashCode(callSuper = true)
@@ -29,14 +29,8 @@ public class TbUnitBo extends BaseEntity {
/**
* 建筑名称
*/
@NotBlank(message = "建筑名称不能为空", groups = { AddGroup.class, EditGroup.class })
private String buildingCode;
/**
* 单元编码
*/
@NotBlank(message = "单元编码不能为空", groups = { AddGroup.class, EditGroup.class })
private String unitCode;
@NotNull(message = "建筑名称不能为空", groups = { AddGroup.class, EditGroup.class })
private Long buildingId;
/**
* 单元名称
@@ -47,17 +41,17 @@ public class TbUnitBo extends BaseEntity {
/**
* 单元层数
*/
private Long floorCount;
private Integer floorCount;
/**
* 单元户数
*/
private Long householdCount;
private Integer householdCount;
/**
* 楼梯数量
*/
private Long stairCount;
private Integer stairCount;
}

13
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TdFactoryBo.java
View File

@@ -21,7 +21,7 @@ import jakarta.validation.constraints.*;
public class TdFactoryBo extends BaseEntity {
/**
*
*
*/
@NotNull(message = "不能为空", groups = { EditGroup.class })
private Long id;
@@ -43,16 +43,5 @@ public class TdFactoryBo extends BaseEntity {
*/
private String remark;
/**
* 数据状态：1有效，0无效
*/
@NotNull(message = "数据状态：1有效，0无效不能为空", groups = { AddGroup.class, EditGroup.class })
private Long dataState;
/**
* 搜索值
*/
private String searchValue;
}

3
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/convert/SysCityAreaCovert.java
View File

@@ -2,6 +2,7 @@ package org.dromara.property.domain.convert;
import org.dromara.property.domain.SysCityArea;
import org.dromara.property.domain.vo.CityAreaTreeVo;
import org.dromara.property.domain.vo.SysCityAreaVo;
import org.mapstruct.Mapper;
import org.mapstruct.MappingConstants;
import org.mapstruct.ReportingPolicy;
@@ -21,4 +22,6 @@ public interface SysCityAreaCovert {
List<CityAreaTreeVo> entity2Vo(List<SysCityArea> cityAreas);
List<CityAreaTreeVo> vo2TreeVo(List<SysCityAreaVo> cityAreas);
}

3
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CityAreaTreeVo.java
View File

@@ -1,11 +1,14 @@
package org.dromara.property.domain.vo;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.dromara.common.core.domain.TreeEntity;
import org.dromara.property.domain.SysCityArea;
import java.util.List;
@Data
@AutoMapper(target = SysCityArea.class)
public class CityAreaTreeVo implements TreeEntity<CityAreaTreeVo, String> {
/**

116
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/PlantsOrderChargeVo.java Normal file
View File

@@ -0,0 +1,116 @@
package org.dromara.property.domain.vo;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.property.domain.PlantsOrderCharge;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* 绿植租赁-订单收费视图对象 plants_order_charge
*
* @author mocheng
* @date 2025-06-30
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = PlantsOrderCharge.class)
public class PlantsOrderChargeVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 主键
*/
@ExcelProperty(value = "主键")
private Long id;
/**
* 订单id
*/
@ExcelProperty(value = "订单id")
private Long orderId;
/**
* 租赁人id（系统用户）
*/
@ExcelProperty(value = "租赁人id", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "系=统用户")
private Long userId;
/**
* 租赁人名称
*/
@ExcelProperty(value = "租赁人名称")
private String userName;
/**
* 租金
*/
@ExcelProperty(value = "租金")
private Long rent;
/**
* 押金
*/
@ExcelProperty(value = "押金")
private Long deposit;
/**
* 违约金
*/
@ExcelProperty(value = "违约金")
private Long penalty;
/**
* 总金额
*/
@ExcelProperty(value = "总金额")
private Long totalAmount;
/**
* 收费日期
*/
@ExcelProperty(value = "收费日期")
private Date chargeDate;
/**
* 支付方式
*/
@ExcelProperty(value = "支付方式", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "pro_payment_method")
private Long paymentMethod;
/**
* 开票状态
*/
@ExcelProperty(value = "开票状态", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "pro_invoice_status")
private Long invoiceStatus;
/**
* 发票类型
*/
@ExcelProperty(value = "发票类型")
private Long invoiceType;
/**
* 收费状态
*/
@ExcelProperty(value = "收费状态", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "pro_charging_status")
private Long chargeStatus;
}

131
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/PlantsOrderMaintainVo.java Normal file
View File

@@ -0,0 +1,131 @@
package org.dromara.property.domain.vo;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.property.domain.PlantsOrderMaintain;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* 绿植租赁-订单养护管理视图对象 plants_order_maintain
*
* @author mocheng
* @date 2025-06-30
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = PlantsOrderMaintain.class)
public class PlantsOrderMaintainVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 主键
*/
@ExcelProperty(value = "主键")
private Long id;
/**
* 养护名称
*/
@ExcelProperty(value = "养护名称")
private String maintainName;
/**
* 小区id
*/
@ExcelProperty(value = "小区id")
private Long communityId;
/**
* 建筑id
*/
@ExcelProperty(value = "建筑id")
private Long buildingId;
/**
* 楼层id
*/
@ExcelProperty(value = "楼层id")
private Long floorId;
/**
* 服务类型
*/
@ExcelProperty(value = "服务类型")
private Long serveType;
/**
* 养护周期类型
*/
@ExcelProperty(value = "养护周期类型", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "wy_time_unit")
private Long periodType;
/**
* 养护周期频次
*/
@ExcelProperty(value = "养护周期频次")
private Long periodFrequency;
/**
* 订单id
*/
@ExcelProperty(value = "订单id")
private Long orderId;
/**
* 计划执行时间
*/
@ExcelProperty(value = "计划执行时间")
private Date startTime;
/**
* 计划完成时间
*/
@ExcelProperty(value = "计划完成时间")
private Date endTime;
/**
* 巡检结果
*/
@ExcelProperty(value = "巡检结果")
private Long inspectResult;
/**
* 处理措施
*/
@ExcelProperty(value = "处理措施")
private String measure;
/**
* 客户评分
*/
@ExcelProperty(value = "客户评分")
private Long customerScore;
/**
* 客户反馈
*/
@ExcelProperty(value = "客户反馈")
private String customerAdvice;
/**
* 处理状态
*/
@ExcelProperty(value = "处理状态")
private Long state;
}

132
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/PlantsRentalOrderVo.java Normal file
View File

@@ -0,0 +1,132 @@
package org.dromara.property.domain.vo;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.property.domain.PlantsRentalOrder;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* 绿植租赁-订单管理视图对象 plants_rental_order
*
* @author mocheng
* @date 2025-06-30
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = PlantsRentalOrder.class)
public class PlantsRentalOrderVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 主键
*/
@ExcelProperty(value = "主键")
private Long id;
/**
* 订单号
*/
@ExcelProperty(value = "订单号")
private String orderNo;
/**
* 客户名称
*/
@ExcelProperty(value = "客户名称")
private String customerName;
/**
* 客户类型
*/
@ExcelProperty(value = "客户类型", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "wy_khlx")
private Long customerType;
/**
* 租赁周期
*/
@ExcelProperty(value = "租赁周期", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "wy_time_unit")
private Long rentalPeriod;
/**
* 租赁开始时间
*/
@ExcelProperty(value = "租赁开始时间")
private Date startTime;
/**
* 租赁结束时间
*/
@ExcelProperty(value = "租赁结束时间")
private Date endTime;
/**
* 应付总额
*/
@ExcelProperty(value = "应付总额")
private Long totalAmount;
/**
* 租赁方式
*/
@ExcelProperty(value = "租赁方式")
private Long rentalType;
/**
* 租赁方案id
*/
@ExcelProperty(value = "租赁方案id")
private Long planId;
/**
* 绿植产品id
*/
@ExcelProperty(value = "绿植产品id")
private Long productId;
/**
* 租赁产品数量
*/
@ExcelProperty(value = "租赁产品数量")
private Long productNum;
/**
* 支付状态
*/
@ExcelProperty(value = "支付状态")
private Long paymentStatus;
/**
* 是否续租
*/
@ExcelProperty(value = "是否续租")
private Long isRelet;
/**
* 合同状态
*/
@ExcelProperty(value = "合同状态")
private Long contractStatus;
/**
* 签署时间
*/
@ExcelProperty(value = "签署时间")
private Date signTime;
}

7
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/SysCityAreaVo.java
View File

@@ -77,11 +77,4 @@ public class SysCityAreaVo implements Serializable {
@ExcelProperty(value = "维度")
private String lat;
/**
* 数据状态：1有效，0无效
*/
@ExcelProperty(value = "数据状态：1有效，0无效")
private Long dataState;
}

124
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbBuildingVo.java
View File

@@ -1,26 +1,23 @@
package org.dromara.property.domain.vo;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.property.domain.TbBuilding;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.dromara.common.translation.annotation.Translation;
import org.dromara.common.translation.constant.TransConstant;
import org.dromara.property.domain.TbBuilding;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* 建筑视图对象 tb_building
*
* @author mocheng
* @date 2025-06-26
* @date 2025-06-28
*/
@Data
@ExcelIgnoreUnannotated
@@ -30,23 +27,14 @@ public class TbBuildingVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
*
*/
@ExcelProperty(value = "")
@ExcelProperty(value = "主键id")
private Long id;
/**
* 园区编码
*/
@ExcelProperty(value = "园区编码")
private String communityCode;
/**
* 建筑编码
*/
@ExcelProperty(value = "建筑编码")
private String buildingCode;
private Long communityId;
/**
* 建筑名称
@@ -54,24 +42,6 @@ public class TbBuildingVo implements Serializable {
@ExcelProperty(value = "建筑名称")
private String buildingName;
/**
* 省
*/
@ExcelProperty(value = "省")
private String province;
/**
* 市
*/
@ExcelProperty(value = "市")
private String city;
/**
* 区
*/
@ExcelProperty(value = "区")
private String district;
/**
* 总层数
*/
@@ -82,19 +52,22 @@ public class TbBuildingVo implements Serializable {
* 单元数
*/
@ExcelProperty(value = "单元数")
private Long unitCount;
private Integer unitCount;
/**
* 建筑类型('1：住宅','2：商业','3:混合')
*/
@ExcelProperty(value = "建筑类型('1：住宅','2：商业','3:混合')")
private Long buildType;
private Integer buildType;
@Translation(type = TransConstant.DICT_TYPE_TO_LABEL, mapper = "buildType", other = "sis_build_use_type")
private String buildTypeName;
/**
* 电梯数量
*/
@ExcelProperty(value = "电梯数量")
private Long elevatorCount;
private Integer elevatorCount;
/**
* 竣工日期
@@ -120,83 +93,10 @@ public class TbBuildingVo implements Serializable {
@ExcelProperty(value = "维度")
private String lat;
/**
* 产权性质(1:自持，2：承租，3：自持+承租,4：政府免费使用)
*/
@ExcelProperty(value = "产权性质(1:自持，2：承租，3：自持+承租,4：政府免费使用)")
private Long cqxz;
/**
* 不动产编号
*/
@ExcelProperty(value = "不动产编号")
private String bdcbh;
/**
* 产权编号
*/
@ExcelProperty(value = "产权编号")
private String cqbh;
/**
* 图地编号
*/
@ExcelProperty(value = "图地编号")
private String tdbh;
/**
* 建筑面积
*/
@ExcelProperty(value = "建筑面积")
private Long jzmj;
/**
* 产权面积
*/
@ExcelProperty(value = "产权面积")
private Long cqmj;
/**
* 可租面积
*/
@ExcelProperty(value = "可租面积")
private Long kzmj;
/**
* 自用面积
*/
@ExcelProperty(value = "自用面积")
private Long zymj;
/**
* 配套面积
*/
@ExcelProperty(value = "配套面积")
private Long ptmj;
/**
* 车位面积
*/
@ExcelProperty(value = "车位面积")
private Long cwmj;
/**
* 标准层高
*/
@ExcelProperty(value = "标准层高")
private Long bzcg;
/**
* 排序字段
*/
@ExcelProperty(value = "排序字段")
private Long sort;
/**
* 修改时间
*/
@ExcelProperty(value = "修改时间")
private Date modifyTime;
}

19
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbCommunityVo.java
View File

@@ -1,26 +1,21 @@
package org.dromara.property.domain.vo;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.property.domain.TbCommunity;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.dromara.property.domain.TbCommunity;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* 小区视图对象 tb_community
*
* @author mocheng
* @date 2025-06-26
* @date 2025-06-28
*/
@Data
@ExcelIgnoreUnannotated
@@ -42,18 +37,16 @@ public class TbCommunityVo implements Serializable {
@ExcelProperty(value = "社区名称")
private String communityName;
/**
* 社区编码
*/
@ExcelProperty(value = "社区编码")
private String communityCode;
/**
* 社区类型 1：园区，2：小区
*/
@ExcelProperty(value = "社区类型 1：园区，2：小区")
private Long communityType;
private String cityFullCode;
private String cityFullName;
/**
* 省
*/

27
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbFloorVo.java
View File

@@ -18,7 +18,7 @@ import java.util.Date;
* 楼层视图对象 tb_floor
*
* @author mocheng
* @date 2025-06-26
* @date 2025-06-28
*/
@Data
@ExcelIgnoreUnannotated
@@ -34,17 +34,22 @@ public class TbFloorVo implements Serializable {
@ExcelProperty(value = "")
private Long id;
/**
* 社区id
*/
private Long communityId;
/**
* 建筑名称
*/
@ExcelProperty(value = "建筑名称")
private Long buildingId;
/**
* 单元编码
*/
@ExcelProperty(value = "单元编码")
private String unitCode;
/**
* 楼层编码
*/
@ExcelProperty(value = "楼层编码")
private String floorCode;
private Long unitId;
/**
* 楼层数名称
@@ -62,19 +67,19 @@ public class TbFloorVo implements Serializable {
* 楼层类型
*/
@ExcelProperty(value = "楼层类型")
private Long floorType;
private Integer floorType;
/**
* 房间数量
*/
@ExcelProperty(value = "房间数量")
private Long roomCount;
private Integer roomCount;
/**
* 层高
*/
@ExcelProperty(value = "层高")
private Long floorHeight;
private Integer floorHeight;
}

56
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbRoomVo.java
View File

@@ -1,24 +1,24 @@
package org.dromara.property.domain.vo;
import org.dromara.property.domain.TbRoom;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import org.dromara.common.translation.annotation.Translation;
import org.dromara.common.translation.constant.TransConstant;
import org.dromara.property.domain.TbRoom;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* 房间信息视图对象 tb_room
*
* @author mocheng
* @date 2025-06-26
* @date 2025-06-28
*/
@Data
@ExcelIgnoreUnannotated
@@ -29,22 +29,33 @@ public class TbRoomVo implements Serializable {
private static final long serialVersionUID = 1L;
/**
*
*
*/
@ExcelProperty(value = "")
private Long id;
/**
* 社区id
*/
private Long communityId;
/**
* 建筑名称
*/
@ExcelProperty(value = "建筑名称")
private Long buildingId;
/**
* 单元编码
*/
@ExcelProperty(value = "单元编码")
private Long unitId;
/**
* 所属楼层ID
*/
@ExcelProperty(value = "所属楼层ID")
private String floorCode;
/**
* 房间编码
*/
@ExcelProperty(value = "房间编码")
private String roomCode;
private Long floorId;
/**
* 房间号(如101,202)
@@ -56,7 +67,10 @@ public class TbRoomVo implements Serializable {
* 房间类型('住宅','商铺','办公室','设备间','公共区域')
*/
@ExcelProperty(value = "房间类型('住宅','商铺','办公室','设备间','公共区域')")
private Long roomType;
private Integer roomType;
@Translation(type = TransConstant.DICT_TYPE_TO_LABEL, mapper = "roomType", other = "room_type")
private String roomTypeName;
/**
* 面积(平方米)
@@ -73,21 +87,27 @@ public class TbRoomVo implements Serializable {
/**
* 朝向('东','南','西','北','东南','东北','西南','西北')
*/
@ExcelProperty(value = "朝向('东','南','西','北','东南','东北','西南','西北')")
private Long orientation;
private Integer orientation;
@Translation(type = TransConstant.DICT_TYPE_TO_LABEL, mapper = "orientation", other = "direction_towards")
private Integer orientationName;
/**
* 是否可售
*/
@ExcelProperty(value = "是否可售")
private Long isForSale;
private Integer isForSale;
/**
* 状态（'空置','已售','已租','自用'）
*/
@ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "'=空置','已售','已租','自用'")
private Long status;
private Integer status;
@Translation(type = TransConstant.DICT_TYPE_TO_LABEL, mapper = "status", other = "wy_fjzt")
private String statusName;
}

18
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbUnitVo.java
View File

@@ -18,7 +18,7 @@ import java.util.Date;
* 单元视图对象 tb_unit
*
* @author mocheng
* @date 2025-06-26
* @date 2025-06-28
*/
@Data
@ExcelIgnoreUnannotated
@@ -34,17 +34,13 @@ public class TbUnitVo implements Serializable {
@ExcelProperty(value = "主键id")
private Long id;
private Long communityId;
/**
* 建筑名称
*/
@ExcelProperty(value = "建筑名称")
private String buildingCode;
/**
* 单元编码
*/
@ExcelProperty(value = "单元编码")
private String unitCode;
private Long buildingId;
/**
* 单元名称
@@ -56,19 +52,19 @@ public class TbUnitVo implements Serializable {
* 单元层数
*/
@ExcelProperty(value = "单元层数")
private Long floorCount;
private Integer floorCount;
/**
* 单元户数
*/
@ExcelProperty(value = "单元户数")
private Long householdCount;
private Integer householdCount;
/**
* 楼梯数量
*/
@ExcelProperty(value = "楼梯数量")
private Long stairCount;
private Integer stairCount;
}

16
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbVisitorManagementVo.java
View File

@@ -1,6 +1,9 @@
package org.dromara.property.domain.vo;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.property.domain.TbVisitorManagement;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
@@ -116,5 +119,18 @@ public class TbVisitorManagementVo implements Serializable {
@ExcelDictFormat(dictType = "wy_appointment_tatus")
private Long serveStatus;
/**
* 创建时间
*/
@ExcelProperty(value = "创建时间")
private Date createTime;
/**
* 更新时间
*/
@ExcelProperty(value = "更新时间")
private Date updateTime;
}

14
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TdFactoryVo.java
View File

@@ -29,7 +29,7 @@ public class TdFactoryVo implements Serializable {
private static final long serialVersionUID = 1L;
/**
*
*
*/
@ExcelProperty(value = "")
private Long id;
@@ -52,17 +52,5 @@ public class TdFactoryVo implements Serializable {
@ExcelProperty(value = "备注")
private String remark;
/**
* 数据状态：1有效，0无效
*/
@ExcelProperty(value = "数据状态：1有效，0无效")
private Long dataState;
/**
* 搜索值
*/
@ExcelProperty(value = "搜索值")
private String searchValue;
}

104
ruoyi-modules/Property/src/main/java/org/dromara/property/dubbo/RemoteFloorServiceImpl.java Normal file
View File

@@ -0,0 +1,104 @@
package org.dromara.property.dubbo;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.annotation.DubboService;
import org.dromara.common.core.domain.TreeNode;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.property.api.RemoteFloorService;
import org.dromara.property.api.domain.vo.RemoteFloorVo;
import org.dromara.property.domain.vo.TbBuildingVo;
import org.dromara.property.domain.vo.TbCommunityVo;
import org.dromara.property.domain.vo.TbFloorVo;
import org.dromara.property.domain.vo.TbUnitVo;
import org.dromara.property.service.ITbBuildingService;
import org.dromara.property.service.ITbCommunityService;
import org.dromara.property.service.ITbFloorService;
import org.dromara.property.service.ITbUnitService;
import java.util.ArrayList;
import java.util.List;
/**
* 楼层服务远程调用实现
*
* @author lxj
*/
@Slf4j
@RequiredArgsConstructor
@DubboService
public class RemoteFloorServiceImpl implements RemoteFloorService {
private final ITbCommunityService tbCommunityService;
private final ITbBuildingService tbBuildingService;
private final ITbUnitService unitService;
private final ITbFloorService floorService;
@Override
public RemoteFloorVo queryByFloorId(Long floorId) {
TbFloorVo tbFloorVo = floorService.queryById(floorId);
return MapstructUtils.convert(tbFloorVo, RemoteFloorVo.class);
}
@Override
public List<TreeNode<Long>> queryTreeList() {
List<TreeNode<Long>> treeList = new ArrayList<>();
List<TbCommunityVo> tbCommunityVos = tbCommunityService.queryAll();
if (tbCommunityVos == null || tbCommunityVos.isEmpty()) {
return treeList;
}
List<TreeNode<Long>> l1 = tbCommunityVos.stream().map(item -> {
TreeNode<Long> node = new TreeNode<>();
node.setLevel(1);
node.setCode(item.getId());
node.setParentCode(0L);
node.setLabel(item.getCommunityName());
return node;
}).toList();
treeList.addAll(l1);
List<TbBuildingVo> tbBuildingVos = tbBuildingService.queryAll();
if (tbBuildingVos == null || tbBuildingVos.isEmpty()) {
return treeList;
}
List<TreeNode<Long>> l2 = tbBuildingVos.stream().map(item -> {
TreeNode<Long> node = new TreeNode<>();
node.setLevel(2);
node.setCode(item.getId());
node.setParentCode(item.getCommunityId());
node.setLabel(item.getBuildingName());
return node;
}).toList();
treeList.addAll(l2);
List<TbUnitVo> tbUnitVos = unitService.queryAll();
if (tbUnitVos == null || tbUnitVos.isEmpty()) {
return treeList;
}
List<TreeNode<Long>> l3 = tbUnitVos.stream().map(item -> {
TreeNode<Long> node = new TreeNode<>();
node.setLevel(3);
node.setCode(item.getId());
node.setParentCode(item.getBuildingId());
node.setLabel(item.getUnitName());
return node;
}).toList();
treeList.addAll(l3);
List<TbFloorVo> tbFloorVos = floorService.queryAll();
if (tbFloorVos == null || tbFloorVos.isEmpty()) {
return treeList;
}
List<TreeNode<Long>> l4 = tbFloorVos.stream().map(item -> {
TreeNode<Long> node = new TreeNode<>();
node.setLevel(4);
node.setCode(item.getId());
node.setParentCode(item.getUnitId());
node.setLabel(item.getFloorName());
return node;
}).toList();
treeList.addAll(l4);
return treeList;
}
}

15
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/PlantsOrderChargeMapper.java Normal file
View File

@@ -0,0 +1,15 @@
package org.dromara.property.mapper;
import org.dromara.property.domain.PlantsOrderCharge;
import org.dromara.property.domain.vo.PlantsOrderChargeVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**
* 绿植租赁-订单收费Mapper接口
*
* @author mocheng
* @date 2025-06-30
*/
public interface PlantsOrderChargeMapper extends BaseMapperPlus<PlantsOrderCharge, PlantsOrderChargeVo> {
}

15
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/PlantsOrderMaintainMapper.java Normal file
View File

@@ -0,0 +1,15 @@
package org.dromara.property.mapper;
import org.dromara.property.domain.PlantsOrderMaintain;
import org.dromara.property.domain.vo.PlantsOrderMaintainVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**
* 绿植租赁-订单养护管理Mapper接口
*
* @author mocheng
* @date 2025-06-30
*/
public interface PlantsOrderMaintainMapper extends BaseMapperPlus<PlantsOrderMaintain, PlantsOrderMaintainVo> {
}

15
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/PlantsRentalOrderMapper.java Normal file
View File

@@ -0,0 +1,15 @@
package org.dromara.property.mapper;
import org.dromara.property.domain.PlantsRentalOrder;
import org.dromara.property.domain.vo.PlantsRentalOrderVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**
* 绿植租赁-订单管理Mapper接口
*
* @author mocheng
* @date 2025-06-30
*/
public interface PlantsRentalOrderMapper extends BaseMapperPlus<PlantsRentalOrder, PlantsRentalOrderVo> {
}

13
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/SysCityAreaMapper.java
View File

@@ -1,16 +1,23 @@
package org.dromara.property.mapper;
import org.dromara.property.domain.SysCityArea;
import org.dromara.property.domain.vo.SysCityAreaVo;
import org.apache.ibatis.annotations.Select;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.property.domain.SysCityArea;
import org.dromara.property.domain.vo.CityAreaTreeVo;
import org.dromara.property.domain.vo.SysCityAreaVo;
import java.util.List;
/**
* 行政区划
Mapper接口
* Mapper接口
*
* @author mocheng
* @date 2025-06-18
*/
public interface SysCityAreaMapper extends BaseMapperPlus<SysCityArea, SysCityAreaVo> {
@Select("select * from sys_city_area")
List<CityAreaTreeVo> seleAll();
}

69
ruoyi-modules/Property/src/main/java/org/dromara/property/service/IPlantsOrderChargeService.java Normal file
View File

@@ -0,0 +1,69 @@
package org.dromara.property.service;
import org.dromara.property.domain.PlantsOrderCharge;
import org.dromara.property.domain.vo.PlantsOrderChargeVo;
import org.dromara.property.domain.bo.PlantsOrderChargeBo;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import java.util.Collection;
import java.util.List;
/**
* 绿植租赁-订单收费Service接口
*
* @author mocheng
* @date 2025-06-30
*/
public interface IPlantsOrderChargeService {
/**
* 查询绿植租赁-订单收费
*
* @param id 主键
* @return 绿植租赁-订单收费
*/
PlantsOrderChargeVo queryById(Long id);
/**
* 分页查询绿植租赁-订单收费列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 绿植租赁-订单收费分页列表
*/
TableDataInfo<PlantsOrderChargeVo> queryPageList(PlantsOrderChargeBo bo, PageQuery pageQuery);
/**
* 查询符合条件的绿植租赁-订单收费列表
*
* @param bo 查询条件
* @return 绿植租赁-订单收费列表
*/
List<PlantsOrderChargeVo> queryList(PlantsOrderChargeBo bo);
/**
* 新增绿植租赁-订单收费
*
* @param bo 绿植租赁-订单收费
* @return 是否新增成功
*/
Boolean insertByBo(PlantsOrderChargeBo bo);
/**
* 修改绿植租赁-订单收费
*
* @param bo 绿植租赁-订单收费
* @return 是否修改成功
*/
Boolean updateByBo(PlantsOrderChargeBo bo);
/**
* 校验并批量删除绿植租赁-订单收费信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

69
ruoyi-modules/Property/src/main/java/org/dromara/property/service/IPlantsOrderMaintainService.java Normal file
View File

@@ -0,0 +1,69 @@
package org.dromara.property.service;
import org.dromara.property.domain.PlantsOrderMaintain;
import org.dromara.property.domain.vo.PlantsOrderMaintainVo;
import org.dromara.property.domain.bo.PlantsOrderMaintainBo;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import java.util.Collection;
import java.util.List;
/**
* 绿植租赁-订单养护管理Service接口
*
* @author mocheng
* @date 2025-06-30
*/
public interface IPlantsOrderMaintainService {
/**
* 查询绿植租赁-订单养护管理
*
* @param id 主键
* @return 绿植租赁-订单养护管理
*/
PlantsOrderMaintainVo queryById(Long id);
/**
* 分页查询绿植租赁-订单养护管理列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 绿植租赁-订单养护管理分页列表
*/
TableDataInfo<PlantsOrderMaintainVo> queryPageList(PlantsOrderMaintainBo bo, PageQuery pageQuery);
/**
* 查询符合条件的绿植租赁-订单养护管理列表
*
* @param bo 查询条件
* @return 绿植租赁-订单养护管理列表
*/
List<PlantsOrderMaintainVo> queryList(PlantsOrderMaintainBo bo);
/**
* 新增绿植租赁-订单养护管理
*
* @param bo 绿植租赁-订单养护管理
* @return 是否新增成功
*/
Boolean insertByBo(PlantsOrderMaintainBo bo);
/**
* 修改绿植租赁-订单养护管理
*
* @param bo 绿植租赁-订单养护管理
* @return 是否修改成功
*/
Boolean updateByBo(PlantsOrderMaintainBo bo);
/**
* 校验并批量删除绿植租赁-订单养护管理信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

69
ruoyi-modules/Property/src/main/java/org/dromara/property/service/IPlantsRentalOrderService.java Normal file
View File

@@ -0,0 +1,69 @@
package org.dromara.property.service;
import org.dromara.property.domain.PlantsRentalOrder;
import org.dromara.property.domain.vo.PlantsRentalOrderVo;
import org.dromara.property.domain.bo.PlantsRentalOrderBo;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import java.util.Collection;
import java.util.List;
/**
* 绿植租赁-订单管理Service接口
*
* @author mocheng
* @date 2025-06-30
*/
public interface IPlantsRentalOrderService {
/**
* 查询绿植租赁-订单管理
*
* @param id 主键
* @return 绿植租赁-订单管理
*/
PlantsRentalOrderVo queryById(Long id);
/**
* 分页查询绿植租赁-订单管理列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 绿植租赁-订单管理分页列表
*/
TableDataInfo<PlantsRentalOrderVo> queryPageList(PlantsRentalOrderBo bo, PageQuery pageQuery);
/**
* 查询符合条件的绿植租赁-订单管理列表
*
* @param bo 查询条件
* @return 绿植租赁-订单管理列表
*/
List<PlantsRentalOrderVo> queryList(PlantsRentalOrderBo bo);
/**
* 新增绿植租赁-订单管理
*
* @param bo 绿植租赁-订单管理
* @return 是否新增成功
*/
Boolean insertByBo(PlantsRentalOrderBo bo);
/**
* 修改绿植租赁-订单管理
*
* @param bo 绿植租赁-订单管理
* @return 是否修改成功
*/
Boolean updateByBo(PlantsRentalOrderBo bo);
/**
* 校验并批量删除绿植租赁-订单管理信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

8
ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbBuildingService.java
View File

@@ -66,10 +66,6 @@ public interface ITbBuildingService {
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
/**
* 加载当前租户下的所有建筑
* @param tenantId 租户编码
* @return 返回建筑列表
*/
List<TbBuildingVo> queryByTenantId(String tenantId);
List<TbBuildingVo> queryAll();
}

12
ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbCommunityService.java
View File

@@ -25,13 +25,8 @@ public interface ITbCommunityService {
*/
TbCommunityVo queryById(Long id);
/**
* 查询小区列表
*
* @param tenantId 租户编码
* @return 小区
*/
List<TbCommunityVo> queryByTenantId(String tenantId);
List<TbCommunityVo> queryAll();
/**
* 分页查询小区列表
@@ -77,9 +72,10 @@ public interface ITbCommunityService {
/**
* 加载社区树结构
*
* @param level 加载等级
* @return 树结构
*/
List<TreeNode<String>> tree(Integer level,String tenantId);
List<TreeNode<Long>> tree(Integer level, String tenantId);
}

4
ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbFloorService.java
View File

@@ -67,5 +67,7 @@ public interface ITbFloorService {
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
List<TbFloorVo> queryByTenantId(String tenantId);
List<TbFloorVo> queryAll();
}

3
ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbRoomService.java
View File

@@ -68,5 +68,6 @@ public interface ITbRoomService {
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
List<TbRoomVo> queryByTenantId(String tenantId);
List<TbRoomVo> queryAll();
}

3
ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbUnitService.java
View File

@@ -66,6 +66,7 @@ public interface ITbUnitService {
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
List<TbUnitVo> queryByTenantId(String tenantId);
List<TbUnitVo> queryAll();
}

143
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/PlantsOrderChargeServiceImpl.java Normal file
View File

@@ -0,0 +1,143 @@
package org.dromara.property.service.impl;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.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 lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.dromara.property.domain.bo.PlantsOrderChargeBo;
import org.dromara.property.domain.vo.PlantsOrderChargeVo;
import org.dromara.property.domain.PlantsOrderCharge;
import org.dromara.property.mapper.PlantsOrderChargeMapper;
import org.dromara.property.service.IPlantsOrderChargeService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 绿植租赁-订单收费Service业务层处理
*
* @author mocheng
* @date 2025-06-30
*/
@Slf4j
@RequiredArgsConstructor
@Service
public class PlantsOrderChargeServiceImpl implements IPlantsOrderChargeService {
private final PlantsOrderChargeMapper baseMapper;
/**
* 查询绿植租赁-订单收费
*
* @param id 主键
* @return 绿植租赁-订单收费
*/
@Override
public PlantsOrderChargeVo queryById(Long id){
return baseMapper.selectVoById(id);
}
/**
* 分页查询绿植租赁-订单收费列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 绿植租赁-订单收费分页列表
*/
@Override
public TableDataInfo<PlantsOrderChargeVo> queryPageList(PlantsOrderChargeBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<PlantsOrderCharge> lqw = buildQueryWrapper(bo);
Page<PlantsOrderChargeVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询符合条件的绿植租赁-订单收费列表
*
* @param bo 查询条件
* @return 绿植租赁-订单收费列表
*/
@Override
public List<PlantsOrderChargeVo> queryList(PlantsOrderChargeBo bo) {
LambdaQueryWrapper<PlantsOrderCharge> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<PlantsOrderCharge> buildQueryWrapper(PlantsOrderChargeBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<PlantsOrderCharge> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(PlantsOrderCharge::getId);
lqw.eq(bo.getOrderId() != null, PlantsOrderCharge::getOrderId, bo.getOrderId());
lqw.eq(bo.getUserId() != null, PlantsOrderCharge::getUserId, bo.getUserId());
lqw.like(StringUtils.isNotBlank(bo.getUserName()), PlantsOrderCharge::getUserName, bo.getUserName());
lqw.eq(bo.getRent() != null, PlantsOrderCharge::getRent, bo.getRent());
lqw.eq(bo.getDeposit() != null, PlantsOrderCharge::getDeposit, bo.getDeposit());
lqw.eq(bo.getPenalty() != null, PlantsOrderCharge::getPenalty, bo.getPenalty());
lqw.eq(bo.getTotalAmount() != null, PlantsOrderCharge::getTotalAmount, bo.getTotalAmount());
lqw.eq(bo.getChargeDate() != null, PlantsOrderCharge::getChargeDate, bo.getChargeDate());
lqw.eq(bo.getPaymentMethod() != null, PlantsOrderCharge::getPaymentMethod, bo.getPaymentMethod());
lqw.eq(bo.getInvoiceStatus() != null, PlantsOrderCharge::getInvoiceStatus, bo.getInvoiceStatus());
lqw.eq(bo.getInvoiceType() != null, PlantsOrderCharge::getInvoiceType, bo.getInvoiceType());
lqw.eq(bo.getChargeStatus() != null, PlantsOrderCharge::getChargeStatus, bo.getChargeStatus());
return lqw;
}
/**
* 新增绿植租赁-订单收费
*
* @param bo 绿植租赁-订单收费
* @return 是否新增成功
*/
@Override
public Boolean insertByBo(PlantsOrderChargeBo bo) {
PlantsOrderCharge add = MapstructUtils.convert(bo, PlantsOrderCharge.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());
}
return flag;
}
/**
* 修改绿植租赁-订单收费
*
* @param bo 绿植租赁-订单收费
* @return 是否修改成功
*/
@Override
public Boolean updateByBo(PlantsOrderChargeBo bo) {
PlantsOrderCharge update = MapstructUtils.convert(bo, PlantsOrderCharge.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(PlantsOrderCharge entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 校验并批量删除绿植租赁-订单收费信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;
}
}

146
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/PlantsOrderMaintainServiceImpl.java Normal file
View File

@@ -0,0 +1,146 @@
package org.dromara.property.service.impl;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.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 lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.dromara.property.domain.bo.PlantsOrderMaintainBo;
import org.dromara.property.domain.vo.PlantsOrderMaintainVo;
import org.dromara.property.domain.PlantsOrderMaintain;
import org.dromara.property.mapper.PlantsOrderMaintainMapper;
import org.dromara.property.service.IPlantsOrderMaintainService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 绿植租赁-订单养护管理Service业务层处理
*
* @author mocheng
* @date 2025-06-30
*/
@Slf4j
@RequiredArgsConstructor
@Service
public class PlantsOrderMaintainServiceImpl implements IPlantsOrderMaintainService {
private final PlantsOrderMaintainMapper baseMapper;
/**
* 查询绿植租赁-订单养护管理
*
* @param id 主键
* @return 绿植租赁-订单养护管理
*/
@Override
public PlantsOrderMaintainVo queryById(Long id){
return baseMapper.selectVoById(id);
}
/**
* 分页查询绿植租赁-订单养护管理列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 绿植租赁-订单养护管理分页列表
*/
@Override
public TableDataInfo<PlantsOrderMaintainVo> queryPageList(PlantsOrderMaintainBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<PlantsOrderMaintain> lqw = buildQueryWrapper(bo);
Page<PlantsOrderMaintainVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询符合条件的绿植租赁-订单养护管理列表
*
* @param bo 查询条件
* @return 绿植租赁-订单养护管理列表
*/
@Override
public List<PlantsOrderMaintainVo> queryList(PlantsOrderMaintainBo bo) {
LambdaQueryWrapper<PlantsOrderMaintain> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<PlantsOrderMaintain> buildQueryWrapper(PlantsOrderMaintainBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<PlantsOrderMaintain> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(PlantsOrderMaintain::getId);
lqw.like(StringUtils.isNotBlank(bo.getMaintainName()), PlantsOrderMaintain::getMaintainName, bo.getMaintainName());
lqw.eq(bo.getCommunityId() != null, PlantsOrderMaintain::getCommunityId, bo.getCommunityId());
lqw.eq(bo.getBuildingId() != null, PlantsOrderMaintain::getBuildingId, bo.getBuildingId());
lqw.eq(bo.getFloorId() != null, PlantsOrderMaintain::getFloorId, bo.getFloorId());
lqw.eq(bo.getServeType() != null, PlantsOrderMaintain::getServeType, bo.getServeType());
lqw.eq(bo.getPeriodType() != null, PlantsOrderMaintain::getPeriodType, bo.getPeriodType());
lqw.eq(bo.getPeriodFrequency() != null, PlantsOrderMaintain::getPeriodFrequency, bo.getPeriodFrequency());
lqw.eq(bo.getOrderId() != null, PlantsOrderMaintain::getOrderId, bo.getOrderId());
lqw.eq(bo.getStartTime() != null, PlantsOrderMaintain::getStartTime, bo.getStartTime());
lqw.eq(bo.getEndTime() != null, PlantsOrderMaintain::getEndTime, bo.getEndTime());
lqw.eq(bo.getInspectResult() != null, PlantsOrderMaintain::getInspectResult, bo.getInspectResult());
lqw.eq(StringUtils.isNotBlank(bo.getMeasure()), PlantsOrderMaintain::getMeasure, bo.getMeasure());
lqw.eq(bo.getCustomerScore() != null, PlantsOrderMaintain::getCustomerScore, bo.getCustomerScore());
lqw.eq(StringUtils.isNotBlank(bo.getCustomerAdvice()), PlantsOrderMaintain::getCustomerAdvice, bo.getCustomerAdvice());
lqw.eq(bo.getState() != null, PlantsOrderMaintain::getState, bo.getState());
return lqw;
}
/**
* 新增绿植租赁-订单养护管理
*
* @param bo 绿植租赁-订单养护管理
* @return 是否新增成功
*/
@Override
public Boolean insertByBo(PlantsOrderMaintainBo bo) {
PlantsOrderMaintain add = MapstructUtils.convert(bo, PlantsOrderMaintain.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());
}
return flag;
}
/**
* 修改绿植租赁-订单养护管理
*
* @param bo 绿植租赁-订单养护管理
* @return 是否修改成功
*/
@Override
public Boolean updateByBo(PlantsOrderMaintainBo bo) {
PlantsOrderMaintain update = MapstructUtils.convert(bo, PlantsOrderMaintain.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(PlantsOrderMaintain entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 校验并批量删除绿植租赁-订单养护管理信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;
}
}

146
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/PlantsRentalOrderServiceImpl.java Normal file
View File

@@ -0,0 +1,146 @@
package org.dromara.property.service.impl;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.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 lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.dromara.property.domain.bo.PlantsRentalOrderBo;
import org.dromara.property.domain.vo.PlantsRentalOrderVo;
import org.dromara.property.domain.PlantsRentalOrder;
import org.dromara.property.mapper.PlantsRentalOrderMapper;
import org.dromara.property.service.IPlantsRentalOrderService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 绿植租赁-订单管理Service业务层处理
*
* @author mocheng
* @date 2025-06-30
*/
@Slf4j
@RequiredArgsConstructor
@Service
public class PlantsRentalOrderServiceImpl implements IPlantsRentalOrderService {
private final PlantsRentalOrderMapper baseMapper;
/**
* 查询绿植租赁-订单管理
*
* @param id 主键
* @return 绿植租赁-订单管理
*/
@Override
public PlantsRentalOrderVo queryById(Long id){
return baseMapper.selectVoById(id);
}
/**
* 分页查询绿植租赁-订单管理列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 绿植租赁-订单管理分页列表
*/
@Override
public TableDataInfo<PlantsRentalOrderVo> queryPageList(PlantsRentalOrderBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<PlantsRentalOrder> lqw = buildQueryWrapper(bo);
Page<PlantsRentalOrderVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询符合条件的绿植租赁-订单管理列表
*
* @param bo 查询条件
* @return 绿植租赁-订单管理列表
*/
@Override
public List<PlantsRentalOrderVo> queryList(PlantsRentalOrderBo bo) {
LambdaQueryWrapper<PlantsRentalOrder> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<PlantsRentalOrder> buildQueryWrapper(PlantsRentalOrderBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<PlantsRentalOrder> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(PlantsRentalOrder::getId);
lqw.eq(StringUtils.isNotBlank(bo.getOrderNo()), PlantsRentalOrder::getOrderNo, bo.getOrderNo());
lqw.like(StringUtils.isNotBlank(bo.getCustomerName()), PlantsRentalOrder::getCustomerName, bo.getCustomerName());
lqw.eq(bo.getCustomerType() != null, PlantsRentalOrder::getCustomerType, bo.getCustomerType());
lqw.eq(bo.getRentalPeriod() != null, PlantsRentalOrder::getRentalPeriod, bo.getRentalPeriod());
lqw.eq(bo.getStartTime() != null, PlantsRentalOrder::getStartTime, bo.getStartTime());
lqw.eq(bo.getEndTime() != null, PlantsRentalOrder::getEndTime, bo.getEndTime());
lqw.eq(bo.getTotalAmount() != null, PlantsRentalOrder::getTotalAmount, bo.getTotalAmount());
lqw.eq(bo.getRentalType() != null, PlantsRentalOrder::getRentalType, bo.getRentalType());
lqw.eq(bo.getPlanId() != null, PlantsRentalOrder::getPlanId, bo.getPlanId());
lqw.eq(bo.getProductId() != null, PlantsRentalOrder::getProductId, bo.getProductId());
lqw.eq(bo.getProductNum() != null, PlantsRentalOrder::getProductNum, bo.getProductNum());
lqw.eq(bo.getPaymentStatus() != null, PlantsRentalOrder::getPaymentStatus, bo.getPaymentStatus());
lqw.eq(bo.getIsRelet() != null, PlantsRentalOrder::getIsRelet, bo.getIsRelet());
lqw.eq(bo.getContractStatus() != null, PlantsRentalOrder::getContractStatus, bo.getContractStatus());
lqw.eq(bo.getSignTime() != null, PlantsRentalOrder::getSignTime, bo.getSignTime());
return lqw;
}
/**
* 新增绿植租赁-订单管理
*
* @param bo 绿植租赁-订单管理
* @return 是否新增成功
*/
@Override
public Boolean insertByBo(PlantsRentalOrderBo bo) {
PlantsRentalOrder add = MapstructUtils.convert(bo, PlantsRentalOrder.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());
}
return flag;
}
/**
* 修改绿植租赁-订单管理
*
* @param bo 绿植租赁-订单管理
* @return 是否修改成功
*/
@Override
public Boolean updateByBo(PlantsRentalOrderBo bo) {
PlantsRentalOrder update = MapstructUtils.convert(bo, PlantsRentalOrder.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(PlantsRentalOrder entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 校验并批量删除绿植租赁-订单管理信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;
}
}

8
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/SysCityAreaServiceImpl.java
View File

@@ -91,7 +91,6 @@ public class SysCityAreaServiceImpl implements ISysCityAreaService {
lqw.like(StringUtils.isNotBlank(bo.getParentAreaName()), SysCityArea::getParentAreaName, bo.getParentAreaName());
lqw.eq(StringUtils.isNotBlank(bo.getLon()), SysCityArea::getLon, bo.getLon());
lqw.eq(StringUtils.isNotBlank(bo.getLat()), SysCityArea::getLat, bo.getLat());
lqw.eq(bo.getDataState() != null, SysCityArea::getDataState, bo.getDataState());
return lqw;
}
@@ -150,12 +149,7 @@ public class SysCityAreaServiceImpl implements ISysCityAreaService {
@Override
public List<CityAreaTreeVo> queryTreeList() {
// 查询所有的行政区划数据
List<SysCityArea> cityAreas = baseMapper.selectList(null);
if (CollectionUtil.isEmpty(cityAreas)) {
return new ArrayList<>();
}
List<CityAreaTreeVo> vo = SysCityAreaCovert.INSTANCE.entity2Vo(cityAreas);
List<CityAreaTreeVo> vo = baseMapper.seleAll();
return TreeUtils.build(vo, "0");
}
}

32
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbBuildingServiceImpl.java
View File

@@ -1,5 +1,6 @@
package org.dromara.property.service.impl;
import cn.hutool.core.lang.Assert;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -12,7 +13,9 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.property.domain.TbBuilding;
import org.dromara.property.domain.bo.TbBuildingBo;
import org.dromara.property.domain.vo.TbBuildingVo;
import org.dromara.property.domain.vo.TbCommunityVo;
import org.dromara.property.mapper.TbBuildingMapper;
import org.dromara.property.mapper.TbCommunityMapper;
import org.dromara.property.service.ITbBuildingService;
import org.springframework.stereotype.Service;
@@ -32,6 +35,7 @@ import java.util.Map;
public class TbBuildingServiceImpl implements ITbBuildingService {
private final TbBuildingMapper baseMapper;
private final TbCommunityMapper communityMapper;
/**
* 查询建筑
@@ -74,12 +78,8 @@ public class TbBuildingServiceImpl implements ITbBuildingService {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<TbBuilding> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(TbBuilding::getId);
lqw.eq(StringUtils.isNotBlank(bo.getCommunityCode()), TbBuilding::getCommunityCode, bo.getCommunityCode());
lqw.eq(StringUtils.isNotBlank(bo.getBuildingCode()), TbBuilding::getBuildingCode, bo.getBuildingCode());
lqw.eq(bo.getCommunityId() != null, TbBuilding::getCommunityId, bo.getCommunityId());
lqw.like(StringUtils.isNotBlank(bo.getBuildingName()), TbBuilding::getBuildingName, bo.getBuildingName());
lqw.eq(StringUtils.isNotBlank(bo.getProvince()), TbBuilding::getProvince, bo.getProvince());
lqw.eq(StringUtils.isNotBlank(bo.getCity()), TbBuilding::getCity, bo.getCity());
lqw.eq(StringUtils.isNotBlank(bo.getDistrict()), TbBuilding::getDistrict, bo.getDistrict());
lqw.eq(bo.getFloorCount() != null, TbBuilding::getFloorCount, bo.getFloorCount());
lqw.eq(bo.getUnitCount() != null, TbBuilding::getUnitCount, bo.getUnitCount());
lqw.eq(bo.getBuildType() != null, TbBuilding::getBuildType, bo.getBuildType());
@@ -88,19 +88,7 @@ public class TbBuildingServiceImpl implements ITbBuildingService {
lqw.eq(StringUtils.isNotBlank(bo.getAddr()), TbBuilding::getAddr, bo.getAddr());
lqw.eq(StringUtils.isNotBlank(bo.getLon()), TbBuilding::getLon, bo.getLon());
lqw.eq(StringUtils.isNotBlank(bo.getLat()), TbBuilding::getLat, bo.getLat());
lqw.eq(bo.getCqxz() != null, TbBuilding::getCqxz, bo.getCqxz());
lqw.eq(StringUtils.isNotBlank(bo.getBdcbh()), TbBuilding::getBdcbh, bo.getBdcbh());
lqw.eq(StringUtils.isNotBlank(bo.getCqbh()), TbBuilding::getCqbh, bo.getCqbh());
lqw.eq(StringUtils.isNotBlank(bo.getTdbh()), TbBuilding::getTdbh, bo.getTdbh());
lqw.eq(bo.getJzmj() != null, TbBuilding::getJzmj, bo.getJzmj());
lqw.eq(bo.getCqmj() != null, TbBuilding::getCqmj, bo.getCqmj());
lqw.eq(bo.getKzmj() != null, TbBuilding::getKzmj, bo.getKzmj());
lqw.eq(bo.getZymj() != null, TbBuilding::getZymj, bo.getZymj());
lqw.eq(bo.getPtmj() != null, TbBuilding::getPtmj, bo.getPtmj());
lqw.eq(bo.getCwmj() != null, TbBuilding::getCwmj, bo.getCwmj());
lqw.eq(bo.getBzcg() != null, TbBuilding::getBzcg, bo.getBzcg());
lqw.eq(bo.getSort() != null, TbBuilding::getSort, bo.getSort());
lqw.eq(bo.getModifyTime() != null, TbBuilding::getModifyTime, bo.getModifyTime());
return lqw;
}
@@ -112,6 +100,9 @@ public class TbBuildingServiceImpl implements ITbBuildingService {
*/
@Override
public Boolean insertByBo(TbBuildingBo bo) {
// 检验社区是否存在
TbCommunityVo tbCommunityVo = communityMapper.selectVoById(bo.getCommunityId());
Assert.notNull(tbCommunityVo, "社区:{},不存在。", bo.getCommunityId());
TbBuilding add = MapstructUtils.convert(bo, TbBuilding.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
@@ -156,10 +147,9 @@ public class TbBuildingServiceImpl implements ITbBuildingService {
return baseMapper.deleteByIds(ids) > 0;
}
@Override
public List<TbBuildingVo> queryByTenantId(String tenantId) {
LambdaQueryWrapper<TbBuilding> lqw = Wrappers.lambdaQuery();
lqw.eq(TbBuilding::getTenantId, tenantId);
return baseMapper.selectVoList(lqw);
public List<TbBuildingVo> queryAll() {
return baseMapper.selectVoList(null);
}
}

75
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbCommunityServiceImpl.java
View File

@@ -1,5 +1,7 @@
package org.dromara.property.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Assert;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -41,18 +43,18 @@ public class TbCommunityServiceImpl implements ITbCommunityService {
private final ITbRoomService roomService;
@Override
public List<TreeNode<String>> tree(Integer level, String tenantId) {
public List<TreeNode<Long>> tree(Integer level, String tenantId) {
// 默认加载社区树
List<TbCommunityVo> tbCommunityVos = queryByTenantId(tenantId);
List<TbCommunityVo> tbCommunityVos = queryAll();
if (tbCommunityVos == null || tbCommunityVos.isEmpty()) {
return new ArrayList<>();
}
List<TreeNode<String>> community = new ArrayList<>(tbCommunityVos.stream().map(item -> {
TreeNode<String> node = new TreeNode<>();
List<TreeNode<Long>> community = new ArrayList<>(tbCommunityVos.stream().map(item -> {
TreeNode<Long> node = new TreeNode<>();
node.setChildren(new ArrayList<>());
node.setCode(item.getCommunityCode());
node.setCode(item.getId());
node.setLabel(item.getCommunityName());
node.setParentCode("");
node.setParentCode(0L);
node.setLevel(1);
return node;
}).toList());
@@ -60,14 +62,14 @@ public class TbCommunityServiceImpl implements ITbCommunityService {
return community;
}
if (level >= 2) {
List<TbBuildingVo> vos = buildingService.queryByTenantId(tenantId);
List<TbBuildingVo> vos = buildingService.queryAll();
if (vos != null && !vos.isEmpty()) {
List<TreeNode<String>> list = vos.stream().map(item -> {
TreeNode<String> node = new TreeNode<>();
List<TreeNode<Long>> list = vos.stream().map(item -> {
TreeNode<Long> node = new TreeNode<>();
node.setChildren(new ArrayList<>());
node.setCode(item.getBuildingCode());
node.setCode(item.getId());
node.setLabel(item.getBuildingName());
node.setParentCode(item.getCommunityCode());
node.setParentCode(item.getCommunityId());
node.setLevel(2);
return node;
}).toList();
@@ -75,14 +77,14 @@ public class TbCommunityServiceImpl implements ITbCommunityService {
}
}
if (level >= 3) {
List<TbUnitVo> vos = unitService.queryByTenantId(tenantId);
List<TbUnitVo> vos = unitService.queryAll();
if (vos != null && !vos.isEmpty()) {
List<TreeNode<String>> list = vos.stream().map(item -> {
TreeNode<String> node = new TreeNode<>();
List<TreeNode<Long>> list = vos.stream().map(item -> {
TreeNode<Long> node = new TreeNode<>();
node.setChildren(new ArrayList<>());
node.setCode(item.getUnitCode());
node.setCode(item.getId());
node.setLabel(item.getUnitName());
node.setParentCode(item.getBuildingCode());
node.setParentCode(item.getBuildingId());
node.setLevel(3);
return node;
}).toList();
@@ -90,14 +92,14 @@ public class TbCommunityServiceImpl implements ITbCommunityService {
}
}
if (level >= 4) {
List<TbFloorVo> vos = floorService.queryByTenantId(tenantId);
List<TbFloorVo> vos = floorService.queryAll();
if (vos != null && !vos.isEmpty()) {
List<TreeNode<String>> list = vos.stream().map(item -> {
TreeNode<String> node = new TreeNode<>();
List<TreeNode<Long>> list = vos.stream().map(item -> {
TreeNode<Long> node = new TreeNode<>();
node.setChildren(new ArrayList<>());
node.setCode(item.getFloorCode());
node.setCode(item.getId());
node.setLabel(item.getFloorName());
node.setParentCode(item.getUnitCode());
node.setParentCode(item.getUnitId());
node.setLevel(4);
return node;
}).toList();
@@ -106,28 +108,27 @@ public class TbCommunityServiceImpl implements ITbCommunityService {
}
if (level >= 5) {
List<TbRoomVo> vos = roomService.queryByTenantId(tenantId);
List<TbRoomVo> vos = roomService.queryAll();
if (vos != null && !vos.isEmpty()) {
List<TreeNode<String>> list = vos.stream().map(item -> {
TreeNode<String> node = new TreeNode<>();
List<TreeNode<Long>> list = vos.stream().map(item -> {
TreeNode<Long> node = new TreeNode<>();
node.setChildren(new ArrayList<>());
node.setCode(item.getRoomCode());
node.setCode(item.getId());
node.setLabel(item.getRoomNumber());
node.setParentCode(item.getFloorCode());
node.setParentCode(item.getFloorId());
node.setLevel(5);
return node;
}).toList();
community.addAll(list);
}
}
return TreeUtils.build(community, "");
return TreeUtils.build(community, 0L);
}
@Override
public List<TbCommunityVo> queryByTenantId(String tenantId) {
LambdaQueryWrapper<TbCommunity> queryWrapper = Wrappers.lambdaQuery();
queryWrapper.eq(TbCommunity::getTenantId, tenantId);
return baseMapper.selectVoList(queryWrapper);
public List<TbCommunityVo> queryAll() {
return baseMapper.selectVoList();
}
/**
@@ -172,7 +173,6 @@ public class TbCommunityServiceImpl implements ITbCommunityService {
LambdaQueryWrapper<TbCommunity> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(TbCommunity::getId);
lqw.like(StringUtils.isNotBlank(bo.getCommunityName()), TbCommunity::getCommunityName, bo.getCommunityName());
lqw.eq(StringUtils.isNotBlank(bo.getCommunityCode()), TbCommunity::getCommunityCode, bo.getCommunityCode());
lqw.eq(bo.getCommunityType() != null, TbCommunity::getCommunityType, bo.getCommunityType());
lqw.eq(StringUtils.isNotBlank(bo.getProvince()), TbCommunity::getProvince, bo.getProvince());
lqw.eq(StringUtils.isNotBlank(bo.getCity()), TbCommunity::getCity, bo.getCity());
@@ -197,6 +197,12 @@ public class TbCommunityServiceImpl implements ITbCommunityService {
*/
@Override
public Boolean insertByBo(TbCommunityBo bo) {
// 处理cityFullCode
String[] split = bo.getCityFullCode().split("/");
Assert.isTrue(split.length == 3, "获取城市信息失败");
bo.setProvince(split[0]);
bo.setCity(split[1]);
bo.setDistrict(split[2]);
TbCommunity add = MapstructUtils.convert(bo, TbCommunity.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
@@ -214,6 +220,11 @@ public class TbCommunityServiceImpl implements ITbCommunityService {
*/
@Override
public Boolean updateByBo(TbCommunityBo bo) {
String[] split = bo.getCityFullCode().split("/");
Assert.isTrue(split.length == 3, "获取城市信息失败");
bo.setProvince(split[0]);
bo.setCity(split[1]);
bo.setDistrict(split[2]);
TbCommunity update = MapstructUtils.convert(bo, TbCommunity.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;

18
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbFloorServiceImpl.java
View File

@@ -1,5 +1,6 @@
package org.dromara.property.service.impl;
import cn.hutool.core.lang.Assert;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -12,8 +13,10 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.property.domain.TbFloor;
import org.dromara.property.domain.bo.TbFloorBo;
import org.dromara.property.domain.vo.TbFloorVo;
import org.dromara.property.domain.vo.TbUnitVo;
import org.dromara.property.mapper.TbFloorMapper;
import org.dromara.property.service.ITbFloorService;
import org.dromara.property.service.ITbUnitService;
import org.springframework.stereotype.Service;
import java.util.Collection;
@@ -32,6 +35,7 @@ import java.util.Map;
public class TbFloorServiceImpl implements ITbFloorService {
private final TbFloorMapper baseMapper;
private final ITbUnitService tbUnitService;
/**
* 查询楼层
@@ -74,10 +78,9 @@ public class TbFloorServiceImpl implements ITbFloorService {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<TbFloor> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(TbFloor::getId);
lqw.eq(StringUtils.isNotBlank(bo.getUnitCode()), TbFloor::getUnitCode, bo.getUnitCode());
lqw.eq(bo.getFloorCode() != null, TbFloor::getFloorCode, bo.getFloorCode());
lqw.like(StringUtils.isNotBlank(bo.getFloorName()), TbFloor::getFloorName, bo.getFloorName());
lqw.eq(bo.getFloorNumber() != null, TbFloor::getFloorNumber, bo.getFloorNumber());
lqw.eq(bo.getUnitId() != null, TbFloor::getUnitId, bo.getUnitId());
lqw.eq(bo.getFloorType() != null, TbFloor::getFloorType, bo.getFloorType());
lqw.eq(bo.getRoomCount() != null, TbFloor::getRoomCount, bo.getRoomCount());
lqw.eq(bo.getFloorHeight() != null, TbFloor::getFloorHeight, bo.getFloorHeight());
@@ -92,7 +95,12 @@ public class TbFloorServiceImpl implements ITbFloorService {
*/
@Override
public Boolean insertByBo(TbFloorBo bo) {
// 验证单元是否存在
TbUnitVo tbUnitVo = tbUnitService.queryById(bo.getUnitId());
Assert.notNull(tbUnitVo, "单元:{},不存在。", bo.getUnitId());
TbFloor add = MapstructUtils.convert(bo, TbFloor.class);
add.setCommunityId(tbUnitVo.getCommunityId());
add.setBuildingId(tbUnitVo.getBuildingId());
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
@@ -137,9 +145,7 @@ public class TbFloorServiceImpl implements ITbFloorService {
}
@Override
public List<TbFloorVo> queryByTenantId(String tenantId) {
LambdaQueryWrapper<TbFloor> lqw = Wrappers.lambdaQuery();
lqw.eq(TbFloor::getTenantId, tenantId);
return baseMapper.selectVoList(lqw);
public List<TbFloorVo> queryAll() {
return baseMapper.selectVoList();
}
}

19
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbRoomServiceImpl.java
View File

@@ -1,5 +1,6 @@
package org.dromara.property.service.impl;
import cn.hutool.core.lang.Assert;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -11,8 +12,10 @@ import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.property.domain.TbRoom;
import org.dromara.property.domain.bo.TbRoomBo;
import org.dromara.property.domain.vo.TbFloorVo;
import org.dromara.property.domain.vo.TbRoomVo;
import org.dromara.property.mapper.TbRoomMapper;
import org.dromara.property.service.ITbFloorService;
import org.dromara.property.service.ITbRoomService;
import org.springframework.stereotype.Service;
@@ -32,6 +35,7 @@ import java.util.Map;
public class TbRoomServiceImpl implements ITbRoomService {
private final TbRoomMapper baseMapper;
private final ITbFloorService tbFloorService;
/**
* 查询房间信息
@@ -74,10 +78,9 @@ public class TbRoomServiceImpl implements ITbRoomService {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<TbRoom> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(TbRoom::getId);
lqw.eq(StringUtils.isNotBlank(bo.getFloorCode()), TbRoom::getFloorCode, bo.getFloorCode());
lqw.eq(StringUtils.isNotBlank(bo.getRoomCode()), TbRoom::getRoomCode, bo.getRoomCode());
lqw.eq(StringUtils.isNotBlank(bo.getRoomNumber()), TbRoom::getRoomNumber, bo.getRoomNumber());
lqw.eq(bo.getRoomType() != null, TbRoom::getRoomType, bo.getRoomType());
lqw.eq(bo.getFloorId() != null, TbRoom::getFloorId, bo.getFloorId());
lqw.eq(bo.getArea() != null, TbRoom::getArea, bo.getArea());
lqw.eq(StringUtils.isNotBlank(bo.getLayout()), TbRoom::getLayout, bo.getLayout());
lqw.eq(bo.getOrientation() != null, TbRoom::getOrientation, bo.getOrientation());
@@ -94,8 +97,12 @@ public class TbRoomServiceImpl implements ITbRoomService {
*/
@Override
public Boolean insertByBo(TbRoomBo bo) {
TbFloorVo tbFloorVo = tbFloorService.queryById(bo.getFloorId());
Assert.notNull(tbFloorVo, "楼层:{},不存在。", bo.getFloorId());
TbRoom add = MapstructUtils.convert(bo, TbRoom.class);
validEntityBeforeSave(add);
add.setCommunityId(tbFloorVo.getCommunityId());
add.setBuildingId(tbFloorVo.getBuildingId());
add.setUnitId(tbFloorVo.getUnitId());
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());
@@ -139,9 +146,7 @@ public class TbRoomServiceImpl implements ITbRoomService {
}
@Override
public List<TbRoomVo> queryByTenantId(String tenantId) {
LambdaQueryWrapper<TbRoom> lqw = Wrappers.lambdaQuery();
lqw.eq(TbRoom::getTenantId, tenantId);
return baseMapper.selectVoList(lqw);
public List<TbRoomVo> queryAll() {
return baseMapper.selectVoList();
}
}

17
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbUnitServiceImpl.java
View File

@@ -1,5 +1,6 @@
package org.dromara.property.service.impl;
import cn.hutool.core.lang.Assert;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -11,8 +12,10 @@ import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.property.domain.TbUnit;
import org.dromara.property.domain.bo.TbUnitBo;
import org.dromara.property.domain.vo.TbBuildingVo;
import org.dromara.property.domain.vo.TbUnitVo;
import org.dromara.property.mapper.TbUnitMapper;
import org.dromara.property.service.ITbBuildingService;
import org.dromara.property.service.ITbUnitService;
import org.springframework.stereotype.Service;
@@ -32,6 +35,7 @@ import java.util.Map;
public class TbUnitServiceImpl implements ITbUnitService {
private final TbUnitMapper baseMapper;
private final ITbBuildingService buildingService;
/**
* 查询单元
@@ -74,10 +78,9 @@ public class TbUnitServiceImpl implements ITbUnitService {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<TbUnit> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(TbUnit::getId);
lqw.eq(StringUtils.isNotBlank(bo.getBuildingCode()), TbUnit::getBuildingCode, bo.getBuildingCode());
lqw.eq(StringUtils.isNotBlank(bo.getUnitCode()), TbUnit::getUnitCode, bo.getUnitCode());
lqw.like(StringUtils.isNotBlank(bo.getUnitName()), TbUnit::getUnitName, bo.getUnitName());
lqw.eq(bo.getFloorCount() != null, TbUnit::getFloorCount, bo.getFloorCount());
lqw.eq(bo.getBuildingId() != null, TbUnit::getBuildingId, bo.getBuildingId());
lqw.eq(bo.getHouseholdCount() != null, TbUnit::getHouseholdCount, bo.getHouseholdCount());
lqw.eq(bo.getStairCount() != null, TbUnit::getStairCount, bo.getStairCount());
return lqw;
@@ -91,7 +94,11 @@ public class TbUnitServiceImpl implements ITbUnitService {
*/
@Override
public Boolean insertByBo(TbUnitBo bo) {
// 检验建筑是否存在
TbBuildingVo tbBuildingVo = buildingService.queryById(bo.getBuildingId());
Assert.notNull(tbBuildingVo, "建筑:{},不存在。", bo.getBuildingId());
TbUnit add = MapstructUtils.convert(bo, TbUnit.class);
add.setCommunityId(tbBuildingVo.getCommunityId());
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
@@ -136,9 +143,7 @@ public class TbUnitServiceImpl implements ITbUnitService {
}
@Override
public List<TbUnitVo> queryByTenantId(String tenantId) {
LambdaQueryWrapper<TbUnit> queryWrapper = Wrappers.lambdaQuery();
queryWrapper.eq(TbUnit::getTenantId, tenantId);
return baseMapper.selectVoList(queryWrapper);
public List<TbUnitVo> queryAll() {
return baseMapper.selectVoList();
}
}

1
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TdFactoryServiceImpl.java
View File

@@ -76,7 +76,6 @@ public class TdFactoryServiceImpl implements ITdFactoryService {
lqw.orderByAsc(TdFactory::getId);
lqw.eq(StringUtils.isNotBlank(bo.getFactoryNo()), TdFactory::getFactoryNo, bo.getFactoryNo());
lqw.like(StringUtils.isNotBlank(bo.getFactoryName()), TdFactory::getFactoryName, bo.getFactoryName());
lqw.eq(bo.getDataState() != null, TdFactory::getDataState, bo.getDataState());
lqw.eq(StringUtils.isNotBlank(bo.getSearchValue()), TdFactory::getSearchValue, bo.getSearchValue());
return lqw;
}

7
ruoyi-modules/Property/src/main/resources/mapper/Property/PlantsOrderChargeMapper.xml Normal file
View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.property.mapper.PlantsOrderChargeMapper">
</mapper>

7
ruoyi-modules/Property/src/main/resources/mapper/Property/PlantsOrderMaintainMapper.xml Normal file
View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.property.mapper.PlantsOrderMaintainMapper">
</mapper>

7
ruoyi-modules/Property/src/main/resources/mapper/Property/PlantsRentalOrderMapper.xml Normal file
View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.property.mapper.PlantsRentalOrderMapper">
</mapper>