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
This commit is contained in:
dy
2025-07-10 14:50:22 +08:00
parent f9ea62db04 4e60d1f3d1
commit 6127223a78
177 changed files with 14104 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/ServiceWorkOrdersController.java
View File

@@ -16,6 +16,7 @@ import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.property.domain.bo.ServiceWorkOrdersBo;
import org.dromara.property.domain.vo.ServiceWorkOrdersInfoVo;
import org.dromara.property.domain.vo.ServiceWorkOrdersVo;
import org.dromara.property.service.IServiceWorkOrdersService;
import org.springframework.validation.annotation.Validated;
@@ -41,40 +42,40 @@ public class ServiceWorkOrdersController extends BaseController {
/**
* 查询【工单处理】列表
*/
@SaCheckPermission("system:workOrders:list")
//@SaCheckPermission("system:workOrders:list")
@GetMapping("/list")
public TableDataInfo<ServiceWorkOrdersVo> list(ServiceWorkOrdersBo bo, PageQuery pageQuery) {
return serviceWorkOrdersService.queryPageList(bo, pageQuery);
}
/**
* 导出【请填写功能名称】列表
* 导出【工单处理】列表
*/
@SaCheckPermission("system:workOrders:export")
@Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
// @SaCheckPermission("system:workOrders:export")
@Log(title = "【工单处理】", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(ServiceWorkOrdersBo bo, HttpServletResponse response) {
List<ServiceWorkOrdersVo> list = serviceWorkOrdersService.queryList(bo);
ExcelUtil.exportExcel(list, "【请填写功能名称】", ServiceWorkOrdersVo.class, response);
ExcelUtil.exportExcel(list, "【工单处理】", ServiceWorkOrdersVo.class, response);
}
/**
* 获取【请填写功能名称】详细信息
* 获取【工单处理】详细信息
*
* @param id 主键
*/
@SaCheckPermission("system:workOrders:query")
// @SaCheckPermission("system:workOrders:query")
@GetMapping("/{id}")
public R<ServiceWorkOrdersVo> getInfo(@NotNull(message = "主键不能为空")
public R<ServiceWorkOrdersInfoVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable("id") Long id) {
return R.ok(serviceWorkOrdersService.queryById(id));
}
/**
* 新增【请填写功能名称】
* 新增【工单处理】
*/
@SaCheckPermission("system:workOrders:add")
@Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
// @SaCheckPermission("system:workOrders:add")
@Log(title = "【工单处理】", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody ServiceWorkOrdersBo bo) {
@@ -82,10 +83,10 @@ public class ServiceWorkOrdersController extends BaseController {
}
/**
* 修改【请填写功能名称】
* 修改【工单处理】
*/
@SaCheckPermission("system:workOrders:edit")
@Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
//@SaCheckPermission("system:workOrders:edit")
@Log(title = "【工单处理】", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody ServiceWorkOrdersBo bo) {
@@ -93,12 +94,12 @@ public class ServiceWorkOrdersController extends BaseController {
}
/**
* 删除【请填写功能名称】
* 删除【工单处理】
*
* @param ids 主键串
*/
@SaCheckPermission("system:workOrders:remove")
@Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
// @SaCheckPermission("system:workOrders:remove")
@Log(title = "【工单处理】", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable("ids") Long[] ids) {

106
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/ServiceWorkOrdersTypeController.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.dromara.property.domain.bo.ServiceWorkOrdersTypeBo;
import org.dromara.property.domain.vo.ServiceWorkOrdersTypeVo;
import org.dromara.property.service.IServiceWorkOrdersTypeService;
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.common.mybatis.core.page.TableDataInfo;
/**
* 【工单类型】
* 前端访问路由地址为:/system/workOrdersType
*
* @author mocheng
* @date 2025-07-09
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/workOrdersType")
public class ServiceWorkOrdersTypeController extends BaseController {
private final IServiceWorkOrdersTypeService serviceWorkOrdersTypeService;
/**
* 查询【工单类型】列表
*/
@SaCheckPermission("system:workOrdersType:list")
@GetMapping("/list")
public TableDataInfo<ServiceWorkOrdersTypeVo> list(ServiceWorkOrdersTypeBo bo, PageQuery pageQuery) {
return serviceWorkOrdersTypeService.queryPageList(bo, pageQuery);
}
/**
* 导出【工单类型】列表
*/
@SaCheckPermission("system:workOrdersType:export")
@Log(title = "【导出工单类型】", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(ServiceWorkOrdersTypeBo bo, HttpServletResponse response) {
List<ServiceWorkOrdersTypeVo> list = serviceWorkOrdersTypeService.queryList(bo);
ExcelUtil.exportExcel(list, "【工单类型】", ServiceWorkOrdersTypeVo.class, response);
}
/**
* 获取【工单类型】详细信息
*
* @param id 主键
*/
@SaCheckPermission("system:workOrdersType:query")
@GetMapping("/{id}")
public R<ServiceWorkOrdersTypeVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable("id") Long id) {
return R.ok(serviceWorkOrdersTypeService.queryById(id));
}
/**
* 新增【工单类型】
*/
@SaCheckPermission("system:workOrdersType:add")
@Log(title = "【新增工单类型】", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody ServiceWorkOrdersTypeBo bo) {
return toAjax(serviceWorkOrdersTypeService.insertByBo(bo));
}
/**
* 修改【工单类型】
*/
@SaCheckPermission("system:workOrdersType:edit")
@Log(title = "【工单类型】", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody ServiceWorkOrdersTypeBo bo) {
return toAjax(serviceWorkOrdersTypeService.updateByBo(bo));
}
/**
* 删除【工单类型】
*
* @param ids 主键串
*/
@SaCheckPermission("system:workOrdersType:remove")
@Log(title = "【工单类型】", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable("ids") Long[] ids) {
return toAjax(serviceWorkOrdersTypeService.deleteWithValidByIds(List.of(ids), true));
}
}

12
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/ServerBooking.java
View File

@@ -4,6 +4,8 @@ import org.dromara.common.tenant.core.TenantEntity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -37,7 +39,7 @@ public class ServerBooking extends TenantEntity {
/**
* 预约数量
*/
private Long serverNum;
private Integer serverNum;
/**
* 预约类型
@@ -67,17 +69,17 @@ public class ServerBooking extends TenantEntity {
/**
* 预约价格
*/
private Long bookingPrice;
private BigDecimal bookingPrice;
/**
* 实付价格
*/
private Long payPrice;
private BigDecimal payPrice;
/**
* 支付方式
*/
private Long payType;
private Integer payType;
/**
* 备注
@@ -87,7 +89,7 @@ public class ServerBooking extends TenantEntity {
/**
* 状态
*/
private Long state;
private Integer state;
/**
* 创建人id

17
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/ServiceWorkOrders.java
View File

@@ -42,12 +42,12 @@ public class ServiceWorkOrders extends TenantEntity {
/**
* 工单类型
*/
private Long type;
private Long type;
/**
* 状态
*/
private Long status;
private Integer status;
/**
* 派单时间
@@ -59,10 +59,6 @@ public class ServiceWorkOrders extends TenantEntity {
*/
private String initiatorName;
/**
* 发起人手机号
*/
private String initiatorPhone;
/**
* 处理人姓名
@@ -87,12 +83,12 @@ public class ServiceWorkOrders extends TenantEntity {
/**
* 评价
*/
private String serviceEvalua;
private Integer serviceEvalua;
/**
* 是否超时
*/
private Long isTimeOut;
private Integer isTimeOut;
/**
* 创建人id
@@ -104,10 +100,5 @@ public class ServiceWorkOrders extends TenantEntity {
*/
private Long updateById;
/**
* 搜索值
*/
private String searchValue;
}

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

@@ -0,0 +1,75 @@
package org.dromara.property.domain;
import org.dromara.common.tenant.core.TenantEntity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serial;
/**
* 【工单类型】对象 service_work_orders_type
*
* @author mocheng
* @date 2025-07-09
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("service_work_orders_type")
public class ServiceWorkOrdersType extends TenantEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* id
*/
@TableId(value = "id")
private Long id;
/**
* 工单类型编号
*/
private String orderTypeNo;
/**
* 工单类型名称
*/
private String orderTypeName;
/**
* 运作模式
*/
private String operationMode;
/**
* 排序值
*/
private Integer sort;
/**
* 累计工单数量
*/
private Integer completionNumber;
/**
* 是否支持转单(0支持,1不支持)
*/
private Integer isTransfers;
/**
* 创建人id
*/
private Long createById;
/**
* 更新人id
*/
private Long updateById;
/**
* 搜索值
*/
private String searchValue;
}

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

@@ -46,7 +46,7 @@ public class MeetBo extends BaseEntity {
* 容纳人数
*/
@NotBlank(message = "容纳人数不能为空")
private Long personNumber;
private Integer personNumber;
/**
* 基础服务
@@ -61,11 +61,12 @@ public class MeetBo extends BaseEntity {
/**
* 增值服务是否启用
*/
private Long attach;
private Integer attach;
/**
* 负责人
*/
@NotBlank(message = "负责人不能为空")
private String principals;
/**

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

@@ -39,11 +39,6 @@ public class MeetBookingBo extends BaseEntity {
*/
private Long meetId;
/**
* 会议室地址
*/
private String meetLocation;
/**
* 所属单位
*/
@@ -54,10 +49,6 @@ public class MeetBookingBo extends BaseEntity {
*/
private String person;
/**
* 联系方式
*/
private String phone;
/**
* 预定开始时间

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

@@ -12,7 +12,7 @@ import org.dromara.property.domain.ServiceWorkOrders;
import java.util.Date;
/**
* 【请填写功能名称】业务对象 service_work_orders
* 【工单处理】业务对象 service_work_orders
*
* @author mocheng
* @date 2025-07-07
@@ -41,12 +41,12 @@ public class ServiceWorkOrdersBo extends BaseEntity {
/**
* 工单类型
*/
private Long type;
private Long type;
/**
* 状态
*/
private Long status;
private Integer status;
/**
* 派单时间
@@ -58,10 +58,6 @@ public class ServiceWorkOrdersBo extends BaseEntity {
*/
private String initiatorName;
/**
* 发起人手机号
*/
private String initiatorPhone;
/**
* 处理人姓名
@@ -86,12 +82,12 @@ public class ServiceWorkOrdersBo extends BaseEntity {
/**
* 评价
*/
private String serviceEvalua;
private Integer serviceEvalua;
/**
* 是否超时
*/
private Long isTimeOut;
private Integer isTimeOut;
/**
* 创建人id
@@ -103,10 +99,6 @@ public class ServiceWorkOrdersBo extends BaseEntity {
*/
private Long updateById;
/**
* 搜索值
*/
private String searchValue;
}

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

@@ -0,0 +1,78 @@
package org.dromara.property.domain.bo;
import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import lombok.EqualsAndHashCode;
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.ServiceWorkOrdersType;
/**
* 【工单类型】业务对象 service_work_orders_type
*
* @author mocheng
* @date 2025-07-09
*/
@Data
@EqualsAndHashCode(callSuper = true)
@AutoMapper(target = ServiceWorkOrdersType.class, reverseConvertGenerate = false)
public class ServiceWorkOrdersTypeBo extends BaseEntity {
/**
* id
*/
@NotNull(message = "id不能为空", groups = { EditGroup.class })
private Long id;
/**
* 工单类型编号
*/
private String orderTypeNo;
/**
* 工单类型名称
*/
@NotNull(message = "工单类型名称不能为空", groups = { AddGroup.class, EditGroup.class })
private String orderTypeName;
/**
* 运作模式
*/
@NotNull(message = "运作模式不能为空", groups = { AddGroup.class, EditGroup.class })
private String operationMode;
/**
* 排序值
*/
@NotNull(message = "排序值不能为空", groups = { AddGroup.class, EditGroup.class })
private Integer sort;
/**
* 完成时效
*/
@NotNull(message = "完成时效不能为空", groups = { AddGroup.class, EditGroup.class })
private Integer completionNumber;
/**
* 是否支持转单(0支持,1不支持)
*/
private Integer isTransfers;
/**
* 创建人id
*/
private Long createById;
/**
* 更新人id
*/
private Long updateById;
/**
* 搜索值
*/
private String searchValue;
}

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

@@ -59,6 +59,12 @@ public class MeetBookingAppointmentVo implements Serializable {
*/
@ExcelProperty(value = "预定人名称")
private String personName;
/**
* 联系方式
*/
@ExcelProperty(value = "联系方式")
private String phone;
/**
* 会议室主题
*/

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

@@ -64,11 +64,21 @@ public class MeetBookingVo implements Serializable {
@ExcelProperty(value = "所属单位")
private String unit;
/**
* 所属单位名称
*/
@ExcelProperty(value = "所属单位名称")
private String unitName;
/**
* 预定人
*/
@ExcelProperty(value = "预定人")
private String person;
/**
* 预定人名称
*/
@ExcelProperty(value = "预定人名称")
private String personName;
/**
* 联系方式

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

@@ -0,0 +1,134 @@
package org.dromara.property.domain.vo;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.dromara.property.domain.ServiceWorkOrders;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* @Author:yuyongle
* @Date:2025/7/9 17:25
* @Description:工单处理详情
**/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = ServiceWorkOrders.class)
public class ServiceWorkOrdersInfoVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* id
*/
@ExcelProperty(value = "id")
private Long id;
/**
* 工单编号
*/
@ExcelProperty(value = "工单编号")
private String orderNo;
/**
* 工单名称
*/
@ExcelProperty(value = "工单名称")
private String orderName;
/**
* 工单类型
*/
@ExcelProperty(value = "工单类型")
private Long type;
/**
* 状态
*/
@ExcelProperty(value = "状态")
private Integer status;
/**
* 派单时间
*/
@ExcelProperty(value = "派单时间")
private Date dispatchTime;
/**
* 发起人姓名
*/
@ExcelProperty(value = "发起人姓名")
private String initiatorName;
/**
* 发起人姓名文本
*/
@ExcelProperty(value = "发起人姓名文本")
private String initiatorNameText;
/**
* 发起人手机号
*/
@ExcelProperty(value = "发起人手机号")
private String initiatorPhone;
/**
* 处理人姓名
*/
@ExcelProperty(value = "处理人姓名")
private String handler;
/**
* 处理人姓名文本
*/
@ExcelProperty(value = "处理人姓名文本")
private String handlerText;
/**
* 处理人姓名电话
*/
@ExcelProperty(value = "处理人电话")
private String handlerPhone;
/**
* 地址
*/
@ExcelProperty(value = "地址")
private String location;
/**
* 计划完成时间
*/
@ExcelProperty(value = "计划完成时间")
private Date planCompleTime;
/**
* 完成时间
*/
@ExcelProperty(value = "完成时间")
private Date compleTime;
/**
* 评价
*/
@ExcelProperty(value = "评价")
private String serviceEvalua;
/**
* 是否超时
*/
@ExcelProperty(value = "是否超时")
private Integer isTimeOut;
/**
* 类型名称
*/
@ExcelProperty(value = "类型名称")
private String typeName;
/**
* 创建时间
*/
@ExcelProperty(value = "创建时间")
private Date createTime;
}

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

@@ -0,0 +1,89 @@
package org.dromara.property.domain.vo;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.dromara.property.domain.ServiceWorkOrdersType;
import java.io.Serial;
import java.io.Serializable;
/**
* 【工单类型】视图对象 service_work_orders_type
*
* @author mocheng
* @date 2025-07-09
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = ServiceWorkOrdersType.class)
public class ServiceWorkOrdersTypeVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* id
*/
@ExcelProperty(value = "id")
private Long id;
/**
* 工单类型编号
*/
@ExcelProperty(value = "工单类型编号")
private String orderTypeNo;
/**
* 工单类型名称
*/
@ExcelProperty(value = "工单类型名称")
private String orderTypeName;
/**
* 运作模式
*/
@ExcelProperty(value = "运作模式")
private String operationMode;
/**
* 排序值
*/
@ExcelProperty(value = "排序值")
private Integer sort;
/**
* 完成时效
*/
@ExcelProperty(value = "完成时效")
private Integer completionNumber;
/**
* 是否支持转单(0支持,1不支持)
*/
@ExcelProperty(value = "是否支持转单(0支持,1不支持)")
private Integer isTransfers;
/**
* 创建人id
*/
@ExcelProperty(value = "创建人id")
private Long createById;
/**
* 更新人id
*/
@ExcelProperty(value = "更新人id")
private Long updateById;
/**
* 搜索值
*/
@ExcelProperty(value = "搜索值")
private String searchValue;
}

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

@@ -13,7 +13,7 @@ import java.util.Date;
/**
* 【请填写功能名称】视图对象 service_work_orders
* 【工单处理】视图对象 service_work_orders
*
* @author mocheng
* @date 2025-07-07
@@ -49,12 +49,17 @@ public class ServiceWorkOrdersVo implements Serializable {
*/
@ExcelProperty(value = "工单类型")
private Long type;
/**
* 工单类型名称
*/
@ExcelProperty(value = "工单类型名称")
private String typeName;
/**
* 状态
*/
@ExcelProperty(value = "状态")
private Long status;
private int status;
/**
* 派单时间
@@ -67,6 +72,11 @@ public class ServiceWorkOrdersVo implements Serializable {
*/
@ExcelProperty(value = "发起人姓名")
private String initiatorName;
/**
* 发起人姓名文本
*/
@ExcelProperty(value = "发起人姓名文本")
private String initiatorNameText;
/**
* 发起人手机号
@@ -79,6 +89,12 @@ public class ServiceWorkOrdersVo implements Serializable {
*/
@ExcelProperty(value = "处理人姓名")
private String handler;
/**
* 处理人姓名文本
*/
@ExcelProperty(value = "处理人姓名文本")
private String handlerText;
/**
* 地址
@@ -102,13 +118,13 @@ public class ServiceWorkOrdersVo implements Serializable {
* 评价
*/
@ExcelProperty(value = "评价")
private String serviceEvalua;
private Integer serviceEvalua;
/**
* 是否超时
*/
@ExcelProperty(value = "是否超时")
private Long isTimeOut;
private int isTimeOut;
/**
* 创建人id
@@ -128,5 +144,9 @@ public class ServiceWorkOrdersVo implements Serializable {
@ExcelProperty(value = "搜索值")
private String searchValue;
/**
* 创建时间
*/
@ExcelProperty(value = "创建时间")
private Date createTime;
}

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

@@ -26,7 +26,7 @@ import java.util.Date;
public class TbFloorVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
private static final long serialVersionUID = -1L;
/**
*

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

@@ -0,0 +1,39 @@
package org.dromara.property.dubbo;
import lombok.RequiredArgsConstructor;
import org.apache.dubbo.config.annotation.DubboService;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.property.api.RemoteUnitService;
import org.dromara.property.api.domain.vo.RemoteUnitVo;
import org.dromara.property.domain.vo.TbUnitVo;
import org.dromara.property.service.ITbUnitService;
/**
* 对外提供的远程服务调用
*
* @author lxj
*/
@DubboService
@RequiredArgsConstructor
public class RemoteUnitServiceImpl implements RemoteUnitService {
private final ITbUnitService tbUnitService;
@Override
public RemoteUnitVo queryUnitById(Long id) {
TbUnitVo tbUnitVo = tbUnitService.queryById(id);
if(tbUnitVo == null) {
return null;
}
RemoteUnitVo remoteUnitVo = new RemoteUnitVo();
remoteUnitVo.setId(tbUnitVo.getId());
remoteUnitVo.setCommunityId(tbUnitVo.getCommunityId());
remoteUnitVo.setBuildingId(tbUnitVo.getBuildingId());
remoteUnitVo.setUnitName(tbUnitVo.getUnitName());
remoteUnitVo.setFloorCount(tbUnitVo.getFloorCount());
remoteUnitVo.setHouseholdCount(tbUnitVo.getHouseholdCount());
remoteUnitVo.setStairCount(tbUnitVo.getStairCount());
return remoteUnitVo;
}
}

2
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/ApplicationMapper.java
View File

@@ -1,5 +1,6 @@
package org.dromara.property.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.property.domain.Application;
import org.dromara.property.domain.vo.ApplicationVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
* @author mocheng
* @date 2025-06-21
*/
@Mapper
public interface ApplicationMapper extends BaseMapperPlus<Application, ApplicationVo> {
}

2
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AssetMapper.java
View File

@@ -1,5 +1,6 @@
package org.dromara.property.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.property.domain.Asset;
import org.dromara.property.domain.vo.AssetVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
* @author mocheng
* @date 2025-06-21
*/
@Mapper
public interface AssetMapper extends BaseMapperPlus<Asset, AssetVo> {
}

2
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AssetTypeMapper.java
View File

@@ -1,5 +1,6 @@
package org.dromara.property.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.property.domain.AssetType;
import org.dromara.property.domain.vo.AssetTypeVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
* @author mocheng
* @date 2025-06-23
*/
@Mapper
public interface AssetTypeMapper extends BaseMapperPlus<AssetType, AssetTypeVo> {
}

2
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/CleanMapper.java
View File

@@ -1,5 +1,6 @@
package org.dromara.property.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
import org.dromara.property.domain.Clean;
import org.dromara.property.domain.vo.CleanVo;
@@ -13,6 +14,7 @@ import java.util.List;
* @author mocheng
* @date 2025-06-19
*/
@Mapper
public interface CleanMapper extends BaseMapperPlus<Clean, CleanVo> {
}

2
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/CleanOrderMapper.java
View File

@@ -2,6 +2,7 @@ package org.dromara.property.mapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.property.domain.CleanOrder;
import org.dromara.property.domain.vo.CleanOrderVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -12,6 +13,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
* @author mocheng
* @date 2025-06-19
*/
@Mapper
public interface CleanOrderMapper extends BaseMapperPlus<CleanOrder, CleanOrderVo> {
Page<CleanOrderVo> selectForPage(Page<Object> build, LambdaQueryWrapper<CleanOrder> lqw);

2
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/CleanRelationMapper.java
View File

@@ -1,6 +1,7 @@
package org.dromara.property.mapper;
import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.property.domain.CleanRelation;
import org.dromara.property.domain.vo.CleanRelationVo;
@@ -11,6 +12,7 @@ import org.dromara.property.domain.vo.CleanRelationVo;
* @author mocheng
* @date 2025-07-01
*/
@Mapper
public interface CleanRelationMapper extends BaseMapperPlus<CleanRelation, CleanRelationVo> {
@Insert("insert into clean_relation(id,clean_id, areas, sum_price) values(#{id},#{cleanId}, #{areas}, #{sumPrice})")

2
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/CleanserverOrderMapper.java
View File

@@ -1,5 +1,6 @@
package org.dromara.property.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.property.domain.CleanserverOrder;
import org.dromara.property.domain.vo.CleanserverOrderVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
* @author mocheng
* @date 2025-06-23
*/
@Mapper
public interface CleanserverOrderMapper extends BaseMapperPlus<CleanserverOrder, CleanserverOrderVo> {
}

2
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/ConteactMapper.java
View File

@@ -1,5 +1,6 @@
package org.dromara.property.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.property.domain.Conteact;
import org.dromara.property.domain.vo.ConteactVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
* @author mocheng
* @date 2025-06-21
*/
@Mapper
public interface ConteactMapper extends BaseMapperPlus<Conteact, ConteactVo> {
}

2
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/DepotLogMapper.java
View File

@@ -1,5 +1,6 @@
package org.dromara.property.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.property.domain.DepotLog;
import org.dromara.property.domain.vo.DepotLogVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
* @author LionLi
* @date 2025-06-21
*/
@Mapper
public interface DepotLogMapper extends BaseMapperPlus<DepotLog, DepotLogVo> {
}

2
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/DepotMapper.java
View File

@@ -1,5 +1,6 @@
package org.dromara.property.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.property.domain.Depot;
import org.dromara.property.domain.vo.DepotVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
* @author mocheng
* @date 2025-06-21
*/
@Mapper
public interface DepotMapper extends BaseMapperPlus<Depot, DepotVo> {
}

2
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/MeetAttachMapper.java
View File

@@ -1,5 +1,6 @@
package org.dromara.property.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.property.domain.MeetAttach;
import org.dromara.property.domain.vo.MeetAttachVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
* @author mocheng
* @date 2025-06-21
*/
@Mapper
public interface MeetAttachMapper extends BaseMapperPlus<MeetAttach, MeetAttachVo> {
}

2
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/MeetAttachOrderMapper.java
View File

@@ -1,4 +1,5 @@
package org.dromara.property.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.property.domain.MeetAttachOrder;
import org.dromara.property.domain.vo.MeetAttachOrderVo;
@@ -9,6 +10,7 @@ import org.dromara.property.domain.vo.MeetAttachOrderVo;
* @author mocheng
* @date 2025-07-08
*/
@Mapper
public interface MeetAttachOrderMapper extends BaseMapperPlus<MeetAttachOrder, MeetAttachOrderVo> {
}

2
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/MeetBookingMapper.java
View File

@@ -1,5 +1,6 @@
package org.dromara.property.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.property.domain.MeetBooking;
import org.dromara.property.domain.vo.MeetBookingVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
* @author mocheng
* @date 2025-06-21
*/
@Mapper
public interface MeetBookingMapper extends BaseMapperPlus<MeetBooking, MeetBookingVo> {
}

2
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/MeetMapper.java
View File

@@ -1,5 +1,6 @@
package org.dromara.property.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.property.domain.Meet;
import org.dromara.property.domain.vo.MeetVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
* @author mocheng
* @date 2025-06-21
*/
@Mapper
public interface MeetMapper extends BaseMapperPlus<Meet, MeetVo> {
}

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

@@ -1,5 +1,6 @@
package org.dromara.property.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.property.domain.PlantsOrderCharge;
import org.dromara.property.domain.vo.PlantsOrderChargeVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
* @author mocheng
* @date 2025-06-30
*/
@Mapper
public interface PlantsOrderChargeMapper extends BaseMapperPlus<PlantsOrderCharge, PlantsOrderChargeVo> {
}

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

@@ -1,5 +1,6 @@
package org.dromara.property.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
import org.dromara.property.domain.PlantsOrderMaintain;
import org.dromara.property.domain.vo.PlantsOrderMaintainVo;
@@ -14,6 +15,7 @@ import java.util.Map;
* @author mocheng
* @date 2025-06-30
*/
@Mapper
public interface PlantsOrderMaintainMapper extends BaseMapperPlus<PlantsOrderMaintain, PlantsOrderMaintainVo> {
@Select("SELECT " +

2
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/PlantsPlanProductMapper.java
View File

@@ -1,5 +1,6 @@
package org.dromara.property.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.property.domain.PlantsPlanProduct;
import org.dromara.property.domain.vo.PlantsPlanProductVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -12,6 +13,7 @@ import java.util.List;
* @author mocheng
* @date 2025-06-25
*/
@Mapper
public interface PlantsPlanProductMapper extends BaseMapperPlus<PlantsPlanProduct, PlantsPlanProductVo> {
void deleteByPlanId(Long planId);

2
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/PlantsProductMapper.java
View File

@@ -1,5 +1,6 @@
package org.dromara.property.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.property.domain.PlantsProduct;
import org.dromara.property.domain.vo.PlantsProductVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
* @author mocheng
* @date 2025-06-25
*/
@Mapper
public interface PlantsProductMapper extends BaseMapperPlus<PlantsProduct, PlantsProductVo> {
}

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

@@ -1,5 +1,6 @@
package org.dromara.property.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
import org.dromara.property.domain.PlantsRentalOrder;
import org.dromara.property.domain.vo.PlantsRentalOrderVo;
@@ -14,6 +15,7 @@ import java.util.Map;
* @author mocheng
* @date 2025-06-30
*/
@Mapper
public interface PlantsRentalOrderMapper extends BaseMapperPlus<PlantsRentalOrder, PlantsRentalOrderVo> {
@Select("SELECT HOUR(create_time) AS hour, COUNT(*) AS count " +

2
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/PlantsRentalPlanMapper.java
View File

@@ -1,5 +1,6 @@
package org.dromara.property.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.property.domain.PlantsRentalPlan;
import org.dromara.property.domain.vo.PlantsRentalPlanVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
* @author mocheng
* @date 2025-06-25
*/
@Mapper
public interface PlantsRentalPlanMapper extends BaseMapperPlus<PlantsRentalPlan, PlantsRentalPlanVo> {
}

2
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/ResidentPersonMapper.java
View File

@@ -1,5 +1,6 @@
package org.dromara.property.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.property.domain.ResidentPerson;
import org.dromara.property.domain.vo.ResidentPersonVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
* @author mocheng
* @date 2025-06-19
*/
@Mapper
public interface ResidentPersonMapper extends BaseMapperPlus<ResidentPerson, ResidentPersonVo> {
}

2
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/ResidentUnitMapper.java
View File

@@ -1,5 +1,6 @@
package org.dromara.property.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.property.domain.ResidentUnit;
import org.dromara.property.domain.vo.ResidentUnitVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
* @author mocheng
* @date 2025-06-19
*/
@Mapper
public interface ResidentUnitMapper extends BaseMapperPlus<ResidentUnit, ResidentUnitVo> {
}

2
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/ServerBookingMapper.java
View File

@@ -1,5 +1,6 @@
package org.dromara.property.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.property.domain.ServerBooking;
import org.dromara.property.domain.vo.ServerBookingVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
* @author mocheng
* @date 2025-06-21
*/
@Mapper
public interface ServerBookingMapper extends BaseMapperPlus<ServerBooking, ServerBookingVo> {
}

2
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/ServerMapper.java
View File

@@ -1,5 +1,6 @@
package org.dromara.property.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.property.domain.Server;
import org.dromara.property.domain.vo.ServerVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
* @author mocheng
* @date 2025-06-21
*/
@Mapper
public interface ServerMapper extends BaseMapperPlus<Server, ServerVo> {
}

2
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/ServiceWarningMapper.java
View File

@@ -1,5 +1,6 @@
package org.dromara.property.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.property.domain.ServiceWarning;
import org.dromara.property.domain.vo.ServiceWarningVo;
@@ -11,6 +12,7 @@ Mapper接口
* @author mocheng
* @date 2025-07-08
*/
@Mapper
public interface ServiceWarningMapper extends BaseMapperPlus<ServiceWarning, ServiceWarningVo> {
}

4
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/ServiceWorkOrdersMapper.java
View File

@@ -1,15 +1,17 @@
package org.dromara.property.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.property.domain.ServiceWorkOrders;
import org.dromara.property.domain.vo.ServiceWorkOrdersVo;
/**
* 【请填写功能名称】Mapper接口
* 【工单处理】Mapper接口
*
* @author mocheng
* @date 2025-07-07
*/
@Mapper
public interface ServiceWorkOrdersMapper extends BaseMapperPlus<ServiceWorkOrders, ServiceWorkOrdersVo> {
}

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

@@ -0,0 +1,17 @@
package org.dromara.property.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.property.domain.ServiceWorkOrdersType;
import org.dromara.property.domain.vo.ServiceWorkOrdersTypeVo;
/**
* 【工单类型】Mapper接口
*
* @author mocheng
* @date 2025-07-09
*/
@Mapper
public interface ServiceWorkOrdersTypeMapper extends BaseMapperPlus<ServiceWorkOrdersType, ServiceWorkOrdersTypeVo> {
}

2
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/SuppliersMapper.java
View File

@@ -1,5 +1,6 @@
package org.dromara.property.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.property.domain.Suppliers;
import org.dromara.property.domain.vo.SuppliersVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
* @author mocheng
* @date 2025-06-21
*/
@Mapper
public interface SuppliersMapper extends BaseMapperPlus<Suppliers, SuppliersVo> {
}

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

@@ -1,5 +1,6 @@
package org.dromara.property.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.property.domain.SysCityArea;
@@ -15,6 +16,7 @@ import java.util.List;
* @author mocheng
* @date 2025-06-18
*/
@Mapper
public interface SysCityAreaMapper extends BaseMapperPlus<SysCityArea, SysCityAreaVo> {
@Select("select * from sys_city_area")

2
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbAreaGroupMapper.java
View File

@@ -1,5 +1,6 @@
package org.dromara.property.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.property.domain.TbAreaGroup;
import org.dromara.property.domain.vo.TbAreaGroupVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
* @author dy
* @date 2025-06-25
*/
@Mapper
public interface TbAreaGroupMapper extends BaseMapperPlus<TbAreaGroup, TbAreaGroupVo> {
}

2
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbBuildingMapper.java
View File

@@ -1,5 +1,6 @@
package org.dromara.property.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.property.domain.TbBuilding;
import org.dromara.property.domain.vo.TbBuildingVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
* @author mocheng
* @date 2025-06-26
*/
@Mapper
public interface TbBuildingMapper extends BaseMapperPlus<TbBuilding, TbBuildingVo> {
}

2
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbCeremonialServeMapper.java
View File

@@ -1,5 +1,6 @@
package org.dromara.property.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.property.domain.TbCeremonialServe;
import org.dromara.property.domain.vo.TbCeremonialServeVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
* @author mocheng
* @date 2025-06-18
*/
@Mapper
public interface TbCeremonialServeMapper extends BaseMapperPlus<TbCeremonialServe, TbCeremonialServeVo> {
}

2
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbCeremonialserveRoombookingMapper.java
View File

@@ -1,5 +1,6 @@
package org.dromara.property.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.property.domain.TbCeremonialserveRoombooking;
import org.dromara.property.domain.vo.TbCeremonialserveRoombookingVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
* @author mocheng
* @date 2025-06-18
*/
@Mapper
public interface TbCeremonialserveRoombookingMapper extends BaseMapperPlus<TbCeremonialserveRoombooking, TbCeremonialserveRoombookingVo> {
}

2
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbCommunityMapper.java
View File

@@ -1,5 +1,6 @@
package org.dromara.property.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.property.domain.TbCommunity;
import org.dromara.property.domain.vo.TbCommunityVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
* @author mocheng
* @date 2025-06-26
*/
@Mapper
public interface TbCommunityMapper extends BaseMapperPlus<TbCommunity, TbCommunityVo> {
}

2
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbConferenceMapper.java
View File

@@ -1,5 +1,6 @@
package org.dromara.property.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.property.domain.TbConference;
import org.dromara.property.domain.vo.TbConferenceVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
* @author mocheng
* @date 2025-06-18
*/
@Mapper
public interface TbConferenceMapper extends BaseMapperPlus<TbConference, TbConferenceVo> {
}

2
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbE8ConfigMapper.java
View File

@@ -1,5 +1,6 @@
package org.dromara.property.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.property.domain.TbE8Config;
import org.dromara.property.domain.vo.TbE8ConfigVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
* @author mocheng
* @date 2025-06-18
*/
@Mapper
public interface TbE8ConfigMapper extends BaseMapperPlus<TbE8Config, TbE8ConfigVo> {
}

2
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbFloorMapper.java
View File

@@ -1,5 +1,6 @@
package org.dromara.property.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.property.domain.TbFloor;
import org.dromara.property.domain.vo.TbFloorVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
* @author mocheng
* @date 2025-06-26
*/
@Mapper
public interface TbFloorMapper extends BaseMapperPlus<TbFloor, TbFloorVo> {
}

2
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbRoomBookingMapper.java
View File

@@ -1,5 +1,6 @@
package org.dromara.property.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.property.domain.TbRoomBooking;
import org.dromara.property.domain.vo.TbRoomBookingVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
* @author mocheng
* @date 2025-06-18
*/
@Mapper
public interface TbRoomBookingMapper extends BaseMapperPlus<TbRoomBooking, TbRoomBookingVo> {
}

2
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbRoomMapper.java
View File

@@ -1,5 +1,6 @@
package org.dromara.property.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.property.domain.TbRoom;
import org.dromara.property.domain.vo.TbRoomVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -13,6 +14,7 @@ import java.util.Map;
* @author mocheng
* @date 2025-06-26
*/
@Mapper
public interface TbRoomMapper extends BaseMapperPlus<TbRoom, TbRoomVo> {
//查询房间名称

2
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbServiceClassificationMapper.java
View File

@@ -1,5 +1,6 @@
package org.dromara.property.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.property.domain.TbServiceClassification;
import org.dromara.property.domain.vo.TbServiceClassificationVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
* @author mocheng
* @date 2025-06-17
*/
@Mapper
public interface TbServiceClassificationMapper extends BaseMapperPlus<TbServiceClassification, TbServiceClassificationVo> {
}

2
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbUnitMapper.java
View File

@@ -1,5 +1,6 @@
package org.dromara.property.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.property.domain.TbUnit;
import org.dromara.property.domain.vo.TbUnitVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
* @author mocheng
* @date 2025-06-26
*/
@Mapper
public interface TbUnitMapper extends BaseMapperPlus<TbUnit, TbUnitVo> {
}

2
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbUserGroupMapper.java
View File

@@ -1,5 +1,6 @@
package org.dromara.property.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.property.domain.TbUserGroup;
import org.dromara.property.domain.vo.TbUserGroupVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
* @author dy
* @date 2025-06-25
*/
@Mapper
public interface TbUserGroupMapper extends BaseMapperPlus<TbUserGroup, TbUserGroupVo> {
}

2
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbVisitorManagementMapper.java
View File

@@ -1,5 +1,6 @@
package org.dromara.property.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.property.domain.TbVisitorManagement;
import org.dromara.property.domain.vo.TbVisitorManagementVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
* @author mocheng
* @date 2025-06-19
*/
@Mapper
public interface TbVisitorManagementMapper extends BaseMapperPlus<TbVisitorManagement, TbVisitorManagementVo> {
}

2
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TdDeviceTypeMapper.java
View File

@@ -1,5 +1,6 @@
package org.dromara.property.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.property.domain.TdDeviceType;
import org.dromara.property.domain.vo.TdDeviceTypeVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
* @author mocheng
* @date 2025-06-18
*/
@Mapper
public interface TdDeviceTypeMapper extends BaseMapperPlus<TdDeviceType, TdDeviceTypeVo> {
}

2
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TdFactoryMapper.java
View File

@@ -1,5 +1,6 @@
package org.dromara.property.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.property.domain.TdFactory;
import org.dromara.property.domain.vo.TdFactoryVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
* @author mocheng
* @date 2025-06-18
*/
@Mapper
public interface TdFactoryMapper extends BaseMapperPlus<TdFactory, TdFactoryVo> {
}

2
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TsConfigMapper.java
View File

@@ -1,5 +1,6 @@
package org.dromara.property.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.property.domain.TsConfig;
import org.dromara.property.domain.vo.TsConfigVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
* @author mocheng
* @date 2025-06-18
*/
@Mapper
public interface TsConfigMapper extends BaseMapperPlus<TsConfig, TsConfigVo> {
}

2
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TsOperationLogMapper.java
View File

@@ -1,5 +1,6 @@
package org.dromara.property.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.property.domain.TsOperationLog;
import org.dromara.property.domain.vo.TsOperationLogVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
* @author mocheng
* @date 2025-06-18
*/
@Mapper
public interface TsOperationLogMapper extends BaseMapperPlus<TsOperationLog, TsOperationLogVo> {
}

2
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/VerificationMapper.java
View File

@@ -1,5 +1,6 @@
package org.dromara.property.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.property.domain.Verification;
import org.dromara.property.domain.vo.VerificationVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
* @author mocheng
* @date 2025-06-21
*/
@Mapper
public interface VerificationMapper extends BaseMapperPlus<Verification, VerificationVo> {
}

27
ruoyi-modules/Property/src/main/java/org/dromara/property/service/IServiceWorkOrdersService.java
View File

@@ -3,13 +3,14 @@ package org.dromara.property.service;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.property.domain.bo.ServiceWorkOrdersBo;
import org.dromara.property.domain.vo.ServiceWorkOrdersInfoVo;
import org.dromara.property.domain.vo.ServiceWorkOrdersVo;
import java.util.Collection;
import java.util.List;
/**
* 【请填写功能名称】Service接口
* 【工单处理】Service接口
*
* @author mocheng
* @date 2025-07-07
@@ -17,48 +18,48 @@ import java.util.List;
public interface IServiceWorkOrdersService {
/**
* 查询【请填写功能名称】
* 查询【工单处理】
*
* @param id 主键
* @return 【请填写功能名称】
* @return 【工单处理】
*/
ServiceWorkOrdersVo queryById(Long id);
ServiceWorkOrdersInfoVo queryById(Long id);
/**
* 分页查询【请填写功能名称】列表
* 分页查询【工单处理】列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 【请填写功能名称】分页列表
* @return 【工单处理】分页列表
*/
TableDataInfo<ServiceWorkOrdersVo> queryPageList(ServiceWorkOrdersBo bo, PageQuery pageQuery);
/**
* 查询符合条件的【请填写功能名称】列表
* 查询符合条件的【工单处理】列表
*
* @param bo 查询条件
* @return 【请填写功能名称】列表
* @return 【工单处理】列表
*/
List<ServiceWorkOrdersVo> queryList(ServiceWorkOrdersBo bo);
/**
* 新增【请填写功能名称】
* 新增【工单处理】
*
* @param bo 【请填写功能名称】
* @param bo 【工单处理】
* @return 是否新增成功
*/
Boolean insertByBo(ServiceWorkOrdersBo bo);
/**
* 修改【请填写功能名称】
* 修改【工单处理】
*
* @param bo 【请填写功能名称】
* @param bo 【工单处理】
* @return 是否修改成功
*/
Boolean updateByBo(ServiceWorkOrdersBo bo);
/**
* 校验并批量删除【请填写功能名称】信息
* 校验并批量删除【工单处理】信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验

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

@@ -0,0 +1,68 @@
package org.dromara.property.service;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.property.domain.bo.ServiceWorkOrdersTypeBo;
import org.dromara.property.domain.vo.ServiceWorkOrdersTypeVo;
import java.util.Collection;
import java.util.List;
/**
* 【工单类型】Service接口
*
* @author mocheng
* @date 2025-07-09
*/
public interface IServiceWorkOrdersTypeService {
/**
* 查询【工单类型】
*
* @param id 主键
* @return 【工单类型】
*/
ServiceWorkOrdersTypeVo queryById(Long id);
/**
* 分页查询【工单类型】列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 【工单类型】分页列表
*/
TableDataInfo<ServiceWorkOrdersTypeVo> queryPageList(ServiceWorkOrdersTypeBo bo, PageQuery pageQuery);
/**
* 查询符合条件的【工单类型】列表
*
* @param bo 查询条件
* @return 【工单类型】列表
*/
List<ServiceWorkOrdersTypeVo> queryList(ServiceWorkOrdersTypeBo bo);
/**
* 新增【工单类型】
*
* @param bo 【工单类型】
* @return 是否新增成功
*/
Boolean insertByBo(ServiceWorkOrdersTypeBo bo);
/**
* 修改【工单类型】
*
* @param bo 【工单类型】
* @return 是否修改成功
*/
Boolean updateByBo(ServiceWorkOrdersTypeBo bo);
/**
* 校验并批量删除【工单类型】信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

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

@@ -17,6 +17,7 @@ import org.dromara.property.domain.vo.MeetAttachVo;
import org.dromara.property.domain.MeetAttach;
import org.dromara.property.mapper.MeetAttachMapper;
import org.dromara.property.service.IMeetAttachService;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Map;
@@ -93,6 +94,7 @@ public class MeetAttachServiceImpl implements IMeetAttachService {
* @return 是否新增成功
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean insertByBo(MeetAttachBo bo) {
MeetAttach add = MapstructUtils.convert(bo, MeetAttach.class);
validEntityBeforeSave(add);
@@ -110,6 +112,7 @@ public class MeetAttachServiceImpl implements IMeetAttachService {
* @return 是否修改成功
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean updateByBo(MeetAttachBo bo) {
MeetAttach update = MapstructUtils.convert(bo, MeetAttach.class);
validEntityBeforeSave(update);
@@ -131,6 +134,7 @@ public class MeetAttachServiceImpl implements IMeetAttachService {
* @return 是否删除成功
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验

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

@@ -1,12 +1,17 @@
package org.dromara.property.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.rabbitmq.client.Return;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.exception.base.BaseException;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.PageQuery;
@@ -42,6 +47,7 @@ public class MeetBookingServiceImpl implements IMeetBookingService {
private final MeetAttachOrderMapper meetAttachOrderMapper;
private final ResidentPersonMapper residentPersonMapper;
private final TbRoomMapper roomMapper;
private final MeetMapper meetMapper;
private final ResidentUnitMapper residentUnitMapper;
/**
@@ -54,12 +60,13 @@ public class MeetBookingServiceImpl implements IMeetBookingService {
public MeetBookingDetailVo queryById(Long id) {
MeetBookingVo meetBookingVo = baseMapper.selectVoById(id);
MeetBookingDetailVo meetBookingDetailVo = BeanUtil.copyProperties(meetBookingVo, MeetBookingDetailVo.class);
String locationName = roomMapper.queryRoomName(Long.valueOf(meetBookingDetailVo.getMeetLocation()));
MeetVo meetVo = meetMapper.selectVoById(meetBookingDetailVo.getMeetId());
String locationName = roomMapper.queryRoomName(Long.valueOf(meetVo.getLocation()));
meetBookingDetailVo.setLocationName(locationName);
ResidentPersonVo residentPersonVo = residentPersonMapper.selectVoById(meetBookingDetailVo.getPerson());
ResidentPersonVo residentPersonVo = residentPersonMapper.selectVoById(Long.valueOf(meetBookingVo.getPerson()));
meetBookingDetailVo.setPersonName(residentPersonVo.getUserName());
meetBookingDetailVo.setPerson(residentPersonVo.getPhone());
ResidentUnitVo residentUnitVo = residentUnitMapper.selectVoById(meetBookingDetailVo.getUnit());
meetBookingDetailVo.setPhone(residentPersonVo.getPhone());
ResidentUnitVo residentUnitVo = residentUnitMapper.selectVoById(Long.valueOf(meetBookingVo.getUnit()));
meetBookingDetailVo.setUnitName(residentUnitVo.getName());
return meetBookingDetailVo;
}
@@ -75,7 +82,30 @@ public class MeetBookingServiceImpl implements IMeetBookingService {
public TableDataInfo<MeetBookingVo> queryPageList(MeetBookingBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<MeetBooking> lqw = buildQueryWrapper(bo);
Page<MeetBookingVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
List<String> units = result.getRecords().stream()
.map(vo -> vo.getUnit())
.distinct()
.collect(Collectors.toList());
List<String> persons = result.getRecords().stream()
.map(vo -> vo.getPerson())
.distinct()
.collect(Collectors.toList());
List<ResidentUnitVo> residentUnitVolist = residentUnitMapper.selectVoByIds(units);
List<ResidentPersonVo> residentPersonsVolist = residentPersonMapper.selectVoByIds(persons);
List<MeetBookingVo> meetBookingVoList = new ArrayList<>();
result.getRecords().stream().forEach(s -> {
ResidentUnitVo residentUnitVo = residentUnitVolist.stream()
.filter(vo -> vo.getId() != null && String.valueOf(vo.getId()).equals(s.getUnit())).findFirst().orElse(null);
s.setUnitName(residentUnitVo.getName());
ResidentPersonVo residentPersonVo = residentPersonsVolist.stream()
.filter(vo -> vo.getId() != null && String.valueOf(vo.getId()).equals(s.getPerson())).findFirst().orElse(null);
s.setPersonName(residentPersonVo.getUserName());
s.setPhone(residentPersonVo.getPhone());
meetBookingVoList.add(s);
});
return TableDataInfo.build(new Page<MeetBookingVo>().setRecords(meetBookingVoList));
}
/**
@@ -93,6 +123,9 @@ public class MeetBookingServiceImpl implements IMeetBookingService {
.le(MeetBooking::getScheduledStarttime, endOfDay)
.ge(MeetBooking::getScheduledEndtime, startOfDay);
List<MeetBooking> meetBookings = baseMapper.selectList(meetBookingLambdaQueryWrapper);
if (CollectionUtil.isEmpty(meetBookings)) {
return new ArrayList<>();
}
List<MeetBookingAppointmentVo> meetBookingAppointmentVoList = BeanUtil.copyToList(meetBookings, MeetBookingAppointmentVo.class);
SimpleDateFormat df = new SimpleDateFormat("HH");
List<String> units = meetBookingAppointmentVoList.stream()
@@ -113,24 +146,10 @@ public class MeetBookingServiceImpl implements IMeetBookingService {
ResidentPersonVo residentPersonVo = residentPersonsVolist.stream()
.filter(vo -> vo.getId() != null && String.valueOf(vo.getId()).equals(s.getPerson())).findFirst().orElse(null);
s.setPersonName(residentPersonVo.getUserName());
s.setPhone(residentPersonVo.getPhone());
String str = df.format(s.getScheduledStarttime());
int a = Integer.parseInt(str);
if (a >= 0 && a <= 6) {
s.setSlots("凌晨");
}
if (a > 6 && a <= 12) {
s.setSlots("上午");
}
if (a > 12 && a <= 13) {
s.setSlots("中午");
}
if (a > 13 && a <= 18) {
s.setSlots("下午");
}
if (a > 18 && a <= 24) {
s.setSlots("晚上");
}
s.setSlots(a <= 12 ? "上午" : "下午");
}
);
return meetBookingAppointmentVoList;
@@ -165,6 +184,9 @@ public class MeetBookingServiceImpl implements IMeetBookingService {
.ge(MeetBooking::getScheduledStarttime, startOfWeek)
.le(MeetBooking::getScheduledEndtime, endOfWeek);
List<MeetBookingVo> meetBookingVoList = baseMapper.selectVoList(bookingLambdaQueryWrapper);
if (CollectionUtil.isEmpty(meetBookingVoList)) {
return new ArrayList<>();
}
List<MeetBookingWeekVo> meetBookingWeekVoList = BeanUtil.copyToList(meetBookingVoList, MeetBookingWeekVo.class);
String[] weekStr = {"星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"};
List<MeetBookingWeekVo> meetBookingWeekList = new ArrayList<>();
@@ -193,21 +215,7 @@ public class MeetBookingServiceImpl implements IMeetBookingService {
s.setWeek(weekStr[firstDayOfWeek - 1]);
String str = df.format(s.getScheduledStarttime());
int a = Integer.parseInt(str);
if (a >= 0 && a <= 6) {
s.setSlots("凌晨");
}
if (a > 6 && a <= 12) {
s.setSlots("上午");
}
if (a > 12 && a <= 13) {
s.setSlots("中午");
}
if (a > 13 && a <= 18) {
s.setSlots("下午");
}
if (a > 18 && a <= 24) {
s.setSlots("晚上");
}
s.setSlots(a <= 12 ? "上午" : "下午");
meetBookingWeekList.add(s);
});
return meetBookingWeekList;
@@ -218,17 +226,6 @@ public class MeetBookingServiceImpl implements IMeetBookingService {
lqw.orderByAsc(MeetBooking::getId);
lqw.like(StringUtils.isNotBlank(bo.getName()), MeetBooking::getName, bo.getName());
lqw.eq(bo.getMeetId() != null, MeetBooking::getMeetId, bo.getMeetId());
lqw.eq(StringUtils.isNotBlank(bo.getMeetLocation()), MeetBooking::getMeetLocation, bo.getMeetLocation());
lqw.eq(StringUtils.isNotBlank(bo.getUnit()), MeetBooking::getUnit, bo.getUnit());
lqw.eq(StringUtils.isNotBlank(bo.getPerson()), MeetBooking::getPerson, bo.getPerson());
lqw.eq(StringUtils.isNotBlank(bo.getPhone()), MeetBooking::getPhone, bo.getPhone());
lqw.eq(bo.getScheduledStarttime() != null, MeetBooking::getScheduledStarttime, bo.getScheduledStarttime());
lqw.eq(bo.getScheduledEndtime() != null, MeetBooking::getScheduledEndtime, bo.getScheduledEndtime());
// lqw.eq(ObjectUtil.isNotEmpty(bo.getPersonSum()), MeetBooking::getPersonSum, bo.getPersonSum());
lqw.eq(ObjectUtil.isNotEmpty(bo.getPrice()), MeetBooking::getPrice, bo.getPrice());
lqw.eq(ObjectUtil.isNotEmpty(bo.getAttach()), MeetBooking::getAttach, bo.getAttach());
lqw.eq(ObjectUtil.isNotEmpty(bo.getPayState()), MeetBooking::getPayState, bo.getPayState());
lqw.eq(ObjectUtil.isNotEmpty(bo.getState()), MeetBooking::getState, bo.getState());
return lqw;
}
@@ -281,6 +278,7 @@ public class MeetBookingServiceImpl implements IMeetBookingService {
*/
private void validEntityBeforeSave(MeetBooking entity) {
//TODO 做一些数据校验,如唯一约束
}
/**
@@ -291,6 +289,7 @@ public class MeetBookingServiceImpl implements IMeetBookingService {
* @return 是否删除成功
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if (isValid) {
//TODO 做一些业务上的校验,判断是否需要校验

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

@@ -57,8 +57,10 @@ public class MeetServiceImpl implements IMeetService {
public MeetVo queryById(Long id){
MeetVo meetVo= baseMapper.selectVoById(id);
ResidentPersonVo residentPersonVo = residentPersonMapper.selectVoById(meetVo.getPrincipals());
meetVo.setPrincipalsName(residentPersonVo.getUserName());
meetVo.setPhoneNo(residentPersonVo.getPhone());
if(ObjectUtil.isNotEmpty(residentPersonVo)){
meetVo.setPrincipalsName(residentPersonVo.getUserName());
meetVo.setPhoneNo(residentPersonVo.getPhone());
}
String locationName = roomMapper.queryRoomName(Long.valueOf(meetVo.getLocation()));
meetVo.setLocationName(locationName);
return meetVo;

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

@@ -1,5 +1,8 @@
package org.dromara.property.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -10,18 +13,21 @@ import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.property.domain.ServiceWorkOrders;
import org.dromara.property.domain.ServiceWorkOrdersType;
import org.dromara.property.domain.bo.ServiceWorkOrdersBo;
import org.dromara.property.domain.vo.ServiceWorkOrdersVo;
import org.dromara.property.domain.vo.*;
import org.dromara.property.mapper.ResidentPersonMapper;
import org.dromara.property.mapper.ServiceWorkOrdersMapper;
import org.dromara.property.mapper.ServiceWorkOrdersTypeMapper;
import org.dromara.property.service.IServiceWorkOrdersService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;
/**
* 【请填写功能名称】Service业务层处理
* 【工单处理】Service业务层处理
*
* @author mocheng
* @date 2025-07-07
@@ -32,37 +38,70 @@ import java.util.Map;
public class ServiceWorkOrdersServiceImpl implements IServiceWorkOrdersService {
private final ServiceWorkOrdersMapper baseMapper;
private final ServiceWorkOrdersTypeMapper typesMapper;
private final ResidentPersonMapper residentPersonMapper;
/**
* 查询【请填写功能名称】
* 查询【工单处理】
*
* @param id 主键
* @return 【请填写功能名称】
* @return 【工单处理】
*/
@Override
public ServiceWorkOrdersVo queryById(Long id){
return baseMapper.selectVoById(id);
public ServiceWorkOrdersInfoVo queryById(Long id) {
ServiceWorkOrdersVo serviceWorkOrdersVo = baseMapper.selectVoById(id);
ServiceWorkOrdersInfoVo serviceWorkOrdersInfoVo = BeanUtil.copyProperties(serviceWorkOrdersVo, ServiceWorkOrdersInfoVo.class);
ServiceWorkOrdersTypeVo serviceWorkOrdersTypeVo = typesMapper.selectVoById(serviceWorkOrdersVo.getType());
if (Objects.nonNull(serviceWorkOrdersTypeVo)) {
serviceWorkOrdersInfoVo.setTypeName(serviceWorkOrdersTypeVo.getOrderTypeName());
}
ResidentPersonVo residentPersonVo = residentPersonMapper.selectVoById(Long.valueOf(serviceWorkOrdersVo.getInitiatorName()));
if (Objects.nonNull(residentPersonVo)) {
serviceWorkOrdersInfoVo.setInitiatorNameText(residentPersonVo.getUserName());
serviceWorkOrdersInfoVo.setInitiatorPhone(residentPersonVo.getPhone());
}
ResidentPersonVo residentPersonHandler = residentPersonMapper.selectVoById(Long.valueOf(serviceWorkOrdersVo.getHandler()));
if (Objects.nonNull(residentPersonHandler)) {
serviceWorkOrdersInfoVo.setHandlerText(residentPersonHandler.getUserName());
serviceWorkOrdersInfoVo.setHandlerPhone(residentPersonHandler.getPhone());
}
return serviceWorkOrdersInfoVo;
}
/**
* 分页查询【请填写功能名称】列表
* 分页查询【工单处理】列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 【请填写功能名称】分页列表
* @return 【工单处理】分页列表
*/
@Override
public TableDataInfo<ServiceWorkOrdersVo> queryPageList(ServiceWorkOrdersBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<ServiceWorkOrders> lqw = buildQueryWrapper(bo);
Page<ServiceWorkOrdersVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
if (ObjectUtil.isEmpty(result.getRecords())) {
return TableDataInfo.build(result);
}
List<Long> typeList = result.getRecords().stream()
.map(vo -> vo.getType())
.distinct()
.collect(Collectors.toList());
List<ServiceWorkOrdersTypeVo> serviceWorkOrdersTypeVoList = typesMapper.selectVoByIds(typeList);
List<ServiceWorkOrdersVo> serviceWorkOrdersVoList = new ArrayList<>();
result.getRecords().stream().forEach(s -> {
ServiceWorkOrdersTypeVo serviceWorkOrdersTypeVo = serviceWorkOrdersTypeVoList.stream()
.filter(vo -> vo.getId() != null && vo.getId().equals(s.getType())).findFirst().orElse(null);
s.setTypeName(serviceWorkOrdersTypeVo.getOrderTypeName());
serviceWorkOrdersVoList.add(s);
});
return TableDataInfo.build(new Page<ServiceWorkOrdersVo>().setRecords(serviceWorkOrdersVoList));
}
/**
* 查询符合条件的【请填写功能名称】列表
* 查询符合条件的【工单处理】列表
*
* @param bo 查询条件
* @return 【请填写功能名称】列表
* @return 【工单处理】列表
*/
@Override
public List<ServiceWorkOrdersVo> queryList(ServiceWorkOrdersBo bo) {
@@ -76,32 +115,29 @@ public class ServiceWorkOrdersServiceImpl implements IServiceWorkOrdersService {
lqw.orderByAsc(ServiceWorkOrders::getId);
lqw.eq(StringUtils.isNotBlank(bo.getOrderNo()), ServiceWorkOrders::getOrderNo, bo.getOrderNo());
lqw.like(StringUtils.isNotBlank(bo.getOrderName()), ServiceWorkOrders::getOrderName, bo.getOrderName());
lqw.eq(bo.getType() != null, ServiceWorkOrders::getType, bo.getType());
lqw.eq(bo.getStatus() != null, ServiceWorkOrders::getStatus, bo.getStatus());
lqw.eq(bo.getDispatchTime() != null, ServiceWorkOrders::getDispatchTime, bo.getDispatchTime());
lqw.like(StringUtils.isNotBlank(bo.getInitiatorName()), ServiceWorkOrders::getInitiatorName, bo.getInitiatorName());
lqw.eq(StringUtils.isNotBlank(bo.getInitiatorPhone()), ServiceWorkOrders::getInitiatorPhone, bo.getInitiatorPhone());
lqw.eq(StringUtils.isNotBlank(bo.getHandler()), ServiceWorkOrders::getHandler, bo.getHandler());
lqw.eq(StringUtils.isNotBlank(bo.getLocation()), ServiceWorkOrders::getLocation, bo.getLocation());
lqw.eq(bo.getPlanCompleTime() != null, ServiceWorkOrders::getPlanCompleTime, bo.getPlanCompleTime());
lqw.eq(bo.getCompleTime() != null, ServiceWorkOrders::getCompleTime, bo.getCompleTime());
lqw.eq(StringUtils.isNotBlank(bo.getServiceEvalua()), ServiceWorkOrders::getServiceEvalua, bo.getServiceEvalua());
lqw.eq(bo.getIsTimeOut() != null, ServiceWorkOrders::getIsTimeOut, bo.getIsTimeOut());
lqw.eq(bo.getCreateById() != null, ServiceWorkOrders::getCreateById, bo.getCreateById());
lqw.eq(bo.getUpdateById() != null, ServiceWorkOrders::getUpdateById, bo.getUpdateById());
lqw.eq(Objects.nonNull(bo.getServiceEvalua()), ServiceWorkOrders::getServiceEvalua, bo.getServiceEvalua());
lqw.eq(Objects.nonNull(bo.getType()), ServiceWorkOrders::getType, bo.getType());
lqw.eq(StringUtils.isNotBlank(bo.getSearchValue()), ServiceWorkOrders::getSearchValue, bo.getSearchValue());
return lqw;
}
/**
* 新增【请填写功能名称】
* 新增【工单处理】
*
* @param bo 【请填写功能名称】
* @param bo 【工单处理】
* @return 是否新增成功
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean insertByBo(ServiceWorkOrdersBo bo) {
ServiceWorkOrders add = MapstructUtils.convert(bo, ServiceWorkOrders.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
@@ -111,12 +147,13 @@ public class ServiceWorkOrdersServiceImpl implements IServiceWorkOrdersService {
}
/**
* 修改【请填写功能名称】
* 修改【工单处理】
*
* @param bo 【请填写功能名称】
* @param bo 【工单处理】
* @return 是否修改成功
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean updateByBo(ServiceWorkOrdersBo bo) {
ServiceWorkOrders update = MapstructUtils.convert(bo, ServiceWorkOrders.class);
validEntityBeforeSave(update);
@@ -126,20 +163,22 @@ public class ServiceWorkOrdersServiceImpl implements IServiceWorkOrdersService {
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(ServiceWorkOrders entity){
private void validEntityBeforeSave(ServiceWorkOrders entity) {
//TODO 做一些数据校验,如唯一约束
entity.setOrderNo("GD" + IdUtil.getSnowflakeNextIdStr());
}
/**
* 校验并批量删除【请填写功能名称】信息
* 校验并批量删除【工单处理】信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
if (isValid) {
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;

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

@@ -0,0 +1,139 @@
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.dromara.property.domain.ServiceWorkOrdersType;
import org.dromara.property.domain.bo.ServiceWorkOrdersTypeBo;
import org.dromara.property.domain.vo.ServiceWorkOrdersTypeVo;
import org.dromara.property.mapper.ServiceWorkOrdersTypeMapper;
import org.dromara.property.service.IServiceWorkOrdersTypeService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 【工单类型】Service业务层处理
*
* @author mocheng
* @date 2025-07-09
*/
@Slf4j
@RequiredArgsConstructor
@Service
public class ServiceWorkOrdersTypeServiceImpl implements IServiceWorkOrdersTypeService {
private final ServiceWorkOrdersTypeMapper baseMapper;
/**
* 查询【工单类型】
*
* @param id 主键
* @return 【工单类型】
*/
@Override
public ServiceWorkOrdersTypeVo queryById(Long id){
return baseMapper.selectVoById(id);
}
/**
* 分页查询【工单类型】列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 【工单类型】分页列表
*/
@Override
public TableDataInfo<ServiceWorkOrdersTypeVo> queryPageList(ServiceWorkOrdersTypeBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<ServiceWorkOrdersType> lqw = buildQueryWrapper(bo);
Page<ServiceWorkOrdersTypeVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询符合条件的【工单类型】列表
*
* @param bo 查询条件
* @return 【工单类型】列表
*/
@Override
public List<ServiceWorkOrdersTypeVo> queryList(ServiceWorkOrdersTypeBo bo) {
LambdaQueryWrapper<ServiceWorkOrdersType> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<ServiceWorkOrdersType> buildQueryWrapper(ServiceWorkOrdersTypeBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<ServiceWorkOrdersType> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(ServiceWorkOrdersType::getId);
lqw.eq(StringUtils.isNotBlank(bo.getOrderTypeNo()), ServiceWorkOrdersType::getOrderTypeNo, bo.getOrderTypeNo());
lqw.like(StringUtils.isNotBlank(bo.getOrderTypeName()), ServiceWorkOrdersType::getOrderTypeName, bo.getOrderTypeName());
lqw.eq(StringUtils.isNotBlank(bo.getOperationMode()), ServiceWorkOrdersType::getOperationMode, bo.getOperationMode());
lqw.eq(StringUtils.isNotBlank(bo.getSearchValue()), ServiceWorkOrdersType::getSearchValue, bo.getSearchValue());
return lqw;
}
/**
* 新增【工单类型】
*
* @param bo 【工单类型】
* @return 是否新增成功
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean insertByBo(ServiceWorkOrdersTypeBo bo) {
ServiceWorkOrdersType add = MapstructUtils.convert(bo, ServiceWorkOrdersType.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());
}
return flag;
}
/**
* 修改【工单类型】
*
* @param bo 【工单类型】
* @return 是否修改成功
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean updateByBo(ServiceWorkOrdersTypeBo bo) {
ServiceWorkOrdersType update = MapstructUtils.convert(bo, ServiceWorkOrdersType.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(ServiceWorkOrdersType entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 校验并批量删除【工单类型】信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;
}
}