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

物业模块删除厂商

Browse Source 
安防模块增加厂商
设备模块逻辑优化
This commit is contained in:
15683799673
2025-07-21 03:36:07 +08:00
parent 0c0ecf8f93
commit 365ca2d7bc
29 changed files with 364 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ruoyi-modules/Property/pom.xml
View File

@@ -17,13 +17,6 @@
<dependencies>
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
<version>5.5.8</version>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-nacos</artifactId>

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

@@ -1,106 +0,0 @@
package org.dromara.property.controller;
import java.util.List;
import lombok.RequiredArgsConstructor;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.dromara.property.domain.bo.TbFactoryBo;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.web.core.BaseController;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.property.domain.vo.TbFactoryVo;
import org.dromara.property.service.ITbFactoryService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
/**
* 厂商管理
* 前端访问路由地址为:/property/factory
*
* @author mocheng
* @since 2025-06-18
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/factory")
public class TbFactoryController extends BaseController {
private final ITbFactoryService tdFactoryService;
/**
* 查询厂商管理列表
*/
@SaCheckPermission("property:factory:list")
@GetMapping("/list")
public TableDataInfo<TbFactoryVo> list(TbFactoryBo bo, PageQuery pageQuery) {
return tdFactoryService.queryPageList(bo, pageQuery);
}
/**
* 导出厂商管理列表
*/
@SaCheckPermission("property:factory:export")
@Log(title = "厂商管理", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(TbFactoryBo bo, HttpServletResponse response) {
List<TbFactoryVo> list = tdFactoryService.queryList(bo);
ExcelUtil.exportExcel(list, "厂商管理", TbFactoryVo.class, response);
}
/**
* 获取厂商管理详细信息
*
* @param id 主键
*/
@SaCheckPermission("property:factory:query")
@GetMapping("/{id}")
public R<TbFactoryVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable("id") Long id) {
return R.ok(tdFactoryService.queryById(id));
}
/**
* 新增厂商管理
*/
@SaCheckPermission("property:factory:add")
@Log(title = "厂商管理", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody TbFactoryBo bo) {
return toAjax(tdFactoryService.insertByBo(bo));
}
/**
* 修改厂商管理
*/
@SaCheckPermission("property:factory:edit")
@Log(title = "厂商管理", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody TbFactoryBo bo) {
return toAjax(tdFactoryService.updateByBo(bo));
}
/**
* 删除厂商管理
*
* @param ids 主键串
*/
@SaCheckPermission("property:factory:remove")
@Log(title = "厂商管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable("ids") Long[] ids) {
return toAjax(tdFactoryService.deleteWithValidByIds(List.of(ids), true));
}
}

45
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbFactory.java
View File

@@ -1,45 +0,0 @@
package org.dromara.property.domain;
import org.dromara.common.tenant.core.TenantEntity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serial;
/**
* 厂商管理对象 td_factory
*
* @author mocheng
* @since 2025-06-18
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("td_factory")
public class TbFactory extends TenantEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
*
*/
@TableId(value = "id")
private Long id;
/**
* 厂商编码
*/
private String factoryNo;
/**
* 设备厂商名称
*/
private String factoryName;
/**
* 备注
*/
private String remark;
}

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

@@ -1,47 +0,0 @@
package org.dromara.property.domain.bo;
import org.dromara.property.domain.TbFactory;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
/**
* 厂商管理业务对象 td_factory
*
* @author mocheng
* @since 2025-06-18
*/
@Data
@EqualsAndHashCode(callSuper = true)
@AutoMapper(target = TbFactory.class, reverseConvertGenerate = false)
public class TbFactoryBo extends BaseEntity {
/**
*
*/
@NotNull(message = "不能为空", groups = { EditGroup.class })
private Long id;
/**
* 厂商编码
*/
@NotBlank(message = "厂商编码不能为空", groups = { AddGroup.class, EditGroup.class })
private String factoryNo;
/**
* 设备厂商名称
*/
@NotBlank(message = "设备厂商名称不能为空", groups = { AddGroup.class, EditGroup.class })
private String factoryName;
/**
* 备注
*/
private String remark;
}

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

@@ -1,52 +0,0 @@
package org.dromara.property.domain.vo;
import org.dromara.property.domain.TbFactory;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
/**
* 厂商管理视图对象 td_factory
*
* @author mocheng
* @since 2025-06-18
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = TbFactory.class)
public class TbFactoryVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
*
*/
@ExcelProperty(value = "")
private Long id;
/**
* 厂商编码
*/
@ExcelProperty(value = "厂商编码")
private String factoryNo;
/**
* 设备厂商名称
*/
@ExcelProperty(value = "设备厂商名称")
private String factoryName;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
}

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

@@ -1,17 +0,0 @@
package org.dromara.property.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.property.domain.TbFactory;
import org.dromara.property.domain.vo.TbFactoryVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**
* 厂商管理Mapper接口
*
* @author mocheng
* @since 2025-06-18
*/
@Mapper
public interface TbFactoryMapper extends BaseMapperPlus<TbFactory, TbFactoryVo> {
}

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

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

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

@@ -1,42 +1,36 @@
package org.dromara.property.service.impl;
import cn.hutool.core.date.DateTime;
import cn.idev.excel.event.Order;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.Mapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
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.CollectionUtils;
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.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.Clean;
import org.dromara.property.domain.CleanOrder;
import org.dromara.property.domain.CleanRelation;
import org.dromara.property.domain.CleanserverOrder;
import org.dromara.property.domain.vo.CleanserverOrderVo;
import org.dromara.property.mapper.CleanMapper;
import org.dromara.property.mapper.CleanRelationMapper;
import org.dromara.property.mapper.CleanserverOrderMapper;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.dromara.property.domain.bo.CleanOrderBo;
import org.dromara.property.domain.vo.CleanOrderVo;
import org.dromara.property.domain.CleanOrder;
import org.dromara.property.mapper.CleanMapper;
import org.dromara.property.mapper.CleanOrderMapper;
import org.dromara.property.mapper.CleanRelationMapper;
import org.dromara.property.mapper.CleanserverOrderMapper;
import org.dromara.property.service.ICleanOrderService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.stringtemplate.v4.ST;
import java.time.LocalDateTime;
import java.util.*;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import static kotlin.reflect.jvm.internal.impl.builtins.StandardNames.FqNames.list;
/**
* 保洁订单Service业务层处理
*
@@ -102,7 +96,7 @@ public class CleanOrderServiceImpl implements ICleanOrderService {
public TableDataInfo<CleanOrderVo> queryPageList(CleanOrderBo bo, PageQuery pageQuery) {
// 构造条件查询器，返回的是一个集合
LambdaQueryWrapper<CleanOrder> lqw = buildQueryWrapper(bo);
Page<CleanOrderVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw,CleanOrderVo.class);
Page<CleanOrderVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw, CleanOrderVo.class);
// Page<CleanOrderVo> result = baseMapper.selectForPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
@@ -158,8 +152,8 @@ public class CleanOrderServiceImpl implements ICleanOrderService {
CleanOrder add = new CleanOrder();
validEntityBeforeSave(add);
BeanUtils.copyProperties(bo, add);
add.setStarTime(String.valueOf(new DateTime(bo.getStarTime()).toLocalDateTime()));
add.setEndTime(String.valueOf(new DateTime(bo.getEndTime()).toLocalDateTime()));
add.setStarTime(bo.getStarTime());
add.setEndTime(bo.getEndTime());
add.setIsUnbooking(NOTUNBOOKING);
boolean flag = baseMapper.insert(add) > 0;
@@ -209,8 +203,8 @@ public class CleanOrderServiceImpl implements ICleanOrderService {
public Boolean updateByBo(CleanOrderBo bo) {
CleanOrder update = MapstructUtils.convert(bo, CleanOrder.class);
validEntityBeforeSave(update);
update.setStarTime(String.valueOf(new DateTime(bo.getStarTime()).toLocalDateTime()));
update.setEndTime(String.valueOf(new DateTime(bo.getStarTime()).toLocalDateTime()));
update.setStarTime(bo.getStarTime());
update.setEndTime(bo.getStarTime());
return baseMapper.updateById(update) > 0;
}

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

@@ -1,24 +1,22 @@
package org.dromara.property.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
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.dromara.property.domain.vo.MachineTypeTreeVo;
import org.springframework.stereotype.Service;
import org.dromara.property.domain.bo.MachineTypeBo;
import org.dromara.property.domain.vo.MachineTypeVo;
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.MachineType;
import org.dromara.property.domain.bo.MachineTypeBo;
import org.dromara.property.domain.vo.MachineTypeTreeVo;
import org.dromara.property.domain.vo.MachineTypeVo;
import org.dromara.property.mapper.MachineTypeMapper;
import org.dromara.property.service.IMachineTypeService;
import org.springframework.stereotype.Service;
import java.util.*;
@@ -42,7 +40,7 @@ public class MachineTypeServiceImpl implements IMachineTypeService {
* @return 设备类型
*/
@Override
public MachineTypeVo queryById(Long id){
public MachineTypeVo queryById(Long id) {
return baseMapper.selectVoById(id);
}
@@ -117,7 +115,7 @@ public class MachineTypeServiceImpl implements IMachineTypeService {
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(MachineType entity){
private void validEntityBeforeSave(MachineType entity) {
//TODO 做一些数据校验,如唯一约束
}
@@ -130,11 +128,12 @@ public class MachineTypeServiceImpl implements IMachineTypeService {
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
if (isValid) {
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;
}
/**
* 获取设备类型树列表
*
@@ -146,15 +145,17 @@ public class MachineTypeServiceImpl implements IMachineTypeService {
LambdaQueryWrapper<MachineType> lqw = buildQueryWrapper(type);
List<MachineTypeVo> machineTypeVoList = baseMapper.selectVoList(lqw);
if (CollUtil.isEmpty(machineTypeVoList)) {
return Collections.emptyList();
return Collections.emptyList();
}
List<MachineTypeTreeVo> machineTypeTreeVoList = BeanUtil.copyToList(machineTypeVoList, MachineTypeTreeVo.class);
List<MachineTypeTreeVo> machineTypeTreeVoList = MapstructUtils.convert(machineTypeVoList, MachineTypeTreeVo.class);
// 2. 构建树结构
return buildMachineTypeTree(machineTypeTreeVoList);
}
/**
* 构建设备类型树
*
* @param nodeList 所有节点
* @return 树形结构列表
*/
@@ -185,4 +186,5 @@ public class MachineTypeServiceImpl implements IMachineTypeService {
}
}
return treeList;
}}
}
}

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

@@ -123,7 +123,7 @@ public class MeetBookingServiceImpl implements IMeetBookingService {
if (CollectionUtil.isEmpty(meetBookings)) {
return new ArrayList<>();
}
List<MeetBookingAppointmentVo> meetBookingAppointmentVoList = BeanUtil.copyToList(meetBookings, MeetBookingAppointmentVo.class);
List<MeetBookingAppointmentVo> meetBookingAppointmentVoList = MapstructUtils.convert(meetBookings, MeetBookingAppointmentVo.class);
SimpleDateFormat df = new SimpleDateFormat("HH");
List<String> units = meetBookingAppointmentVoList.stream()
.map(vo -> vo.getUnit())
@@ -184,7 +184,7 @@ public class MeetBookingServiceImpl implements IMeetBookingService {
if (CollectionUtil.isEmpty(meetBookingVoList)) {
return new ArrayList<>();
}
List<MeetBookingWeekVo> meetBookingWeekVoList = BeanUtil.copyToList(meetBookingVoList, MeetBookingWeekVo.class);
List<MeetBookingWeekVo> meetBookingWeekVoList = MapstructUtils.convert(meetBookingVoList, MeetBookingWeekVo.class);
String[] weekStr = {"星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"};
List<MeetBookingWeekVo> meetBookingWeekList = new ArrayList<>();
SimpleDateFormat df = new SimpleDateFormat("HH");

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

@@ -1,134 +0,0 @@
package org.dromara.property.service.impl;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.property.domain.TbFactory;
import org.dromara.property.domain.bo.TbFactoryBo;
import org.dromara.property.domain.vo.TbFactoryVo;
import org.springframework.stereotype.Service;
import org.dromara.property.mapper.TbFactoryMapper;
import org.dromara.property.service.ITbFactoryService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 厂商管理Service业务层处理
*
* @author mocheng
* @since 2025-06-18
*/
@Slf4j
@RequiredArgsConstructor
@Service
public class TbFactoryServiceImpl implements ITbFactoryService {
private final TbFactoryMapper baseMapper;
/**
* 查询厂商管理
*
* @param id 主键
* @return 厂商管理
*/
@Override
public TbFactoryVo queryById(Long id){
return baseMapper.selectVoById(id);
}
/**
* 分页查询厂商管理列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 厂商管理分页列表
*/
@Override
public TableDataInfo<TbFactoryVo> queryPageList(TbFactoryBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<TbFactory> lqw = buildQueryWrapper(bo);
Page<TbFactoryVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询符合条件的厂商管理列表
*
* @param bo 查询条件
* @return 厂商管理列表
*/
@Override
public List<TbFactoryVo> queryList(TbFactoryBo bo) {
LambdaQueryWrapper<TbFactory> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<TbFactory> buildQueryWrapper(TbFactoryBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<TbFactory> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(TbFactory::getId);
lqw.eq(StringUtils.isNotBlank(bo.getFactoryNo()), TbFactory::getFactoryNo, bo.getFactoryNo());
lqw.like(StringUtils.isNotBlank(bo.getFactoryName()), TbFactory::getFactoryName, bo.getFactoryName());
lqw.eq(StringUtils.isNotBlank(bo.getSearchValue()), TbFactory::getSearchValue, bo.getSearchValue());
return lqw;
}
/**
* 新增厂商管理
*
* @param bo 厂商管理
* @return 是否新增成功
*/
@Override
public Boolean insertByBo(TbFactoryBo bo) {
TbFactory add = MapstructUtils.convert(bo, TbFactory.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());
}
return flag;
}
/**
* 修改厂商管理
*
* @param bo 厂商管理
* @return 是否修改成功
*/
@Override
public Boolean updateByBo(TbFactoryBo bo) {
TbFactory update = MapstructUtils.convert(bo, TbFactory.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(TbFactory entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 校验并批量删除厂商管理信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;
}
}