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

页面修改

Browse Source
This commit is contained in:
lxj 2025-06-26 22:01:48 +08:00
parent 0f382df17d
commit f2a1bdc0bf
19 changed files with 333 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/TreeNode.java Normal file
View File

@ -0,0 +1,31 @@
package org.dromara.common.core.domain;
import lombok.Data;
import java.util.List;
@Data
public class TreeNode<T> implements TreeEntity<TreeNode<T>, T> {
// 层级
private Integer level;
// 编码
private T code;
// 父编码
private T ParentCode;
// 标签
private String label;
// 子节点
private List<TreeNode<T>> children;
@Override
public T getId() {
return getCode();
}
@Override
public T getParentId() {
return getParentCode();
}
}

2
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/TreeUtils.java
View File

@ -21,7 +21,7 @@ public class TreeUtils {
* @param rootCode 根节点编码
* @return 构建树状
*/
public static <T extends TreeEntity<T, ?>> List<T> getTreeList(List<T> entityList, Object rootCode) {
public static <T extends TreeEntity<T, ?>> List<T> build(List<T> entityList, Object rootCode) {
if (CollectionUtil.isEmpty(entityList)) {
return new ArrayList<>();
}

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

@ -1,26 +1,31 @@
package org.dromara.property.controller;
import java.util.List;
import lombok.RequiredArgsConstructor;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.web.core.BaseController;
import org.dromara.common.mybatis.core.page.PageQuery;
import cn.hutool.core.lang.Assert;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.domain.TreeNode;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.property.domain.vo.TbCommunityVo;
import org.dromara.property.domain.bo.TbCommunityBo;
import org.dromara.property.service.ITbCommunityService;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.common.web.core.BaseController;
import org.dromara.property.domain.bo.TbCommunityBo;
import org.dromara.property.domain.vo.TbCommunityVo;
import org.dromara.property.service.ITbCommunityService;
import org.dromara.system.api.model.LoginUser;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 小区
@ -46,6 +51,25 @@ public class TbCommunityController extends BaseController {
return tbCommunityService.queryPageList(bo, pageQuery);
}
/**
* 加载社区树结构
* 1: 加载社区
* 2：加载到建筑
* 3：加载到单元
* 4：加载到楼层
* 5：加载到房间
*
* @return 树结构数据
*/
@GetMapping("/tree/{level}")
public List<TreeNode<String>> tree(@PathVariable("level") Integer level) {
LoginUser loginUser = LoginHelper.getLoginUser();
Assert.notNull(loginUser, "获取账户信息失败!");
Assert.notEmpty(loginUser.getTenantId(), "获取租户信息失败");
return tbCommunityService.tree(level, loginUser.getTenantId());
}
/**
* 导出小区列表
*/

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

@ -35,7 +35,7 @@ public class TbFloor extends TenantEntity {
/**
* 楼层编码
*/
private Long floorCode;
private String floorCode;
/**
* 楼层数名称

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

@ -36,7 +36,7 @@ public class TbFloorBo extends BaseEntity {
* 楼层编码
*/
@NotNull(message = "楼层编码不能为空", groups = { AddGroup.class, EditGroup.class })
private Long floorCode;
private String floorCode;
/**
* 楼层数名称

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

@ -0,0 +1,29 @@
package org.dromara.property.domain.vo;
import lombok.Data;
@Data
public class CommunityTreeVo<T> {
@Data
public static class BuildingTreeVo<T> {
}
@Data
public static class FloorTreeVo<T> {
}
@Data
public static class UnitTreeVo<T> {
}
@Data
public static class RoomTreeVo {
}
}

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

@ -44,7 +44,7 @@ public class TbFloorVo implements Serializable {
* 楼层编码
*/
@ExcelProperty(value = "楼层编码")
private Long floorCode;
private String floorCode;
/**
* 楼层数名称

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

@ -1,10 +1,9 @@
package org.dromara.property.service;
import org.dromara.property.domain.TbBuilding;
import org.dromara.property.domain.vo.TbBuildingVo;
import org.dromara.property.domain.bo.TbBuildingBo;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.property.domain.bo.TbBuildingBo;
import org.dromara.property.domain.vo.TbBuildingVo;
import java.util.Collection;
import java.util.List;
@ -66,4 +65,11 @@ public interface ITbBuildingService {
* @return 是否删除成功
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
/**
* 加载当前租户下的所有建筑
* @param tenantId 租户编码
* @return 返回建筑列表
*/
List<TbBuildingVo> queryByTenantId(String tenantId);
}

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

@ -1,10 +1,10 @@
package org.dromara.property.service;
import org.dromara.property.domain.TbCommunity;
import org.dromara.property.domain.vo.TbCommunityVo;
import org.dromara.property.domain.bo.TbCommunityBo;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.core.domain.TreeNode;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.property.domain.bo.TbCommunityBo;
import org.dromara.property.domain.vo.TbCommunityVo;
import java.util.Collection;
import java.util.List;
@ -25,6 +25,14 @@ public interface ITbCommunityService {
*/
TbCommunityVo queryById(Long id);
/**
* 查询小区列表
*
* @param tenantId 租户编码
* @return 小区
*/
List<TbCommunityVo> queryByTenantId(String tenantId);
/**
* 分页查询小区列表
*
@ -66,4 +74,12 @@ public interface ITbCommunityService {
* @return 是否删除成功
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
/**
* 加载社区树结构
* @param level 加载等级
* @return 树结构
*/
List<TreeNode<String>> tree(Integer level,String tenantId);
}

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

@ -66,4 +66,6 @@ public interface ITbFloorService {
* @return 是否删除成功
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
List<TbFloorVo> queryByTenantId(String tenantId);
}

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

@ -1,6 +1,7 @@
package org.dromara.property.service;
import org.dromara.property.domain.TbRoom;
import org.dromara.property.domain.vo.TbFloorVo;
import org.dromara.property.domain.vo.TbRoomVo;
import org.dromara.property.domain.bo.TbRoomBo;
import org.dromara.common.mybatis.core.page.TableDataInfo;
@ -66,4 +67,6 @@ public interface ITbRoomService {
* @return 是否删除成功
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
List<TbRoomVo> queryByTenantId(String tenantId);
}

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

@ -1,10 +1,9 @@
package org.dromara.property.service;
import org.dromara.property.domain.TbUnit;
import org.dromara.property.domain.vo.TbUnitVo;
import org.dromara.property.domain.bo.TbUnitBo;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.property.domain.bo.TbUnitBo;
import org.dromara.property.domain.vo.TbUnitVo;
import java.util.Collection;
import java.util.List;
@ -66,4 +65,7 @@ public interface ITbUnitService {
* @return 是否删除成功
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
List<TbUnitVo> queryByTenantId(String tenantId);
}

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

@ -156,6 +156,6 @@ public class SysCityAreaServiceImpl implements ISysCityAreaService {
return new ArrayList<>();
}
List<CityAreaTreeVo> vo = SysCityAreaCovert.INSTANCE.entity2Vo(cityAreas);
return TreeUtils.getTreeList(vo, "0");
return TreeUtils.build(vo, "0");
}
}

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

@ -1,24 +1,24 @@
package org.dromara.property.service.impl;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.property.domain.TbBuilding;
import org.dromara.property.domain.bo.TbBuildingBo;
import org.dromara.property.domain.vo.TbBuildingVo;
import org.dromara.property.domain.TbBuilding;
import org.dromara.property.mapper.TbBuildingMapper;
import org.dromara.property.service.ITbBuildingService;
import org.springframework.stereotype.Service;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 建筑Service业务层处理
@ -40,7 +40,7 @@ public class TbBuildingServiceImpl implements ITbBuildingService {
* @return 建筑
*/
@Override
public TbBuildingVo queryById(Long id){
public TbBuildingVo queryById(Long id) {
return baseMapper.selectVoById(id);
}
@ -137,7 +137,7 @@ public class TbBuildingServiceImpl implements ITbBuildingService {
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(TbBuilding entity){
private void validEntityBeforeSave(TbBuilding entity) {
//TODO 做一些数据校验,如唯一约束
}
@ -150,9 +150,16 @@ public class TbBuildingServiceImpl implements ITbBuildingService {
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
if (isValid) {
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;
}
@Override
public List<TbBuildingVo> queryByTenantId(String tenantId) {
LambdaQueryWrapper<TbBuilding> lqw = Wrappers.lambdaQuery();
lqw.eq(TbBuilding::getTenantId, tenantId);
return baseMapper.selectVoList(lqw);
}
}

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

@ -1,24 +1,27 @@
package org.dromara.property.service.impl;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.dromara.property.domain.bo.TbCommunityBo;
import org.dromara.property.domain.vo.TbCommunityVo;
import org.dromara.common.core.domain.TreeNode;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.core.utils.TreeUtils;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.property.domain.TbCommunity;
import org.dromara.property.domain.bo.TbCommunityBo;
import org.dromara.property.domain.vo.*;
import org.dromara.property.mapper.TbCommunityMapper;
import org.dromara.property.service.ITbCommunityService;
import org.dromara.property.service.*;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 小区Service业务层处理
@ -32,6 +35,100 @@ import java.util.Collection;
public class TbCommunityServiceImpl implements ITbCommunityService {
private final TbCommunityMapper baseMapper;
private final ITbBuildingService buildingService;
private final ITbUnitService unitService;
private final ITbFloorService floorService;
private final ITbRoomService roomService;
@Override
public List<TreeNode<String>> tree(Integer level, String tenantId) {
// 默认加载社区树
List<TbCommunityVo> tbCommunityVos = queryByTenantId(tenantId);
if (tbCommunityVos == null || tbCommunityVos.isEmpty()) {
return new ArrayList<>();
}
List<TreeNode<String>> community = new ArrayList<>(tbCommunityVos.stream().map(item -> {
TreeNode<String> node = new TreeNode<>();
node.setChildren(new ArrayList<>());
node.setCode(item.getCommunityCode());
node.setLabel(item.getCommunityName());
node.setParentCode("");
node.setLevel(1);
return node;
}).toList());
if (level == 1) {
return community;
}
if (level >= 2) {
List<TbBuildingVo> vos = buildingService.queryByTenantId(tenantId);
if (vos != null && !vos.isEmpty()) {
List<TreeNode<String>> list = vos.stream().map(item -> {
TreeNode<String> node = new TreeNode<>();
node.setChildren(new ArrayList<>());
node.setCode(item.getBuildingCode());
node.setLabel(item.getBuildingName());
node.setParentCode(item.getCommunityCode());
node.setLevel(2);
return node;
}).toList();
community.addAll(list);
}
}
if (level >= 3) {
List<TbUnitVo> vos = unitService.queryByTenantId(tenantId);
if (vos != null && !vos.isEmpty()) {
List<TreeNode<String>> list = vos.stream().map(item -> {
TreeNode<String> node = new TreeNode<>();
node.setChildren(new ArrayList<>());
node.setCode(item.getUnitCode());
node.setLabel(item.getUnitName());
node.setParentCode(item.getBuildingCode());
node.setLevel(3);
return node;
}).toList();
community.addAll(list);
}
}
if (level >= 4) {
List<TbFloorVo> vos = floorService.queryByTenantId(tenantId);
if (vos != null && !vos.isEmpty()) {
List<TreeNode<String>> list = vos.stream().map(item -> {
TreeNode<String> node = new TreeNode<>();
node.setChildren(new ArrayList<>());
node.setCode(item.getFloorCode());
node.setLabel(item.getFloorName());
node.setParentCode(item.getUnitCode());
node.setLevel(4);
return node;
}).toList();
community.addAll(list);
}
}
if (level >= 5) {
List<TbRoomVo> vos = roomService.queryByTenantId(tenantId);
if (vos != null && !vos.isEmpty()) {
List<TreeNode<String>> list = vos.stream().map(item -> {
TreeNode<String> node = new TreeNode<>();
node.setChildren(new ArrayList<>());
node.setCode(item.getRoomCode());
node.setLabel(item.getRoomNumber());
node.setParentCode(item.getFloorCode());
node.setLevel(5);
return node;
}).toList();
community.addAll(list);
}
}
return TreeUtils.build(community, "");
}
@Override
public List<TbCommunityVo> queryByTenantId(String tenantId) {
LambdaQueryWrapper<TbCommunity> queryWrapper = Wrappers.lambdaQuery();
queryWrapper.eq(TbCommunity::getTenantId, tenantId);
return baseMapper.selectVoList(queryWrapper);
}
/**
* 查询小区
@ -40,7 +137,7 @@ public class TbCommunityServiceImpl implements ITbCommunityService {
* @return 小区
*/
@Override
public TbCommunityVo queryById(Long id){
public TbCommunityVo queryById(Long id) {
return baseMapper.selectVoById(id);
}
@ -125,7 +222,7 @@ public class TbCommunityServiceImpl implements ITbCommunityService {
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(TbCommunity entity){
private void validEntityBeforeSave(TbCommunity entity) {
//TODO 做一些数据校验,如唯一约束
}
@ -138,9 +235,10 @@ public class TbCommunityServiceImpl implements ITbCommunityService {
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
if (isValid) {
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;
}
}

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

@ -1,24 +1,24 @@
package org.dromara.property.service.impl;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.property.domain.TbFloor;
import org.dromara.property.domain.bo.TbFloorBo;
import org.dromara.property.domain.vo.TbFloorVo;
import org.dromara.property.domain.TbFloor;
import org.dromara.property.mapper.TbFloorMapper;
import org.dromara.property.service.ITbFloorService;
import org.springframework.stereotype.Service;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 楼层Service业务层处理
@ -40,7 +40,7 @@ public class TbFloorServiceImpl implements ITbFloorService {
* @return 楼层
*/
@Override
public TbFloorVo queryById(Long id){
public TbFloorVo queryById(Long id) {
return baseMapper.selectVoById(id);
}
@ -117,7 +117,7 @@ public class TbFloorServiceImpl implements ITbFloorService {
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(TbFloor entity){
private void validEntityBeforeSave(TbFloor entity) {
//TODO 做一些数据校验,如唯一约束
}
@ -130,9 +130,16 @@ public class TbFloorServiceImpl implements ITbFloorService {
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
if (isValid) {
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;
}
@Override
public List<TbFloorVo> queryByTenantId(String tenantId) {
LambdaQueryWrapper<TbFloor> lqw = Wrappers.lambdaQuery();
lqw.eq(TbFloor::getTenantId, tenantId);
return baseMapper.selectVoList(lqw);
}
}

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

@ -1,24 +1,24 @@
package org.dromara.property.service.impl;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.property.domain.TbRoom;
import org.dromara.property.domain.bo.TbRoomBo;
import org.dromara.property.domain.vo.TbRoomVo;
import org.dromara.property.domain.TbRoom;
import org.dromara.property.mapper.TbRoomMapper;
import org.dromara.property.service.ITbRoomService;
import org.springframework.stereotype.Service;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 房间信息Service业务层处理
@ -40,7 +40,7 @@ public class TbRoomServiceImpl implements ITbRoomService {
* @return 房间信息
*/
@Override
public TbRoomVo queryById(Long id){
public TbRoomVo queryById(Long id) {
return baseMapper.selectVoById(id);
}
@ -119,7 +119,7 @@ public class TbRoomServiceImpl implements ITbRoomService {
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(TbRoom entity){
private void validEntityBeforeSave(TbRoom entity) {
//TODO 做一些数据校验,如唯一约束
}
@ -132,9 +132,16 @@ public class TbRoomServiceImpl implements ITbRoomService {
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
if (isValid) {
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;
}
@Override
public List<TbRoomVo> queryByTenantId(String tenantId) {
LambdaQueryWrapper<TbRoom> lqw = Wrappers.lambdaQuery();
lqw.eq(TbRoom::getTenantId, tenantId);
return baseMapper.selectVoList(lqw);
}
}

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

@ -1,24 +1,24 @@
package org.dromara.property.service.impl;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.property.domain.TbUnit;
import org.dromara.property.domain.bo.TbUnitBo;
import org.dromara.property.domain.vo.TbUnitVo;
import org.dromara.property.domain.TbUnit;
import org.dromara.property.mapper.TbUnitMapper;
import org.dromara.property.service.ITbUnitService;
import org.springframework.stereotype.Service;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 单元Service业务层处理
@ -40,7 +40,7 @@ public class TbUnitServiceImpl implements ITbUnitService {
* @return 单元
*/
@Override
public TbUnitVo queryById(Long id){
public TbUnitVo queryById(Long id) {
return baseMapper.selectVoById(id);
}
@ -116,7 +116,7 @@ public class TbUnitServiceImpl implements ITbUnitService {
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(TbUnit entity){
private void validEntityBeforeSave(TbUnit entity) {
//TODO 做一些数据校验,如唯一约束
}
@ -129,9 +129,16 @@ public class TbUnitServiceImpl implements ITbUnitService {
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
if (isValid) {
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;
}
@Override
public List<TbUnitVo> queryByTenantId(String tenantId) {
LambdaQueryWrapper<TbUnit> queryWrapper = Wrappers.lambdaQuery();
queryWrapper.eq(TbUnit::getTenantId, tenantId);
return baseMapper.selectVoList(queryWrapper);
}
}

2
ruoyi-modules/Sis/src/main/resources/application.yml
View File

@ -1,6 +1,6 @@
# Tomcat
server:
port: 10001
port: 10002
# Spring
spring: