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

物业代码

Browse Source
This commit is contained in:
mocheng
2025-06-18 16:51:52 +08:00
parent 86b20044c9
commit c43170cc87
105 changed files with 373 additions and 475 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbAccessControlController.java
View File

@@ -27,7 +27,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
* 前端访问路由地址为:/property/accessControl
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Validated
@RequiredArgsConstructor

2
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbBuildingController.java
View File

@@ -27,7 +27,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
* 前端访问路由地址为:/property/building
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Validated
@RequiredArgsConstructor

26
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbCeremonialServeController.java
View File

@@ -23,11 +23,11 @@ import org.dromara.property.service.ITbCeremonialServeService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
/**
* 服务
* 会议服务
* 前端访问路由地址为:/property/ceremonialServe
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Validated
@RequiredArgsConstructor
@@ -38,7 +38,7 @@ public class TbCeremonialServeController extends BaseController {
private final ITbCeremonialServeService tbCeremonialServeService;
/**
* 查询服务列表
* 查询会议服务列表
*/
@SaCheckPermission("property:ceremonialServe:list")
@GetMapping("/list")
@@ -47,18 +47,18 @@ public class TbCeremonialServeController extends BaseController {
}
/**
* 导出服务列表
* 导出会议服务列表
*/
@SaCheckPermission("property:ceremonialServe:export")
@Log(title = "服务", businessType = BusinessType.EXPORT)
@Log(title = "会议服务", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(TbCeremonialServeBo bo, HttpServletResponse response) {
List<TbCeremonialServeVo> list = tbCeremonialServeService.queryList(bo);
ExcelUtil.exportExcel(list, "服务", TbCeremonialServeVo.class, response);
ExcelUtil.exportExcel(list, "会议服务", TbCeremonialServeVo.class, response);
}
/**
* 获取服务详细信息
* 获取会议服务详细信息
*
* @param id 主键
*/
@@ -70,10 +70,10 @@ public class TbCeremonialServeController extends BaseController {
}
/**
* 新增服务
* 新增会议服务
*/
@SaCheckPermission("property:ceremonialServe:add")
@Log(title = "服务", businessType = BusinessType.INSERT)
@Log(title = "会议服务", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody TbCeremonialServeBo bo) {
@@ -81,10 +81,10 @@ public class TbCeremonialServeController extends BaseController {
}
/**
* 修改服务
* 修改会议服务
*/
@SaCheckPermission("property:ceremonialServe:edit")
@Log(title = "服务", businessType = BusinessType.UPDATE)
@Log(title = "会议服务", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody TbCeremonialServeBo bo) {
@@ -92,12 +92,12 @@ public class TbCeremonialServeController extends BaseController {
}
/**
* 删除服务
* 删除会议服务
*
* @param ids 主键串
*/
@SaCheckPermission("property:ceremonialServe:remove")
@Log(title = "服务", businessType = BusinessType.DELETE)
@Log(title = "会议服务", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable("ids") Long[] ids) {

26
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbCeremonialserveRoombookingController.java
View File

@@ -23,11 +23,11 @@ import org.dromara.property.service.ITbCeremonialserveRoombookingService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
/**
* 服务订阅
* 会议预定
* 前端访问路由地址为:/property/ceremonialserveRoombooking
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Validated
@RequiredArgsConstructor
@@ -38,7 +38,7 @@ public class TbCeremonialserveRoombookingController extends BaseController {
private final ITbCeremonialserveRoombookingService tbCeremonialserveRoombookingService;
/**
* 查询服务订阅列表
* 查询会议预定列表
*/
@SaCheckPermission("property:ceremonialserveRoombooking:list")
@GetMapping("/list")
@@ -47,18 +47,18 @@ public class TbCeremonialserveRoombookingController extends BaseController {
}
/**
* 导出服务订阅列表
* 导出会议预定列表
*/
@SaCheckPermission("property:ceremonialserveRoombooking:export")
@Log(title = "服务订阅", businessType = BusinessType.EXPORT)
@Log(title = "会议预定", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(TbCeremonialserveRoombookingBo bo, HttpServletResponse response) {
List<TbCeremonialserveRoombookingVo> list = tbCeremonialserveRoombookingService.queryList(bo);
ExcelUtil.exportExcel(list, "服务订阅", TbCeremonialserveRoombookingVo.class, response);
ExcelUtil.exportExcel(list, "会议预定", TbCeremonialserveRoombookingVo.class, response);
}
/**
* 获取服务订阅详细信息
* 获取会议预定详细信息
*
* @param id 主键
*/
@@ -70,10 +70,10 @@ public class TbCeremonialserveRoombookingController extends BaseController {
}
/**
* 新增服务订阅
* 新增会议预定
*/
@SaCheckPermission("property:ceremonialserveRoombooking:add")
@Log(title = "服务订阅", businessType = BusinessType.INSERT)
@Log(title = "会议预定", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody TbCeremonialserveRoombookingBo bo) {
@@ -81,10 +81,10 @@ public class TbCeremonialserveRoombookingController extends BaseController {
}
/**
* 修改服务订阅
* 修改会议预定
*/
@SaCheckPermission("property:ceremonialserveRoombooking:edit")
@Log(title = "服务订阅", businessType = BusinessType.UPDATE)
@Log(title = "会议预定", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody TbCeremonialserveRoombookingBo bo) {
@@ -92,12 +92,12 @@ public class TbCeremonialserveRoombookingController extends BaseController {
}
/**
* 删除服务订阅
* 删除会议预定
*
* @param ids 主键串
*/
@SaCheckPermission("property:ceremonialserveRoombooking:remove")
@Log(title = "服务订阅", businessType = BusinessType.DELETE)
@Log(title = "会议预定", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable("ids") Long[] ids) {

2
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbCityAreaController.java
View File

@@ -28,7 +28,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
* 前端访问路由地址为:/property/cityArea
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Validated
@RequiredArgsConstructor

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

@@ -27,7 +27,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
* 前端访问路由地址为:/property/community
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Validated
@RequiredArgsConstructor

2
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbConferenceController.java
View File

@@ -27,7 +27,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
* 前端访问路由地址为:/property/conference
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Validated
@RequiredArgsConstructor

2
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbE8ConfigController.java
View File

@@ -27,7 +27,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
* 前端访问路由地址为:/property/e8Config
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Validated
@RequiredArgsConstructor

26
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbFloorController.java
View File

@@ -23,11 +23,11 @@ import org.dromara.property.service.ITbFloorService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
/**
* 楼层
* 楼层管理
* 前端访问路由地址为:/property/floor
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Validated
@RequiredArgsConstructor
@@ -38,7 +38,7 @@ public class TbFloorController extends BaseController {
private final ITbFloorService tbFloorService;
/**
* 查询楼层列表
* 查询楼层管理列表
*/
@SaCheckPermission("property:floor:list")
@GetMapping("/list")
@@ -47,18 +47,18 @@ public class TbFloorController extends BaseController {
}
/**
* 导出楼层列表
* 导出楼层管理列表
*/
@SaCheckPermission("property:floor:export")
@Log(title = "楼层", businessType = BusinessType.EXPORT)
@Log(title = "楼层管理", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(TbFloorBo bo, HttpServletResponse response) {
List<TbFloorVo> list = tbFloorService.queryList(bo);
ExcelUtil.exportExcel(list, "楼层", TbFloorVo.class, response);
ExcelUtil.exportExcel(list, "楼层管理", TbFloorVo.class, response);
}
/**
* 获取楼层详细信息
* 获取楼层管理详细信息
*
* @param id 主键
*/
@@ -70,10 +70,10 @@ public class TbFloorController extends BaseController {
}
/**
* 新增楼层
* 新增楼层管理
*/
@SaCheckPermission("property:floor:add")
@Log(title = "楼层", businessType = BusinessType.INSERT)
@Log(title = "楼层管理", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody TbFloorBo bo) {
@@ -81,10 +81,10 @@ public class TbFloorController extends BaseController {
}
/**
* 修改楼层
* 修改楼层管理
*/
@SaCheckPermission("property:floor:edit")
@Log(title = "楼层", businessType = BusinessType.UPDATE)
@Log(title = "楼层管理", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody TbFloorBo bo) {
@@ -92,12 +92,12 @@ public class TbFloorController extends BaseController {
}
/**
* 删除楼层
* 删除楼层管理
*
* @param ids 主键串
*/
@SaCheckPermission("property:floor:remove")
@Log(title = "楼层", businessType = BusinessType.DELETE)
@Log(title = "楼层管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable("ids") Long[] ids) {

2
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbRoomBookingController.java
View File

@@ -27,7 +27,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
* 前端访问路由地址为:/property/roomBooking
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Validated
@RequiredArgsConstructor

2
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbVisitorManagementController.java
View File

@@ -27,7 +27,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
* 前端访问路由地址为:/property/visitorManagement
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Validated
@RequiredArgsConstructor

2
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TdDeviceTypeController.java
View File

@@ -27,7 +27,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
* 前端访问路由地址为:/property/deviceType
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Validated
@RequiredArgsConstructor

2
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TdFactoryController.java
View File

@@ -27,7 +27,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
* 前端访问路由地址为:/property/factory
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Validated
@RequiredArgsConstructor

2
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TsConfigController.java
View File

@@ -27,7 +27,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
* 前端访问路由地址为:/property/config
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Validated
@RequiredArgsConstructor

2
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TsOperationLogController.java
View File

@@ -27,7 +27,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
* 前端访问路由地址为:/property/operationLog
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Validated
@RequiredArgsConstructor

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

@@ -1,11 +1,9 @@
package org.dromara.property.domain;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.tenant.core.TenantEntity;
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;
@@ -13,18 +11,18 @@ import java.io.Serial;
* 门禁管理对象 tb_access_control
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("tb_access_control")
public class TbAccessControl extends BaseEntity {
public class TbAccessControl extends TenantEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* id
*
*/
@TableId(value = "id")
private Long id;
@@ -55,7 +53,7 @@ public class TbAccessControl extends BaseEntity {
private String accessIp;
/**
* 设备端口
*
*/
private Long accessPort;
@@ -65,7 +63,7 @@ public class TbAccessControl extends BaseEntity {
private Long accssType;
/**
* 工程编号
*
*/
private String factoryCode;
@@ -95,14 +93,9 @@ public class TbAccessControl extends BaseEntity {
private Long dataState;
/**
* 创建人
* 搜索值
*/
private Long createEmpId;
/**
* 修改时间
*/
private Date modifyTime;
private String searchValue;
}

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

@@ -13,7 +13,7 @@ import java.io.Serial;
* 建筑管理对象 tb_building
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Data
@EqualsAndHashCode(callSuper = true)

4
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbCeremonialServe.java
View File

@@ -12,10 +12,10 @@ import org.dromara.common.translation.constant.TransConstant;
import java.io.Serial;
/**
* 服务对象 tb_ceremonial_serve
* 会议服务对象 tb_ceremonial_serve
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Data
@EqualsAndHashCode(callSuper = true)

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

@@ -1,6 +1,6 @@
package org.dromara.property.domain;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.tenant.core.TenantEntity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -8,15 +8,15 @@ import lombok.EqualsAndHashCode;
import java.io.Serial;
/**
* 服务订阅对象 tb_ceremonialserve_roombooking
* 会议预定对象 tb_ceremonialserve_roombooking
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("tb_ceremonialserve_roombooking")
public class TbCeremonialserveRoombooking extends BaseEntity {
public class TbCeremonialserveRoombooking extends TenantEntity {
@Serial
private static final long serialVersionUID = 1L;
@@ -42,5 +42,10 @@ public class TbCeremonialserveRoombooking extends BaseEntity {
*/
private Long totalPrice;
/**
* 搜索值
*/
private String searchValue;
}

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

@@ -12,7 +12,7 @@ import java.io.Serial;
对象 tb_city_area
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Data
@EqualsAndHashCode(callSuper = true)

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

@@ -4,8 +4,10 @@ import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.dromara.common.translation.annotation.Translation;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.common.translation.constant.TransConstant;
import java.io.Serial;
@@ -13,7 +15,7 @@ import java.io.Serial;
* 小区管理对象 tb_community
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Data
@EqualsAndHashCode(callSuper = true)

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

@@ -13,7 +13,7 @@ import java.io.Serial;
* 会议室管理对象 tb_conference
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Data
@EqualsAndHashCode(callSuper = true)

4
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbE8Config.java
View File

@@ -13,7 +13,7 @@ import java.io.Serial;
* E8服务地址对象 tb_e8_config
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Data
@EqualsAndHashCode(callSuper = true)
@@ -24,7 +24,7 @@ public class TbE8Config extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
*
* ID
*/
@TableId(value = "id")
private Long id;

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

@@ -1,6 +1,6 @@
package org.dromara.property.domain;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.tenant.core.TenantEntity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -10,21 +10,21 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import java.io.Serial;
/**
* 楼层对象 tb_floor
* 楼层管理对象 tb_floor
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("tb_floor")
public class TbFloor extends BaseEntity {
public class TbFloor extends TenantEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* 数据库id
*
*/
@TableId(value = "id")
private Long id;
@@ -69,5 +69,10 @@ public class TbFloor extends BaseEntity {
*/
private Date modifyTime;
/**
* 搜索值
*/
private String searchValue;
}

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

@@ -13,7 +13,7 @@ import java.io.Serial;
* 会议管理对象 tb_room_booking
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Data
@EqualsAndHashCode(callSuper = true)

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

@@ -13,7 +13,7 @@ import java.io.Serial;
* 访客管理对象 tb_visitor_management
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Data
@EqualsAndHashCode(callSuper = true)

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

@@ -13,7 +13,7 @@ import java.io.Serial;
* 设备类型对象 td_device_type
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Data
@EqualsAndHashCode(callSuper = true)

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

@@ -13,7 +13,7 @@ import java.io.Serial;
* 厂商管理对象 td_factory
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Data
@EqualsAndHashCode(callSuper = true)

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

@@ -13,7 +13,7 @@ import java.io.Serial;
* 代码配置对象 ts_config
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Data
@EqualsAndHashCode(callSuper = true)

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

@@ -13,7 +13,7 @@ import java.io.Serial;
* 请求日志对象 ts_operation_log
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Data
@EqualsAndHashCode(callSuper = true)

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

@@ -8,14 +8,12 @@ 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;
/**
* 门禁管理业务对象 tb_access_control
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Data
@EqualsAndHashCode(callSuper = true)
@@ -23,8 +21,9 @@ import com.fasterxml.jackson.annotation.JsonFormat;
public class TbAccessControlBo extends BaseEntity {
/**
* id
*
*/
@NotNull(message = "不能为空", groups = { EditGroup.class })
private Long id;
/**
@@ -57,7 +56,7 @@ public class TbAccessControlBo extends BaseEntity {
private String accessIp;
/**
* 设备端口
*
*/
private Long accessPort;
@@ -68,9 +67,9 @@ public class TbAccessControlBo extends BaseEntity {
private Long accssType;
/**
* 工程编号
*
*/
@NotBlank(message = "工程编号不能为空", groups = { AddGroup.class, EditGroup.class })
@NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
private String factoryCode;
/**
@@ -101,5 +100,10 @@ public class TbAccessControlBo extends BaseEntity {
@NotNull(message = "数据状态：1有效，0无效不能为空", groups = { AddGroup.class, EditGroup.class })
private Long dataState;
/**
* 搜索值
*/
private String searchValue;
}

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

@@ -15,7 +15,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
* 建筑管理业务对象 tb_building
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Data
@EqualsAndHashCode(callSuper = true)
@@ -159,10 +159,5 @@ public class TbBuildingBo extends BaseEntity {
@NotBlank(message = "组织编码不能为空", groups = { AddGroup.class, EditGroup.class })
private String orgCode;
/**
* 数据状态：1有效，0无效
*/
private Long dataState;
}

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

@@ -14,10 +14,10 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.common.translation.constant.TransConstant;
/**
* 服务业务对象 tb_ceremonial_serve
* 会议服务业务对象 tb_ceremonial_serve
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Data
@EqualsAndHashCode(callSuper = true)
@@ -27,82 +27,72 @@ public class TbCeremonialServeBo extends BaseEntity {
/**
* id
*/
@NotNull(message = "id不能为空", groups = { EditGroup.class })
private Long id;
/**
* 分类id
*/
@NotNull(message = "分类id不能为空", groups = { AddGroup.class, EditGroup.class })
private Long classificationId;
/**
* 预订id
*/
@NotNull(message = "预订id不能为空", groups = { AddGroup.class, EditGroup.class })
private Long roomBookId;
/**
* 服务数量
*/
@NotNull(message = "服务数量不能为空", groups = { AddGroup.class, EditGroup.class })
private Long serveNum;
/**
* 服务分类
*/
@NotNull(message = "服务分类不能为空", groups = { AddGroup.class, EditGroup.class })
private Long serveType;
/**
* 产品名称
*/
@NotBlank(message = "产品名称不能为空", groups = { AddGroup.class, EditGroup.class })
private String serveName;
/**
* 预订状态（0：待确认，1：已确认，2：已取消，3：已完成）
*/
@NotNull(message = "预订状态（0：待确认，1：已确认，2：已取消，3：已完成）不能为空", groups = { AddGroup.class, EditGroup.class })
private Long serveStatus;
/**
* 创建人id
*/
private Long createById;
/**
* 更新人id
*/
private Long updateById;
/**
* 确认人id
*/
private Long confirmId;
/**
* 服务开始时间
*/
@NotNull(message = "服务开始时间不能为空", groups = { AddGroup.class, EditGroup.class })
private Date beginTime;
/**
* 服务结束时间
*/
@NotNull(message = "服务结束时间不能为空", groups = { AddGroup.class, EditGroup.class })
private Date endTime;
/**
* 服务总价格
*/
@NotNull(message = "服务总价格不能为空", groups = { AddGroup.class, EditGroup.class })
private Long servePrice;
/**
* 数据状态（模拟删除 0:删除 1:未删除）
*/
private Long dataStauts;
/**
* 产品图片
*/
@NotBlank(message = "产品图片不能为空", groups = { AddGroup.class, EditGroup.class })
private String serveImage;
/**
* 排序
*/
@NotNull(message = "排序不能为空", groups = { AddGroup.class, EditGroup.class })
private Long sort;

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

@@ -10,10 +10,10 @@ import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
/**
* 服务订阅业务对象 tb_ceremonialserve_roombooking
* 会议预定业务对象 tb_ceremonialserve_roombooking
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Data
@EqualsAndHashCode(callSuper = true)
@@ -23,23 +23,31 @@ public class TbCeremonialserveRoombookingBo extends BaseEntity {
/**
* id
*/
// @NotNull(message = "id不能为空", groups = { EditGroup.class })
private Long id;
/**
* 服务id
*/
@NotNull(message = "服务id不能为空", groups = { AddGroup.class, EditGroup.class })
private Long ceremonialServeId;
/**
* 预订id
*/
@NotNull(message = "预订id不能为空", groups = { AddGroup.class, EditGroup.class })
private Long roomBookingId;
/**
* 服务和预订总价格
*/
@NotNull(message = "服务和预订总价格不能为空", groups = { AddGroup.class, EditGroup.class })
private Long totalPrice;
/**
* 搜索值
*/
@NotBlank(message = "搜索值不能为空", groups = { AddGroup.class, EditGroup.class })
private String searchValue;
}

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

@@ -14,7 +14,7 @@ import jakarta.validation.constraints.*;
业务对象 tb_city_area
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Data
@EqualsAndHashCode(callSuper = true)
@@ -24,7 +24,6 @@ public class TbCityAreaBo extends BaseEntity {
/**
* 主键ID
*/
@NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
private Long id;
/**
@@ -69,11 +68,5 @@ public class TbCityAreaBo 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;
}

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

@@ -8,14 +8,16 @@ import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import org.dromara.common.translation.annotation.Translation;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.common.translation.constant.TransConstant;
/**
* 小区管理业务对象 tb_community
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Data
@EqualsAndHashCode(callSuper = true)
@@ -25,7 +27,6 @@ public class TbCommunityBo extends BaseEntity {
/**
* 主键id
*/
@NotNull(message = "主键id不能为空", groups = { EditGroup.class })
private Long id;
/**
@@ -96,7 +97,6 @@ public class TbCommunityBo extends BaseEntity {
/**
* 数据状态：1有效，0无效
*/
@NotNull(message = "数据状态：1有效，0无效不能为空", groups = { AddGroup.class, EditGroup.class })
private Long dataState;

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

@@ -15,7 +15,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
* 会议室管理业务对象 tb_conference
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Data
@EqualsAndHashCode(callSuper = true)

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

@@ -15,7 +15,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
* E8服务地址业务对象 tb_e8_config
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Data
@EqualsAndHashCode(callSuper = true)
@@ -23,9 +23,8 @@ import com.fasterxml.jackson.annotation.JsonFormat;
public class TbE8ConfigBo extends BaseEntity {
/**
*
* ID
*/
@NotNull(message = "不能为空", groups = { EditGroup.class })
private Long id;
/**
@@ -55,7 +54,6 @@ public class TbE8ConfigBo extends BaseEntity {
/**
* 数据状态：1有效，0无效
*/
@NotNull(message = "数据状态：1有效，0无效不能为空", groups = { AddGroup.class, EditGroup.class })
private Long dataState;

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

@@ -12,10 +12,10 @@ import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
/**
* 楼层业务对象 tb_floor
* 楼层管理业务对象 tb_floor
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Data
@EqualsAndHashCode(callSuper = true)
@@ -23,9 +23,9 @@ import com.fasterxml.jackson.annotation.JsonFormat;
public class TbFloorBo extends BaseEntity {
/**
* 数据库id
*
*/
@NotNull(message = "数据库id不能为空", groups = { EditGroup.class })
@NotNull(message = "不能为空", groups = { EditGroup.class })
private Long id;
/**
@@ -61,8 +61,22 @@ public class TbFloorBo extends BaseEntity {
/**
* 数据状态：1有效，0无效
*/
@NotNull(message = "数据状态：1有效，0无效不能为空", groups = { AddGroup.class, EditGroup.class })
private Long dataState;
/**
* 创建人
*/
private Long createEmpId;
/**
* 修改时间
*/
private Date modifyTime;
/**
* 搜索值
*/
private String searchValue;
}

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

@@ -15,7 +15,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
* 会议管理业务对象 tb_room_booking
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Data
@EqualsAndHashCode(callSuper = true)
@@ -84,6 +84,7 @@ public class TbRoomBookingBo extends BaseEntity {
/**
* 参会人员
*/
@NotBlank(message = "参会人员不能为空", groups = { AddGroup.class, EditGroup.class })
private String attendeesName;
/**
@@ -104,25 +105,16 @@ public class TbRoomBookingBo extends BaseEntity {
@NotNull(message = "签到结束时间不能为空", groups = { AddGroup.class, EditGroup.class })
private Date checkInEndTime;
/**
* 审批人
*/
private String approver;
/**
* 审批时间
*/
@NotNull(message = "审批时间不能为空", groups = { AddGroup.class, EditGroup.class })
private Date approverTime;
/**
* 评价
*/
@NotBlank(message = "评价不能为空", groups = { AddGroup.class, EditGroup.class })
private String evaluate;
/**
* 备注
*/
@NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
private String remark;
/**
@@ -131,10 +123,5 @@ public class TbRoomBookingBo extends BaseEntity {
@NotNull(message = "是否需要增值服务（0：需要，1：不需要）不能为空", groups = { AddGroup.class, EditGroup.class })
private Long addServices;
/**
* 数据状态（模拟删除 0：未删除 1：删除）
*/
private Long dataStatus;
}

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

@@ -15,7 +15,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
* 访客管理业务对象 tb_visitor_management
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Data
@EqualsAndHashCode(callSuper = true)
@@ -25,7 +25,6 @@ public class TbVisitorManagementBo extends BaseEntity {
/**
* id
*/
@NotNull(message = "id不能为空", groups = { EditGroup.class })
private Long id;
/**
@@ -49,13 +48,11 @@ public class TbVisitorManagementBo extends BaseEntity {
/**
* 拜访开始时间
*/
@NotNull(message = "拜访开始时间不能为空", groups = { AddGroup.class, EditGroup.class })
private Date visitingBeginTime;
/**
* 拜访结束时间
*/
@NotNull(message = "拜访结束时间不能为空", groups = { AddGroup.class, EditGroup.class })
private Date visitingEndTime;
/**

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

@@ -15,7 +15,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
* 设备类型业务对象 td_device_type
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Data
@EqualsAndHashCode(callSuper = true)

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

@@ -15,7 +15,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
* 厂商管理业务对象 td_factory
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Data
@EqualsAndHashCode(callSuper = true)
@@ -25,13 +25,12 @@ public class TdFactoryBo extends BaseEntity {
/**
* 数据库id
*/
@NotNull(message = "数据库id不能为空", groups = { EditGroup.class })
private Long id;
/**
* 厂商编码
*/
@NotBlank(message = "厂商编码不能为空", groups = { AddGroup.class, EditGroup.class })
@NotBlank(message = "厂商编码不能为空", groups = { EditGroup.class })
private String factoryNo;
/**

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

@@ -15,7 +15,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
* 代码配置业务对象 ts_config
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Data
@EqualsAndHashCode(callSuper = true)

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

@@ -15,7 +15,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
* 请求日志业务对象 ts_operation_log
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Data
@EqualsAndHashCode(callSuper = true)

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

@@ -1,7 +1,5 @@
package org.dromara.property.domain.vo;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.property.domain.TbAccessControl;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
@@ -20,7 +18,7 @@ import java.util.Date;
* 门禁管理视图对象 tb_access_control
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Data
@ExcelIgnoreUnannotated
@@ -31,9 +29,9 @@ public class TbAccessControlVo implements Serializable {
private static final long serialVersionUID = 1L;
/**
* id
*
*/
@ExcelProperty(value = "id")
@ExcelProperty(value = "")
private Long id;
/**
@@ -67,9 +65,9 @@ public class TbAccessControlVo implements Serializable {
private String accessIp;
/**
* 设备端口
*
*/
@ExcelProperty(value = "设备端口")
@ExcelProperty(value = "")
private Long accessPort;
/**
@@ -79,15 +77,16 @@ public class TbAccessControlVo implements Serializable {
private Long accssType;
/**
* 工程编号
*
*/
@ExcelProperty(value = "工程编号")
@ExcelProperty(value = "")
private String factoryCode;
/**
* 控制卡类型：1-系统，2-E8
*/
@ExcelProperty(value = "控制卡类型：1-系统，2-E8")
@ExcelProperty(value = "控制卡类型：1-系统，2-E8", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "wy_kzklx")
private Long controlType;
/**
@@ -114,5 +113,11 @@ public class TbAccessControlVo implements Serializable {
@ExcelProperty(value = "数据状态：1有效，0无效")
private Long dataState;
/**
* 搜索值
*/
@ExcelProperty(value = "搜索值")
private String searchValue;
}

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

@@ -20,7 +20,7 @@ import java.util.Date;
* 建筑管理视图对象 tb_building
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Data
@ExcelIgnoreUnannotated
@@ -93,7 +93,8 @@ public class TbBuildingVo implements Serializable {
/**
* 产权性质(1:自持，2：承租，3：自持+承租,4：政府免费使用)
*/
@ExcelProperty(value = "产权性质(1:自持，2：承租，3：自持+承租,4：政府免费使用)")
@ExcelProperty(value = "产权性质(1:自持，2：承租，3：自持+承租,4：政府免费使用)", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "wy_cqxz")
private Long cqxz;
/**
@@ -168,11 +169,5 @@ public class TbBuildingVo implements Serializable {
@ExcelProperty(value = "组织编码")
private String orgCode;
/**
* 数据状态：1有效，0无效
*/
@ExcelProperty(value = "数据状态：1有效，0无效")
private Long dataState;
}

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

@@ -19,10 +19,10 @@ import java.util.Date;
/**
* 服务视图对象 tb_ceremonial_serve
* 会议服务视图对象 tb_ceremonial_serve
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Data
@ExcelIgnoreUnannotated
@@ -32,12 +32,6 @@ public class TbCeremonialServeVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* id
*/
@ExcelProperty(value = "id")
private Long id;
/**
* 分类id
*/
@@ -59,7 +53,8 @@ public class TbCeremonialServeVo implements Serializable {
/**
* 服务分类
*/
@ExcelProperty(value = "服务分类")
@ExcelProperty(value = "服务分类", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "wy_fwfl")
private Long serveType;
/**
@@ -72,27 +67,9 @@ public class TbCeremonialServeVo implements Serializable {
* 预订状态（0：待确认，1：已确认，2：已取消，3：已完成）
*/
@ExcelProperty(value = "预订状态", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "0=：待确认，1：已确认，2：已取消，3：已完成")
@ExcelDictFormat(dictType = "wy_qrzt")
private Long serveStatus;
/**
* 创建人id
*/
@ExcelProperty(value = "创建人id")
private Long createById;
/**
* 更新人id
*/
@ExcelProperty(value = "更新人id")
private Long updateById;
/**
* 确认人id
*/
@ExcelProperty(value = "确认人id")
private Long confirmId;
/**
* 服务开始时间
*/
@@ -111,13 +88,6 @@ public class TbCeremonialServeVo implements Serializable {
@ExcelProperty(value = "服务总价格")
private Long servePrice;
/**
* 数据状态（模拟删除 0:删除 1:未删除）
*/
@ExcelProperty(value = "数据状态", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "模=拟删除,0=:删除,1=:未删除")
private Long dataStauts;
/**
* 产品图片
*/

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

@@ -15,10 +15,10 @@ import java.util.Date;
/**
* 服务订阅视图对象 tb_ceremonialserve_roombooking
* 会议预定视图对象 tb_ceremonialserve_roombooking
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Data
@ExcelIgnoreUnannotated
@@ -28,12 +28,6 @@ public class TbCeremonialserveRoombookingVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* id
*/
@ExcelProperty(value = "id")
private Long id;
/**
* 服务id
*/
@@ -52,5 +46,11 @@ public class TbCeremonialserveRoombookingVo implements Serializable {
@ExcelProperty(value = "服务和预订总价格")
private Long totalPrice;
/**
* 搜索值
*/
@ExcelProperty(value = "搜索值")
private String searchValue;
}

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

@@ -19,7 +19,7 @@ import java.util.Date;
视图对象 tb_city_area
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Data
@ExcelIgnoreUnannotated
@@ -29,12 +29,6 @@ public class TbCityAreaVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 主键ID
*/
@ExcelProperty(value = "主键ID")
private Long id;
/**
* 城市编码
*/
@@ -50,7 +44,8 @@ public class TbCityAreaVo implements Serializable {
/**
* 101 省级 202 市州 303 区县
*/
@ExcelProperty(value = "101 省级 202 市州 303 区县")
@ExcelProperty(value = "101 省级 202 市州 303 区县", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "wy_qyjb")
private String areaLevel;
/**
@@ -77,11 +72,5 @@ public class TbCityAreaVo implements Serializable {
@ExcelProperty(value = "维度")
private String lat;
/**
* 数据状态：1有效，0无效
*/
@ExcelProperty(value = "数据状态：1有效，0无效")
private Long dataState;
}

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

@@ -1,7 +1,9 @@
package org.dromara.property.domain.vo;
import org.dromara.common.translation.annotation.Translation;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.common.translation.constant.TransConstant;
import org.dromara.property.domain.TbCommunity;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
@@ -20,7 +22,7 @@ import java.util.Date;
* 小区管理视图对象 tb_community
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Data
@ExcelIgnoreUnannotated
@@ -30,12 +32,6 @@ public class TbCommunityVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
@ExcelProperty(value = "主键id")
private Long id;
/**
* 社区名称
*/
@@ -51,7 +47,8 @@ public class TbCommunityVo implements Serializable {
/**
* 社区类型 1：园区，2：小区
*/
@ExcelProperty(value = "社区类型 1：园区，2：小区")
@ExcelProperty(value = "社区类型 1：园区，2：小区", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "wy_sqlx")
private Long communityType;
/**
@@ -96,17 +93,16 @@ public class TbCommunityVo implements Serializable {
@ExcelProperty(value = "小图图片")
private String img;
/**
* 小图图片Url
*/
@Translation(type = TransConstant.OSS_ID_TO_URL, mapper = "img")
private String imgUrl;
/**
* 组织编码
*/
@ExcelProperty(value = "组织编码")
private String orgCode;
/**
* 数据状态：1有效，0无效
*/
@ExcelProperty(value = "数据状态：1有效，0无效")
private Long dataState;
}

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

@@ -20,7 +20,7 @@ import java.util.Date;
* 会议室管理视图对象 tb_conference
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Data
@ExcelIgnoreUnannotated
@@ -30,12 +30,6 @@ public class TbConferenceVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* id
*/
@ExcelProperty(value = "id")
private Long id;
/**
* 会议室名称
*/
@@ -82,7 +76,7 @@ public class TbConferenceVo implements Serializable {
* 会议室价格类型（0：免费，1付费，2：面议）
*/
@ExcelProperty(value = "会议室价格类型", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "0=：免费，1付费，2：面议")
@ExcelDictFormat(dictType = "wy_hysjglx")
private Long feeType;
/**
@@ -119,21 +113,21 @@ public class TbConferenceVo implements Serializable {
* 是否需要审核（0：需要审核，1：不需要审核）
*/
@ExcelProperty(value = "是否需要审核", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "0=：需要审核，1：不需要审核")
@ExcelDictFormat(dictType = "wy_sf")
private Long review;
/**
* 启用状态（0：禁用，1：启用）
*/
@ExcelProperty(value = "启用状态", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "0=：禁用，1：启用")
@ExcelDictFormat(dictType = "wy_kg")
private Long enabledStatus;
/**
* 开放星期（1：星期一，2：星期二）
*/
@ExcelProperty(value = "开放星期", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "1=：星期一，2：星期二")
@ExcelDictFormat(dictType = "wy_xq")
private Long openingWeek;
/**

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

@@ -20,7 +20,7 @@ import java.util.Date;
* E8服务地址视图对象 tb_e8_config
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Data
@ExcelIgnoreUnannotated
@@ -30,12 +30,6 @@ public class TbE8ConfigVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
*
*/
@ExcelProperty(value = "")
private Long id;
/**
* E8 名称
*/
@@ -60,11 +54,5 @@ public class TbE8ConfigVo implements Serializable {
@ExcelProperty(value = "组织编码")
private String orgCode;
/**
* 数据状态：1有效，0无效
*/
@ExcelProperty(value = "数据状态：1有效，0无效")
private Long dataState;
}

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

@@ -17,10 +17,10 @@ import java.util.Date;
/**
* 楼层视图对象 tb_floor
* 楼层管理视图对象 tb_floor
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Data
@ExcelIgnoreUnannotated
@@ -31,9 +31,9 @@ public class TbFloorVo implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 数据库id
*
*/
@ExcelProperty(value = "数据库id")
@ExcelProperty(value = "")
private Long id;
/**
@@ -72,5 +72,23 @@ public class TbFloorVo implements Serializable {
@ExcelProperty(value = "数据状态：1有效，0无效")
private Long dataState;
/**
* 创建人
*/
@ExcelProperty(value = "创建人")
private Long createEmpId;
/**
* 修改时间
*/
@ExcelProperty(value = "修改时间")
private Date modifyTime;
/**
* 搜索值
*/
@ExcelProperty(value = "搜索值")
private String searchValue;
}

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

@@ -20,7 +20,7 @@ import java.util.Date;
* 会议管理视图对象 tb_room_booking
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Data
@ExcelIgnoreUnannotated
@@ -30,12 +30,6 @@ public class TbRoomBookingVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* id
*/
@ExcelProperty(value = "id")
private Long id;
/**
* 会议室id
*/
@@ -46,14 +40,14 @@ public class TbRoomBookingVo implements Serializable {
* 预约状态（0：未预定 1：使用中 2：已预订）
*/
@ExcelProperty(value = "预约状态", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "0=：未预定,1=：使用中,2=：已预订")
@ExcelDictFormat(dictType = "wy_yyzt")
private Long bookingStatus;
/**
* 审核状态（0：未审核 1：通过 2：未通过）
*/
@ExcelProperty(value = "审核状态", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "0=：未审核,1=：通过,2=：未通过")
@ExcelDictFormat(dictType = "wy_shzt")
private Long reviewStatus;
/**
@@ -116,18 +110,6 @@ public class TbRoomBookingVo implements Serializable {
@ExcelProperty(value = "签到结束时间")
private Date checkInEndTime;
/**
* 审批人
*/
@ExcelProperty(value = "审批人")
private String approver;
/**
* 审批时间
*/
@ExcelProperty(value = "审批时间")
private Date approverTime;
/**
* 评价
*/
@@ -144,15 +126,8 @@ public class TbRoomBookingVo implements Serializable {
* 是否需要增值服务（0：需要，1：不需要）
*/
@ExcelProperty(value = "是否需要增值服务", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "0=：需要，1：不需要")
@ExcelDictFormat(dictType = "sys_yes_no")
private Long addServices;
/**
* 数据状态（模拟删除 0：未删除 1：删除）
*/
@ExcelProperty(value = "数据状态", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "模=拟删除,0=：未删除,1=：删除")
private Long dataStatus;
}

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

@@ -20,7 +20,7 @@ import java.util.Date;
* 访客管理视图对象 tb_visitor_management
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Data
@ExcelIgnoreUnannotated
@@ -30,12 +30,6 @@ public class TbVisitorManagementVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* id
*/
@ExcelProperty(value = "id")
private Long id;
/**
* 访客姓名
*/

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

@@ -20,7 +20,7 @@ import java.util.Date;
* 设备类型视图对象 td_device_type
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Data
@ExcelIgnoreUnannotated
@@ -30,12 +30,6 @@ public class TdDeviceTypeVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 数据库id
*/
@ExcelProperty(value = "数据库id")
private Long id;
/**
* 设备类型编码
*/

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

@@ -20,7 +20,7 @@ import java.util.Date;
* 厂商管理视图对象 td_factory
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Data
@ExcelIgnoreUnannotated
@@ -30,12 +30,6 @@ public class TdFactoryVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 数据库id
*/
@ExcelProperty(value = "数据库id")
private Long id;
/**
* 厂商编码
*/

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

@@ -20,7 +20,7 @@ import java.util.Date;
* 代码配置视图对象 ts_config
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Data
@ExcelIgnoreUnannotated

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

@@ -20,7 +20,7 @@ import java.util.Date;
* 请求日志视图对象 ts_operation_log
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Data
@ExcelIgnoreUnannotated

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

@@ -8,7 +8,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
* 门禁管理Mapper接口
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
public interface TbAccessControlMapper extends BaseMapperPlus<TbAccessControl, TbAccessControlVo> {

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

@@ -8,7 +8,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
* 建筑管理Mapper接口
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
public interface TbBuildingMapper extends BaseMapperPlus<TbBuilding, TbBuildingVo> {

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

@@ -5,10 +5,10 @@ import org.dromara.property.domain.vo.TbCeremonialServeVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**
* 服务Mapper接口
* 会议服务Mapper接口
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
public interface TbCeremonialServeMapper extends BaseMapperPlus<TbCeremonialServe, TbCeremonialServeVo> {

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

@@ -5,10 +5,10 @@ import org.dromara.property.domain.vo.TbCeremonialserveRoombookingVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**
* 服务订阅Mapper接口
* 会议预定Mapper接口
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
public interface TbCeremonialserveRoombookingMapper extends BaseMapperPlus<TbCeremonialserveRoombooking, TbCeremonialserveRoombookingVo> {

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

@@ -9,7 +9,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
Mapper接口
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
public interface TbCityAreaMapper extends BaseMapperPlus<TbCityArea, TbCityAreaVo> {

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

@@ -8,7 +8,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
* 小区管理Mapper接口
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
public interface TbCommunityMapper extends BaseMapperPlus<TbCommunity, TbCommunityVo> {

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

@@ -8,7 +8,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
* 会议室管理Mapper接口
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
public interface TbConferenceMapper extends BaseMapperPlus<TbConference, TbConferenceVo> {

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

@@ -8,7 +8,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
* E8服务地址Mapper接口
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
public interface TbE8ConfigMapper extends BaseMapperPlus<TbE8Config, TbE8ConfigVo> {

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

@@ -5,10 +5,10 @@ import org.dromara.property.domain.vo.TbFloorVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**
* 楼层Mapper接口
* 楼层管理Mapper接口
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
public interface TbFloorMapper extends BaseMapperPlus<TbFloor, TbFloorVo> {

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

@@ -8,7 +8,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
* 会议管理Mapper接口
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
public interface TbRoomBookingMapper extends BaseMapperPlus<TbRoomBooking, TbRoomBookingVo> {

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

@@ -8,7 +8,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
* 访客管理Mapper接口
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
public interface TbVisitorManagementMapper extends BaseMapperPlus<TbVisitorManagement, TbVisitorManagementVo> {

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

@@ -8,7 +8,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
* 设备类型Mapper接口
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
public interface TdDeviceTypeMapper extends BaseMapperPlus<TdDeviceType, TdDeviceTypeVo> {

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

@@ -8,7 +8,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
* 厂商管理Mapper接口
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
public interface TdFactoryMapper extends BaseMapperPlus<TdFactory, TdFactoryVo> {

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

@@ -8,7 +8,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
* 代码配置Mapper接口
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
public interface TsConfigMapper extends BaseMapperPlus<TsConfig, TsConfigVo> {

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

@@ -8,7 +8,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
* 请求日志Mapper接口
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
public interface TsOperationLogMapper extends BaseMapperPlus<TsOperationLog, TsOperationLogVo> {

2
ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbAccessControlService.java
View File

@@ -13,7 +13,7 @@ import java.util.List;
* 门禁管理Service接口
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
public interface ITbAccessControlService {

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

@@ -13,7 +13,7 @@ import java.util.List;
* 建筑管理Service接口
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
public interface ITbBuildingService {

26
ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbCeremonialServeService.java
View File

@@ -10,56 +10,56 @@ import java.util.Collection;
import java.util.List;
/**
* 服务Service接口
* 会议服务Service接口
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
public interface ITbCeremonialServeService {
/**
* 查询服务
* 查询会议服务
*
* @param id 主键
* @return 服务
* @return 会议服务
*/
TbCeremonialServeVo queryById(Long id);
/**
* 分页查询服务列表
* 分页查询会议服务列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 服务分页列表
* @return 会议服务分页列表
*/
TableDataInfo<TbCeremonialServeVo> queryPageList(TbCeremonialServeBo bo, PageQuery pageQuery);
/**
* 查询符合条件的服务列表
* 查询符合条件的会议服务列表
*
* @param bo 查询条件
* @return 服务列表
* @return 会议服务列表
*/
List<TbCeremonialServeVo> queryList(TbCeremonialServeBo bo);
/**
* 新增服务
* 新增会议服务
*
* @param bo 服务
* @param bo 会议服务
* @return 是否新增成功
*/
Boolean insertByBo(TbCeremonialServeBo bo);
/**
* 修改服务
* 修改会议服务
*
* @param bo 服务
* @param bo 会议服务
* @return 是否修改成功
*/
Boolean updateByBo(TbCeremonialServeBo bo);
/**
* 校验并批量删除服务信息
* 校验并批量删除会议服务信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验

26
ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbCeremonialserveRoombookingService.java
View File

@@ -10,56 +10,56 @@ import java.util.Collection;
import java.util.List;
/**
* 服务订阅Service接口
* 会议预定Service接口
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
public interface ITbCeremonialserveRoombookingService {
/**
* 查询服务订阅
* 查询会议预定
*
* @param id 主键
* @return 服务订阅
* @return 会议预定
*/
TbCeremonialserveRoombookingVo queryById(Long id);
/**
* 分页查询服务订阅列表
* 分页查询会议预定列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 服务订阅分页列表
* @return 会议预定分页列表
*/
TableDataInfo<TbCeremonialserveRoombookingVo> queryPageList(TbCeremonialserveRoombookingBo bo, PageQuery pageQuery);
/**
* 查询符合条件的服务订阅列表
* 查询符合条件的会议预定列表
*
* @param bo 查询条件
* @return 服务订阅列表
* @return 会议预定列表
*/
List<TbCeremonialserveRoombookingVo> queryList(TbCeremonialserveRoombookingBo bo);
/**
* 新增服务订阅
* 新增会议预定
*
* @param bo 服务订阅
* @param bo 会议预定
* @return 是否新增成功
*/
Boolean insertByBo(TbCeremonialserveRoombookingBo bo);
/**
* 修改服务订阅
* 修改会议预定
*
* @param bo 服务订阅
* @param bo 会议预定
* @return 是否修改成功
*/
Boolean updateByBo(TbCeremonialserveRoombookingBo bo);
/**
* 校验并批量删除服务订阅信息
* 校验并批量删除会议预定信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验

2
ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbCityAreaService.java
View File

@@ -14,7 +14,7 @@ import java.util.List;
Service接口
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
public interface ITbCityAreaService {

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

@@ -13,7 +13,7 @@ import java.util.List;
* 小区管理Service接口
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
public interface ITbCommunityService {

2
ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbConferenceService.java
View File

@@ -13,7 +13,7 @@ import java.util.List;
* 会议室管理Service接口
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
public interface ITbConferenceService {

2
ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbE8ConfigService.java
View File

@@ -13,7 +13,7 @@ import java.util.List;
* E8服务地址Service接口
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
public interface ITbE8ConfigService {

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

@@ -10,56 +10,56 @@ import java.util.Collection;
import java.util.List;
/**
* 楼层Service接口
* 楼层管理Service接口
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
public interface ITbFloorService {
/**
* 查询楼层
* 查询楼层管理
*
* @param id 主键
* @return 楼层
* @return 楼层管理
*/
TbFloorVo queryById(Long id);
/**
* 分页查询楼层列表
* 分页查询楼层管理列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 楼层分页列表
* @return 楼层管理分页列表
*/
TableDataInfo<TbFloorVo> queryPageList(TbFloorBo bo, PageQuery pageQuery);
/**
* 查询符合条件的楼层列表
* 查询符合条件的楼层管理列表
*
* @param bo 查询条件
* @return 楼层列表
* @return 楼层管理列表
*/
List<TbFloorVo> queryList(TbFloorBo bo);
/**
* 新增楼层
* 新增楼层管理
*
* @param bo 楼层
* @param bo 楼层管理
* @return 是否新增成功
*/
Boolean insertByBo(TbFloorBo bo);
/**
* 修改楼层
* 修改楼层管理
*
* @param bo 楼层
* @param bo 楼层管理
* @return 是否修改成功
*/
Boolean updateByBo(TbFloorBo bo);
/**
* 校验并批量删除楼层信息
* 校验并批量删除楼层管理信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验

2
ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbRoomBookingService.java
View File

@@ -13,7 +13,7 @@ import java.util.List;
* 会议管理Service接口
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
public interface ITbRoomBookingService {

2
ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbVisitorManagementService.java
View File

@@ -13,7 +13,7 @@ import java.util.List;
* 访客管理Service接口
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
public interface ITbVisitorManagementService {

2
ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITdDeviceTypeService.java
View File

@@ -13,7 +13,7 @@ import java.util.List;
* 设备类型Service接口
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
public interface ITdDeviceTypeService {

2
ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITdFactoryService.java
View File

@@ -13,7 +13,7 @@ import java.util.List;
* 厂商管理Service接口
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
public interface ITdFactoryService {

2
ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITsConfigService.java
View File

@@ -13,7 +13,7 @@ import java.util.List;
* 代码配置Service接口
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
public interface ITsConfigService {

2
ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITsOperationLogService.java
View File

@@ -13,7 +13,7 @@ import java.util.List;
* 请求日志Service接口
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
public interface ITsOperationLogService {

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

@@ -24,7 +24,7 @@ import java.util.Collection;
* 门禁管理Service业务层处理
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Slf4j
@RequiredArgsConstructor
@@ -87,6 +87,7 @@ public class TbAccessControlServiceImpl implements ITbAccessControlService {
lqw.eq(StringUtils.isNotBlank(bo.getOutCode()), TbAccessControl::getOutCode, bo.getOutCode());
lqw.eq(StringUtils.isNotBlank(bo.getOrgCode()), TbAccessControl::getOrgCode, bo.getOrgCode());
lqw.eq(bo.getDataState() != null, TbAccessControl::getDataState, bo.getDataState());
lqw.eq(StringUtils.isNotBlank(bo.getSearchValue()), TbAccessControl::getSearchValue, bo.getSearchValue());
return lqw;
}

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

@@ -24,7 +24,7 @@ import java.util.Collection;
* 建筑管理Service业务层处理
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Slf4j
@RequiredArgsConstructor
@@ -86,7 +86,6 @@ public class TbBuildingServiceImpl implements ITbBuildingService {
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.getOrgCode()), TbBuilding::getOrgCode, bo.getOrgCode());
return lqw;
}

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

@@ -21,10 +21,10 @@ import java.util.Map;
import java.util.Collection;
/**
* 服务Service业务层处理
* 会议服务Service业务层处理
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Slf4j
@RequiredArgsConstructor
@@ -34,10 +34,10 @@ public class TbCeremonialServeServiceImpl implements ITbCeremonialServeService {
private final TbCeremonialServeMapper baseMapper;
/**
* 查询服务
* 查询会议服务
*
* @param id 主键
* @return 服务
* @return 会议服务
*/
@Override
public TbCeremonialServeVo queryById(Long id){
@@ -45,11 +45,11 @@ public class TbCeremonialServeServiceImpl implements ITbCeremonialServeService {
}
/**
* 分页查询服务列表
* 分页查询会议服务列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 服务分页列表
* @return 会议服务分页列表
*/
@Override
public TableDataInfo<TbCeremonialServeVo> queryPageList(TbCeremonialServeBo bo, PageQuery pageQuery) {
@@ -59,10 +59,10 @@ public class TbCeremonialServeServiceImpl implements ITbCeremonialServeService {
}
/**
* 查询符合条件的服务列表
* 查询符合条件的会议服务列表
*
* @param bo 查询条件
* @return 服务列表
* @return 会议服务列表
*/
@Override
public List<TbCeremonialServeVo> queryList(TbCeremonialServeBo bo) {
@@ -80,22 +80,18 @@ public class TbCeremonialServeServiceImpl implements ITbCeremonialServeService {
lqw.eq(bo.getServeType() != null, TbCeremonialServe::getServeType, bo.getServeType());
lqw.like(StringUtils.isNotBlank(bo.getServeName()), TbCeremonialServe::getServeName, bo.getServeName());
lqw.eq(bo.getServeStatus() != null, TbCeremonialServe::getServeStatus, bo.getServeStatus());
lqw.eq(bo.getCreateById() != null, TbCeremonialServe::getCreateById, bo.getCreateById());
lqw.eq(bo.getUpdateById() != null, TbCeremonialServe::getUpdateById, bo.getUpdateById());
lqw.eq(bo.getConfirmId() != null, TbCeremonialServe::getConfirmId, bo.getConfirmId());
lqw.eq(bo.getBeginTime() != null, TbCeremonialServe::getBeginTime, bo.getBeginTime());
lqw.eq(bo.getEndTime() != null, TbCeremonialServe::getEndTime, bo.getEndTime());
lqw.eq(bo.getServePrice() != null, TbCeremonialServe::getServePrice, bo.getServePrice());
lqw.eq(bo.getDataStauts() != null, TbCeremonialServe::getDataStauts, bo.getDataStauts());
lqw.eq(StringUtils.isNotBlank(bo.getServeImage()), TbCeremonialServe::getServeImage, bo.getServeImage());
lqw.eq(bo.getSort() != null, TbCeremonialServe::getSort, bo.getSort());
return lqw;
}
/**
* 新增服务
* 新增会议服务
*
* @param bo 服务
* @param bo 会议服务
* @return 是否新增成功
*/
@Override
@@ -110,9 +106,9 @@ public class TbCeremonialServeServiceImpl implements ITbCeremonialServeService {
}
/**
* 修改服务
* 修改会议服务
*
* @param bo 服务
* @param bo 会议服务
* @return 是否修改成功
*/
@Override
@@ -130,7 +126,7 @@ public class TbCeremonialServeServiceImpl implements ITbCeremonialServeService {
}
/**
* 校验并批量删除服务信息
* 校验并批量删除会议服务信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验

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

@@ -21,10 +21,10 @@ import java.util.Map;
import java.util.Collection;
/**
* 服务订阅Service业务层处理
* 会议预定Service业务层处理
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Slf4j
@RequiredArgsConstructor
@@ -34,10 +34,10 @@ public class TbCeremonialserveRoombookingServiceImpl implements ITbCeremonialser
private final TbCeremonialserveRoombookingMapper baseMapper;
/**
* 查询服务订阅
* 查询会议预定
*
* @param id 主键
* @return 服务订阅
* @return 会议预定
*/
@Override
public TbCeremonialserveRoombookingVo queryById(Long id){
@@ -45,11 +45,11 @@ public class TbCeremonialserveRoombookingServiceImpl implements ITbCeremonialser
}
/**
* 分页查询服务订阅列表
* 分页查询会议预定列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 服务订阅分页列表
* @return 会议预定分页列表
*/
@Override
public TableDataInfo<TbCeremonialserveRoombookingVo> queryPageList(TbCeremonialserveRoombookingBo bo, PageQuery pageQuery) {
@@ -59,10 +59,10 @@ public class TbCeremonialserveRoombookingServiceImpl implements ITbCeremonialser
}
/**
* 查询符合条件的服务订阅列表
* 查询符合条件的会议预定列表
*
* @param bo 查询条件
* @return 服务订阅列表
* @return 会议预定列表
*/
@Override
public List<TbCeremonialserveRoombookingVo> queryList(TbCeremonialserveRoombookingBo bo) {
@@ -77,19 +77,19 @@ public class TbCeremonialserveRoombookingServiceImpl implements ITbCeremonialser
lqw.eq(bo.getCeremonialServeId() != null, TbCeremonialserveRoombooking::getCeremonialServeId, bo.getCeremonialServeId());
lqw.eq(bo.getRoomBookingId() != null, TbCeremonialserveRoombooking::getRoomBookingId, bo.getRoomBookingId());
lqw.eq(bo.getTotalPrice() != null, TbCeremonialserveRoombooking::getTotalPrice, bo.getTotalPrice());
lqw.eq(StringUtils.isNotBlank(bo.getSearchValue()), TbCeremonialserveRoombooking::getSearchValue, bo.getSearchValue());
return lqw;
}
/**
* 新增服务订阅
* 新增会议预定
*
* @param bo 服务订阅
* @param bo 会议预定
* @return 是否新增成功
*/
@Override
public Boolean insertByBo(TbCeremonialserveRoombookingBo bo) {
TbCeremonialserveRoombooking add = MapstructUtils.convert(bo, TbCeremonialserveRoombooking.class);
add.setId(3);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
@@ -99,9 +99,9 @@ public class TbCeremonialserveRoombookingServiceImpl implements ITbCeremonialser
}
/**
* 修改服务订阅
* 修改会议预定
*
* @param bo 服务订阅
* @param bo 会议预定
* @return 是否修改成功
*/
@Override
@@ -119,7 +119,7 @@ public class TbCeremonialserveRoombookingServiceImpl implements ITbCeremonialser
}
/**
* 校验并批量删除服务订阅信息
* 校验并批量删除会议预定信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验

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

@@ -25,7 +25,7 @@ import java.util.Collection;
Service业务层处理
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Slf4j
@RequiredArgsConstructor
@@ -88,7 +88,6 @@ public class TbCityAreaServiceImpl implements ITbCityAreaService {
lqw.like(StringUtils.isNotBlank(bo.getParentAreaName()), TbCityArea::getParentAreaName, bo.getParentAreaName());
lqw.eq(StringUtils.isNotBlank(bo.getLon()), TbCityArea::getLon, bo.getLon());
lqw.eq(StringUtils.isNotBlank(bo.getLat()), TbCityArea::getLat, bo.getLat());
lqw.eq(bo.getDataState() != null, TbCityArea::getDataState, bo.getDataState());
return lqw;
}

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

@@ -24,7 +24,7 @@ import java.util.Collection;
* 小区管理Service业务层处理
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Slf4j
@RequiredArgsConstructor

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

@@ -24,7 +24,7 @@ import java.util.Collection;
* 会议室管理Service业务层处理
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Slf4j
@RequiredArgsConstructor

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

@@ -24,7 +24,7 @@ import java.util.Collection;
* E8服务地址Service业务层处理
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Slf4j
@RequiredArgsConstructor

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

@@ -21,10 +21,10 @@ import java.util.Map;
import java.util.Collection;
/**
* 楼层Service业务层处理
* 楼层管理Service业务层处理
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Slf4j
@RequiredArgsConstructor
@@ -34,10 +34,10 @@ public class TbFloorServiceImpl implements ITbFloorService {
private final TbFloorMapper baseMapper;
/**
* 查询楼层
* 查询楼层管理
*
* @param id 主键
* @return 楼层
* @return 楼层管理
*/
@Override
public TbFloorVo queryById(Long id){
@@ -45,11 +45,11 @@ public class TbFloorServiceImpl implements ITbFloorService {
}
/**
* 分页查询楼层列表
* 分页查询楼层管理列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 楼层分页列表
* @return 楼层管理分页列表
*/
@Override
public TableDataInfo<TbFloorVo> queryPageList(TbFloorBo bo, PageQuery pageQuery) {
@@ -59,10 +59,10 @@ public class TbFloorServiceImpl implements ITbFloorService {
}
/**
* 查询符合条件的楼层列表
* 查询符合条件的楼层管理列表
*
* @param bo 查询条件
* @return 楼层列表
* @return 楼层管理列表
*/
@Override
public List<TbFloorVo> queryList(TbFloorBo bo) {
@@ -80,13 +80,16 @@ public class TbFloorServiceImpl implements ITbFloorService {
lqw.like(StringUtils.isNotBlank(bo.getFloorName()), TbFloor::getFloorName, bo.getFloorName());
lqw.eq(StringUtils.isNotBlank(bo.getOrgCode()), TbFloor::getOrgCode, bo.getOrgCode());
lqw.eq(bo.getDataState() != null, TbFloor::getDataState, bo.getDataState());
lqw.eq(bo.getCreateEmpId() != null, TbFloor::getCreateEmpId, bo.getCreateEmpId());
lqw.eq(bo.getModifyTime() != null, TbFloor::getModifyTime, bo.getModifyTime());
lqw.eq(StringUtils.isNotBlank(bo.getSearchValue()), TbFloor::getSearchValue, bo.getSearchValue());
return lqw;
}
/**
* 新增楼层
* 新增楼层管理
*
* @param bo 楼层
* @param bo 楼层管理
* @return 是否新增成功
*/
@Override
@@ -101,9 +104,9 @@ public class TbFloorServiceImpl implements ITbFloorService {
}
/**
* 修改楼层
* 修改楼层管理
*
* @param bo 楼层
* @param bo 楼层管理
* @return 是否修改成功
*/
@Override
@@ -121,7 +124,7 @@ public class TbFloorServiceImpl implements ITbFloorService {
}
/**
* 校验并批量删除楼层信息
* 校验并批量删除楼层管理信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验

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

@@ -24,7 +24,7 @@ import java.util.Collection;
* 会议管理Service业务层处理
*
* @author mocheng
* @date 2025-06-17
* @date 2025-06-18
*/
@Slf4j
@RequiredArgsConstructor
@@ -87,11 +87,9 @@ public class TbRoomBookingServiceImpl implements ITbRoomBookingService {
lqw.eq(bo.getApproverCount() != null, TbRoomBooking::getApproverCount, bo.getApproverCount());
lqw.eq(bo.getCheckInStartTime() != null, TbRoomBooking::getCheckInStartTime, bo.getCheckInStartTime());
lqw.eq(bo.getCheckInEndTime() != null, TbRoomBooking::getCheckInEndTime, bo.getCheckInEndTime());
lqw.eq(StringUtils.isNotBlank(bo.getApprover()), TbRoomBooking::getApprover, bo.getApprover());
lqw.eq(bo.getApproverTime() != null, TbRoomBooking::getApproverTime, bo.getApproverTime());
lqw.eq(StringUtils.isNotBlank(bo.getEvaluate()), TbRoomBooking::getEvaluate, bo.getEvaluate());
lqw.eq(StringUtils.isNotBlank(bo.getRemark()), TbRoomBooking::getRemark, bo.getRemark());
lqw.eq(bo.getAddServices() != null, TbRoomBooking::getAddServices, bo.getAddServices());
lqw.eq(bo.getDataStatus() != null, TbRoomBooking::getDataStatus, bo.getDataStatus());
return lqw;
}

Some files were not shown because too many files have changed in this diff Show More