From c43170cc87a448fd5a22740b0dddffbfb3aa87fc Mon Sep 17 00:00:00 2001 From: mocheng <3057647414@qq.com> Date: Wed, 18 Jun 2025 16:51:52 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E4=B8=9A=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TbAccessControlController.java | 2 +- .../controller/TbBuildingController.java | 2 +- .../TbCeremonialServeController.java | 26 ++++++------ ...bCeremonialserveRoombookingController.java | 26 ++++++------ .../controller/TbCityAreaController.java | 2 +- .../controller/TbCommunityController.java | 2 +- .../controller/TbConferenceController.java | 2 +- .../controller/TbE8ConfigController.java | 2 +- .../controller/TbFloorController.java | 26 ++++++------ .../controller/TbRoomBookingController.java | 2 +- .../TbVisitorManagementController.java | 2 +- .../controller/TdDeviceTypeController.java | 2 +- .../controller/TdFactoryController.java | 2 +- .../controller/TsConfigController.java | 2 +- .../controller/TsOperationLogController.java | 2 +- .../property/domain/TbAccessControl.java | 23 ++++------- .../dromara/property/domain/TbBuilding.java | 2 +- .../property/domain/TbCeremonialServe.java | 4 +- .../domain/TbCeremonialserveRoombooking.java | 13 ++++-- .../dromara/property/domain/TbCityArea.java | 2 +- .../dromara/property/domain/TbCommunity.java | 4 +- .../dromara/property/domain/TbConference.java | 2 +- .../dromara/property/domain/TbE8Config.java | 4 +- .../org/dromara/property/domain/TbFloor.java | 15 ++++--- .../property/domain/TbRoomBooking.java | 2 +- .../property/domain/TbVisitorManagement.java | 2 +- .../dromara/property/domain/TdDeviceType.java | 2 +- .../dromara/property/domain/TdFactory.java | 2 +- .../org/dromara/property/domain/TsConfig.java | 2 +- .../property/domain/TsOperationLog.java | 2 +- .../property/domain/bo/TbAccessControlBo.java | 18 +++++---- .../property/domain/bo/TbBuildingBo.java | 7 +--- .../domain/bo/TbCeremonialServeBo.java | 36 ++++++----------- .../bo/TbCeremonialserveRoombookingBo.java | 14 +++++-- .../property/domain/bo/TbCityAreaBo.java | 9 +---- .../property/domain/bo/TbCommunityBo.java | 6 +-- .../property/domain/bo/TbConferenceBo.java | 2 +- .../property/domain/bo/TbE8ConfigBo.java | 6 +-- .../dromara/property/domain/bo/TbFloorBo.java | 24 ++++++++--- .../property/domain/bo/TbRoomBookingBo.java | 21 ++-------- .../domain/bo/TbVisitorManagementBo.java | 5 +-- .../property/domain/bo/TdDeviceTypeBo.java | 2 +- .../property/domain/bo/TdFactoryBo.java | 5 +-- .../property/domain/bo/TsConfigBo.java | 2 +- .../property/domain/bo/TsOperationLogBo.java | 2 +- .../property/domain/vo/TbAccessControlVo.java | 25 +++++++----- .../property/domain/vo/TbBuildingVo.java | 11 ++--- .../domain/vo/TbCeremonialServeVo.java | 40 +++---------------- .../vo/TbCeremonialserveRoombookingVo.java | 16 ++++---- .../property/domain/vo/TbCityAreaVo.java | 17 ++------ .../property/domain/vo/TbCommunityVo.java | 24 +++++------ .../property/domain/vo/TbConferenceVo.java | 16 +++----- .../property/domain/vo/TbE8ConfigVo.java | 14 +------ .../dromara/property/domain/vo/TbFloorVo.java | 26 ++++++++++-- .../property/domain/vo/TbRoomBookingVo.java | 33 ++------------- .../domain/vo/TbVisitorManagementVo.java | 8 +--- .../property/domain/vo/TdDeviceTypeVo.java | 8 +--- .../property/domain/vo/TdFactoryVo.java | 8 +--- .../property/domain/vo/TsConfigVo.java | 2 +- .../property/domain/vo/TsOperationLogVo.java | 2 +- .../mapper/TbAccessControlMapper.java | 2 +- .../property/mapper/TbBuildingMapper.java | 2 +- .../mapper/TbCeremonialServeMapper.java | 4 +- .../TbCeremonialserveRoombookingMapper.java | 4 +- .../property/mapper/TbCityAreaMapper.java | 2 +- .../property/mapper/TbCommunityMapper.java | 2 +- .../property/mapper/TbConferenceMapper.java | 2 +- .../property/mapper/TbE8ConfigMapper.java | 2 +- .../property/mapper/TbFloorMapper.java | 4 +- .../property/mapper/TbRoomBookingMapper.java | 2 +- .../mapper/TbVisitorManagementMapper.java | 2 +- .../property/mapper/TdDeviceTypeMapper.java | 2 +- .../property/mapper/TdFactoryMapper.java | 2 +- .../property/mapper/TsConfigMapper.java | 2 +- .../property/mapper/TsOperationLogMapper.java | 2 +- .../service/ITbAccessControlService.java | 2 +- .../property/service/ITbBuildingService.java | 2 +- .../service/ITbCeremonialServeService.java | 26 ++++++------ .../ITbCeremonialserveRoombookingService.java | 26 ++++++------ .../property/service/ITbCityAreaService.java | 2 +- .../property/service/ITbCommunityService.java | 2 +- .../service/ITbConferenceService.java | 2 +- .../property/service/ITbE8ConfigService.java | 2 +- .../property/service/ITbFloorService.java | 26 ++++++------ .../service/ITbRoomBookingService.java | 2 +- .../service/ITbVisitorManagementService.java | 2 +- .../service/ITdDeviceTypeService.java | 2 +- .../property/service/ITdFactoryService.java | 2 +- .../property/service/ITsConfigService.java | 2 +- .../service/ITsOperationLogService.java | 2 +- .../impl/TbAccessControlServiceImpl.java | 3 +- .../service/impl/TbBuildingServiceImpl.java | 3 +- .../impl/TbCeremonialServeServiceImpl.java | 30 ++++++-------- ...CeremonialserveRoombookingServiceImpl.java | 28 ++++++------- .../service/impl/TbCityAreaServiceImpl.java | 3 +- .../service/impl/TbCommunityServiceImpl.java | 2 +- .../service/impl/TbConferenceServiceImpl.java | 2 +- .../service/impl/TbE8ConfigServiceImpl.java | 2 +- .../service/impl/TbFloorServiceImpl.java | 29 ++++++++------ .../impl/TbRoomBookingServiceImpl.java | 6 +-- .../impl/TbVisitorManagementServiceImpl.java | 2 +- .../service/impl/TdDeviceTypeServiceImpl.java | 2 +- .../service/impl/TdFactoryServiceImpl.java | 2 +- .../service/impl/TsConfigServiceImpl.java | 2 +- .../impl/TsOperationLogServiceImpl.java | 2 +- 105 files changed, 373 insertions(+), 475 deletions(-) diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbAccessControlController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbAccessControlController.java index 28b840cf..3b08d181 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbAccessControlController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbAccessControlController.java @@ -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 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbBuildingController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbBuildingController.java index 02d02bd8..60b8bc28 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbBuildingController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbBuildingController.java @@ -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 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbCeremonialServeController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbCeremonialServeController.java index f36dadb2..cc88b302 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbCeremonialServeController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbCeremonialServeController.java @@ -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 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 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 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 remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbCeremonialserveRoombookingController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbCeremonialserveRoombookingController.java index 7d861757..05b9270a 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbCeremonialserveRoombookingController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbCeremonialserveRoombookingController.java @@ -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 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 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 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 remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbCityAreaController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbCityAreaController.java index b04da021..15387c26 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbCityAreaController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbCityAreaController.java @@ -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 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbCommunityController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbCommunityController.java index f9dc239c..4bf82da3 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbCommunityController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbCommunityController.java @@ -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 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbConferenceController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbConferenceController.java index 89b15144..a2f2a42d 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbConferenceController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbConferenceController.java @@ -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 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbE8ConfigController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbE8ConfigController.java index 6f90dc2e..727d92cb 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbE8ConfigController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbE8ConfigController.java @@ -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 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbFloorController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbFloorController.java index de91b1c0..c81198c2 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbFloorController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbFloorController.java @@ -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 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 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 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 remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbRoomBookingController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbRoomBookingController.java index 65a66abc..70157b06 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbRoomBookingController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbRoomBookingController.java @@ -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 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbVisitorManagementController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbVisitorManagementController.java index e731efbf..12638821 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbVisitorManagementController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbVisitorManagementController.java @@ -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 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TdDeviceTypeController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TdDeviceTypeController.java index 01a28730..f542b0b7 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TdDeviceTypeController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TdDeviceTypeController.java @@ -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 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TdFactoryController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TdFactoryController.java index 04f4932e..b80d3a54 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TdFactoryController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TdFactoryController.java @@ -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 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TsConfigController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TsConfigController.java index 2a3c44fe..8b6956ee 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TsConfigController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TsConfigController.java @@ -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 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TsOperationLogController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TsOperationLogController.java index 932eb583..2c7181f5 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TsOperationLogController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TsOperationLogController.java @@ -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 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbAccessControl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbAccessControl.java index 360bfb83..f7b003f1 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbAccessControl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbAccessControl.java @@ -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; } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbBuilding.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbBuilding.java index a7e947a5..fefdfbbb 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbBuilding.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbBuilding.java @@ -13,7 +13,7 @@ import java.io.Serial; * 建筑管理对象 tb_building * * @author mocheng - * @date 2025-06-17 + * @date 2025-06-18 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbCeremonialServe.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbCeremonialServe.java index 9d52eadd..3c82ab82 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbCeremonialServe.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbCeremonialServe.java @@ -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) diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbCeremonialserveRoombooking.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbCeremonialserveRoombooking.java index 223d86f4..a6f365db 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbCeremonialserveRoombooking.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbCeremonialserveRoombooking.java @@ -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; + } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbCityArea.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbCityArea.java index 519c6335..28ade296 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbCityArea.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbCityArea.java @@ -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) diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbCommunity.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbCommunity.java index 9921c701..a36be175 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbCommunity.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbCommunity.java @@ -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) diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbConference.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbConference.java index 065b1069..a1090837 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbConference.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbConference.java @@ -13,7 +13,7 @@ import java.io.Serial; * 会议室管理对象 tb_conference * * @author mocheng - * @date 2025-06-17 + * @date 2025-06-18 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbE8Config.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbE8Config.java index 890f76e4..0243dbe0 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbE8Config.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbE8Config.java @@ -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; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbFloor.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbFloor.java index 044cbbb6..18fb226a 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbFloor.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbFloor.java @@ -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; + } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbRoomBooking.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbRoomBooking.java index 89a38112..cbb0e77f 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbRoomBooking.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbRoomBooking.java @@ -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) diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbVisitorManagement.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbVisitorManagement.java index e70c8b6a..cf81713f 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbVisitorManagement.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbVisitorManagement.java @@ -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) diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TdDeviceType.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TdDeviceType.java index d01fb23b..6aad3879 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TdDeviceType.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TdDeviceType.java @@ -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) diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TdFactory.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TdFactory.java index 585f888b..655c9708 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TdFactory.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TdFactory.java @@ -13,7 +13,7 @@ import java.io.Serial; * 厂商管理对象 td_factory * * @author mocheng - * @date 2025-06-17 + * @date 2025-06-18 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TsConfig.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TsConfig.java index d23e3ace..19af0e4f 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TsConfig.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TsConfig.java @@ -13,7 +13,7 @@ import java.io.Serial; * 代码配置对象 ts_config * * @author mocheng - * @date 2025-06-17 + * @date 2025-06-18 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TsOperationLog.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TsOperationLog.java index 27267fee..8f6be2af 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TsOperationLog.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TsOperationLog.java @@ -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) diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbAccessControlBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbAccessControlBo.java index b19692d6..756934bc 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbAccessControlBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbAccessControlBo.java @@ -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; + } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbBuildingBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbBuildingBo.java index ecef6117..09afca51 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbBuildingBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbBuildingBo.java @@ -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; - } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbCeremonialServeBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbCeremonialServeBo.java index 2315549a..eb9c5120 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbCeremonialServeBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbCeremonialServeBo.java @@ -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; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbCeremonialserveRoombookingBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbCeremonialserveRoombookingBo.java index 9695569f..7e924494 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbCeremonialserveRoombookingBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbCeremonialserveRoombookingBo.java @@ -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; + } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbCityAreaBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbCityAreaBo.java index e65e58ff..80df8d45 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbCityAreaBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbCityAreaBo.java @@ -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; - } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbCommunityBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbCommunityBo.java index 69ff122d..3eca8943 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbCommunityBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbCommunityBo.java @@ -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; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbConferenceBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbConferenceBo.java index 34a98444..fe29a204 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbConferenceBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbConferenceBo.java @@ -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) diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbE8ConfigBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbE8ConfigBo.java index b1f5c081..da4cbe00 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbE8ConfigBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbE8ConfigBo.java @@ -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; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbFloorBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbFloorBo.java index 1a8d3770..3a7c92e2 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbFloorBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbFloorBo.java @@ -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; + } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbRoomBookingBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbRoomBookingBo.java index e4eeba77..a81d3aab 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbRoomBookingBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbRoomBookingBo.java @@ -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; - } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbVisitorManagementBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbVisitorManagementBo.java index 51e8856e..0899c0b7 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbVisitorManagementBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbVisitorManagementBo.java @@ -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; /** diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TdDeviceTypeBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TdDeviceTypeBo.java index af1c5b1f..1ac19fb2 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TdDeviceTypeBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TdDeviceTypeBo.java @@ -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) diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TdFactoryBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TdFactoryBo.java index 7ebf5af4..a9a49427 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TdFactoryBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TdFactoryBo.java @@ -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; /** diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TsConfigBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TsConfigBo.java index 2665e584..8b6eb5de 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TsConfigBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TsConfigBo.java @@ -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) diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TsOperationLogBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TsOperationLogBo.java index 0b59e651..1f91dcc6 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TsOperationLogBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TsOperationLogBo.java @@ -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) diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbAccessControlVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbAccessControlVo.java index eeefe5c6..563b0e90 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbAccessControlVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbAccessControlVo.java @@ -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; + } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbBuildingVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbBuildingVo.java index ce355e2c..427be001 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbBuildingVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbBuildingVo.java @@ -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; - } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbCeremonialServeVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbCeremonialServeVo.java index 8f75acb6..cff97dd5 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbCeremonialServeVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbCeremonialServeVo.java @@ -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; - /** * 产品图片 */ diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbCeremonialserveRoombookingVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbCeremonialserveRoombookingVo.java index bb9bef8c..85182a61 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbCeremonialserveRoombookingVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbCeremonialserveRoombookingVo.java @@ -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; + } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbCityAreaVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbCityAreaVo.java index 3017b8da..f5280b70 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbCityAreaVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbCityAreaVo.java @@ -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; - } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbCommunityVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbCommunityVo.java index 7d51208f..861d66a2 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbCommunityVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbCommunityVo.java @@ -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; - } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbConferenceVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbConferenceVo.java index 578f9efb..9b12c339 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbConferenceVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbConferenceVo.java @@ -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; /** diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbE8ConfigVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbE8ConfigVo.java index 5a8c8e7c..f1217b87 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbE8ConfigVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbE8ConfigVo.java @@ -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; - } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbFloorVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbFloorVo.java index f4558aa4..a6562574 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbFloorVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbFloorVo.java @@ -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; + } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbRoomBookingVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbRoomBookingVo.java index 73aecd5a..ce938f14 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbRoomBookingVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbRoomBookingVo.java @@ -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; - } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbVisitorManagementVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbVisitorManagementVo.java index 6bbee59e..358b0cd0 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbVisitorManagementVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbVisitorManagementVo.java @@ -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; - /** * 访客姓名 */ diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TdDeviceTypeVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TdDeviceTypeVo.java index 4bead7dc..619b8787 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TdDeviceTypeVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TdDeviceTypeVo.java @@ -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; - /** * 设备类型编码 */ diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TdFactoryVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TdFactoryVo.java index d409b5b4..8b170653 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TdFactoryVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TdFactoryVo.java @@ -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; - /** * 厂商编码 */ diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TsConfigVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TsConfigVo.java index dc4d4f96..7a144ba1 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TsConfigVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TsConfigVo.java @@ -20,7 +20,7 @@ import java.util.Date; * 代码配置视图对象 ts_config * * @author mocheng - * @date 2025-06-17 + * @date 2025-06-18 */ @Data @ExcelIgnoreUnannotated diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TsOperationLogVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TsOperationLogVo.java index 15dd47b9..51ea426b 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TsOperationLogVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TsOperationLogVo.java @@ -20,7 +20,7 @@ import java.util.Date; * 请求日志视图对象 ts_operation_log * * @author mocheng - * @date 2025-06-17 + * @date 2025-06-18 */ @Data @ExcelIgnoreUnannotated diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbAccessControlMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbAccessControlMapper.java index 279ea31d..5d70bf72 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbAccessControlMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbAccessControlMapper.java @@ -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 { diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbBuildingMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbBuildingMapper.java index 2a99a296..8c658060 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbBuildingMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbBuildingMapper.java @@ -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 { diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbCeremonialServeMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbCeremonialServeMapper.java index 3f379614..638b80f7 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbCeremonialServeMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbCeremonialServeMapper.java @@ -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 { diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbCeremonialserveRoombookingMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbCeremonialserveRoombookingMapper.java index 256cddf8..0e7140e1 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbCeremonialserveRoombookingMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbCeremonialserveRoombookingMapper.java @@ -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 { diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbCityAreaMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbCityAreaMapper.java index f60cb370..221356f5 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbCityAreaMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbCityAreaMapper.java @@ -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 { diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbCommunityMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbCommunityMapper.java index ac92d77f..f7005dcb 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbCommunityMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbCommunityMapper.java @@ -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 { diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbConferenceMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbConferenceMapper.java index 1304322b..bc4d57bf 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbConferenceMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbConferenceMapper.java @@ -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 { diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbE8ConfigMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbE8ConfigMapper.java index da79265b..02d21b92 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbE8ConfigMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbE8ConfigMapper.java @@ -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 { diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbFloorMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbFloorMapper.java index 4d6b213f..b59b985b 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbFloorMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbFloorMapper.java @@ -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 { diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbRoomBookingMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbRoomBookingMapper.java index 02952ebe..6307a363 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbRoomBookingMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbRoomBookingMapper.java @@ -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 { diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbVisitorManagementMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbVisitorManagementMapper.java index 1c424a85..5e3e080c 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbVisitorManagementMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TbVisitorManagementMapper.java @@ -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 { diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TdDeviceTypeMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TdDeviceTypeMapper.java index 0aeed2d8..36b0731e 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TdDeviceTypeMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TdDeviceTypeMapper.java @@ -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 { diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TdFactoryMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TdFactoryMapper.java index fbfa311f..6f838561 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TdFactoryMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TdFactoryMapper.java @@ -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 { diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TsConfigMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TsConfigMapper.java index 0d338c2d..de73a3df 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TsConfigMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TsConfigMapper.java @@ -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 { diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TsOperationLogMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TsOperationLogMapper.java index 767cc266..f307a53e 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TsOperationLogMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/TsOperationLogMapper.java @@ -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 { diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbAccessControlService.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbAccessControlService.java index fdde4d26..5079e449 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbAccessControlService.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbAccessControlService.java @@ -13,7 +13,7 @@ import java.util.List; * 门禁管理Service接口 * * @author mocheng - * @date 2025-06-17 + * @date 2025-06-18 */ public interface ITbAccessControlService { diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbBuildingService.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbBuildingService.java index 9f8efaa7..5add3fec 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbBuildingService.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbBuildingService.java @@ -13,7 +13,7 @@ import java.util.List; * 建筑管理Service接口 * * @author mocheng - * @date 2025-06-17 + * @date 2025-06-18 */ public interface ITbBuildingService { diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbCeremonialServeService.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbCeremonialServeService.java index 9c3e7b44..1edabbb7 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbCeremonialServeService.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbCeremonialServeService.java @@ -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 queryPageList(TbCeremonialServeBo bo, PageQuery pageQuery); /** - * 查询符合条件的服务列表 + * 查询符合条件的会议服务列表 * * @param bo 查询条件 - * @return 服务列表 + * @return 会议服务列表 */ List 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 是否进行有效性校验 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbCeremonialserveRoombookingService.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbCeremonialserveRoombookingService.java index f14150e8..2f6537fa 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbCeremonialserveRoombookingService.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbCeremonialserveRoombookingService.java @@ -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 queryPageList(TbCeremonialserveRoombookingBo bo, PageQuery pageQuery); /** - * 查询符合条件的服务订阅列表 + * 查询符合条件的会议预定列表 * * @param bo 查询条件 - * @return 服务订阅列表 + * @return 会议预定列表 */ List 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 是否进行有效性校验 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbCityAreaService.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbCityAreaService.java index c7353e0f..c91bc3a6 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbCityAreaService.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbCityAreaService.java @@ -14,7 +14,7 @@ import java.util.List; Service接口 * * @author mocheng - * @date 2025-06-17 + * @date 2025-06-18 */ public interface ITbCityAreaService { diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbCommunityService.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbCommunityService.java index 6ba5c032..b18977ed 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbCommunityService.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbCommunityService.java @@ -13,7 +13,7 @@ import java.util.List; * 小区管理Service接口 * * @author mocheng - * @date 2025-06-17 + * @date 2025-06-18 */ public interface ITbCommunityService { diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbConferenceService.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbConferenceService.java index 162035c1..76da4ad0 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbConferenceService.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbConferenceService.java @@ -13,7 +13,7 @@ import java.util.List; * 会议室管理Service接口 * * @author mocheng - * @date 2025-06-17 + * @date 2025-06-18 */ public interface ITbConferenceService { diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbE8ConfigService.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbE8ConfigService.java index bc457f40..f4af363a 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbE8ConfigService.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbE8ConfigService.java @@ -13,7 +13,7 @@ import java.util.List; * E8服务地址Service接口 * * @author mocheng - * @date 2025-06-17 + * @date 2025-06-18 */ public interface ITbE8ConfigService { diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbFloorService.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbFloorService.java index cb313993..2d4a2a01 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbFloorService.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbFloorService.java @@ -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 queryPageList(TbFloorBo bo, PageQuery pageQuery); /** - * 查询符合条件的楼层列表 + * 查询符合条件的楼层管理列表 * * @param bo 查询条件 - * @return 楼层列表 + * @return 楼层管理列表 */ List 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 是否进行有效性校验 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbRoomBookingService.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbRoomBookingService.java index f8af0b0b..04f279a5 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbRoomBookingService.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbRoomBookingService.java @@ -13,7 +13,7 @@ import java.util.List; * 会议管理Service接口 * * @author mocheng - * @date 2025-06-17 + * @date 2025-06-18 */ public interface ITbRoomBookingService { diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbVisitorManagementService.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbVisitorManagementService.java index c31821e3..c6e568fb 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbVisitorManagementService.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbVisitorManagementService.java @@ -13,7 +13,7 @@ import java.util.List; * 访客管理Service接口 * * @author mocheng - * @date 2025-06-17 + * @date 2025-06-18 */ public interface ITbVisitorManagementService { diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITdDeviceTypeService.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITdDeviceTypeService.java index 2dfc57a7..298f1266 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITdDeviceTypeService.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITdDeviceTypeService.java @@ -13,7 +13,7 @@ import java.util.List; * 设备类型Service接口 * * @author mocheng - * @date 2025-06-17 + * @date 2025-06-18 */ public interface ITdDeviceTypeService { diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITdFactoryService.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITdFactoryService.java index c907d569..d8a03566 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITdFactoryService.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITdFactoryService.java @@ -13,7 +13,7 @@ import java.util.List; * 厂商管理Service接口 * * @author mocheng - * @date 2025-06-17 + * @date 2025-06-18 */ public interface ITdFactoryService { diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITsConfigService.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITsConfigService.java index 9320d1bf..069cb198 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITsConfigService.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITsConfigService.java @@ -13,7 +13,7 @@ import java.util.List; * 代码配置Service接口 * * @author mocheng - * @date 2025-06-17 + * @date 2025-06-18 */ public interface ITsConfigService { diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITsOperationLogService.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITsOperationLogService.java index 6b7a11fb..e9d85c07 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITsOperationLogService.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITsOperationLogService.java @@ -13,7 +13,7 @@ import java.util.List; * 请求日志Service接口 * * @author mocheng - * @date 2025-06-17 + * @date 2025-06-18 */ public interface ITsOperationLogService { diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbAccessControlServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbAccessControlServiceImpl.java index 00442ba7..acb16672 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbAccessControlServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbAccessControlServiceImpl.java @@ -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; } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbBuildingServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbBuildingServiceImpl.java index c9e07367..d65415ce 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbBuildingServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbBuildingServiceImpl.java @@ -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; } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbCeremonialServeServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbCeremonialServeServiceImpl.java index 01d447af..173aeaba 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbCeremonialServeServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbCeremonialServeServiceImpl.java @@ -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 queryPageList(TbCeremonialServeBo bo, PageQuery pageQuery) { @@ -59,10 +59,10 @@ public class TbCeremonialServeServiceImpl implements ITbCeremonialServeService { } /** - * 查询符合条件的服务列表 + * 查询符合条件的会议服务列表 * * @param bo 查询条件 - * @return 服务列表 + * @return 会议服务列表 */ @Override public List 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 是否进行有效性校验 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbCeremonialserveRoombookingServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbCeremonialserveRoombookingServiceImpl.java index 129fe3b2..fdd875de 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbCeremonialserveRoombookingServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbCeremonialserveRoombookingServiceImpl.java @@ -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 queryPageList(TbCeremonialserveRoombookingBo bo, PageQuery pageQuery) { @@ -59,10 +59,10 @@ public class TbCeremonialserveRoombookingServiceImpl implements ITbCeremonialser } /** - * 查询符合条件的服务订阅列表 + * 查询符合条件的会议预定列表 * * @param bo 查询条件 - * @return 服务订阅列表 + * @return 会议预定列表 */ @Override public List 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 是否进行有效性校验 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbCityAreaServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbCityAreaServiceImpl.java index 2ecc727a..cccf9c7f 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbCityAreaServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbCityAreaServiceImpl.java @@ -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; } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbCommunityServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbCommunityServiceImpl.java index 8002170c..2b28a34b 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbCommunityServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbCommunityServiceImpl.java @@ -24,7 +24,7 @@ import java.util.Collection; * 小区管理Service业务层处理 * * @author mocheng - * @date 2025-06-17 + * @date 2025-06-18 */ @Slf4j @RequiredArgsConstructor diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbConferenceServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbConferenceServiceImpl.java index 02d9c395..f416e329 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbConferenceServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbConferenceServiceImpl.java @@ -24,7 +24,7 @@ import java.util.Collection; * 会议室管理Service业务层处理 * * @author mocheng - * @date 2025-06-17 + * @date 2025-06-18 */ @Slf4j @RequiredArgsConstructor diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbE8ConfigServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbE8ConfigServiceImpl.java index 6098fd34..6dde8a07 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbE8ConfigServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbE8ConfigServiceImpl.java @@ -24,7 +24,7 @@ import java.util.Collection; * E8服务地址Service业务层处理 * * @author mocheng - * @date 2025-06-17 + * @date 2025-06-18 */ @Slf4j @RequiredArgsConstructor diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbFloorServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbFloorServiceImpl.java index 4e16cd7c..ef908376 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbFloorServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbFloorServiceImpl.java @@ -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 queryPageList(TbFloorBo bo, PageQuery pageQuery) { @@ -59,10 +59,10 @@ public class TbFloorServiceImpl implements ITbFloorService { } /** - * 查询符合条件的楼层列表 + * 查询符合条件的楼层管理列表 * * @param bo 查询条件 - * @return 楼层列表 + * @return 楼层管理列表 */ @Override public List 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 是否进行有效性校验 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbRoomBookingServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbRoomBookingServiceImpl.java index 75b27d42..9f5ade90 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbRoomBookingServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbRoomBookingServiceImpl.java @@ -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; } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbVisitorManagementServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbVisitorManagementServiceImpl.java index d57a2608..914e059a 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbVisitorManagementServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbVisitorManagementServiceImpl.java @@ -24,7 +24,7 @@ import java.util.Collection; * 访客管理Service业务层处理 * * @author mocheng - * @date 2025-06-17 + * @date 2025-06-18 */ @Slf4j @RequiredArgsConstructor diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TdDeviceTypeServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TdDeviceTypeServiceImpl.java index dfdd7616..a99e6a71 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TdDeviceTypeServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TdDeviceTypeServiceImpl.java @@ -24,7 +24,7 @@ import java.util.Collection; * 设备类型Service业务层处理 * * @author mocheng - * @date 2025-06-17 + * @date 2025-06-18 */ @Slf4j @RequiredArgsConstructor diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TdFactoryServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TdFactoryServiceImpl.java index f200e5a4..75b7be32 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TdFactoryServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TdFactoryServiceImpl.java @@ -24,7 +24,7 @@ import java.util.Collection; * 厂商管理Service业务层处理 * * @author mocheng - * @date 2025-06-17 + * @date 2025-06-18 */ @Slf4j @RequiredArgsConstructor diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TsConfigServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TsConfigServiceImpl.java index 5ba62feb..b0e8c074 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TsConfigServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TsConfigServiceImpl.java @@ -24,7 +24,7 @@ import java.util.Collection; * 代码配置Service业务层处理 * * @author mocheng - * @date 2025-06-17 + * @date 2025-06-18 */ @Slf4j @RequiredArgsConstructor diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TsOperationLogServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TsOperationLogServiceImpl.java index 9293640f..344b5336 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TsOperationLogServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TsOperationLogServiceImpl.java @@ -24,7 +24,7 @@ import java.util.Collection; * 请求日志Service业务层处理 * * @author mocheng - * @date 2025-06-17 + * @date 2025-06-18 */ @Slf4j @RequiredArgsConstructor