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

Merge pull request 'master' (#2) from master into prod
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 17m15s
Details

Browse Source 
Reviewed-on: #2
This commit is contained in:
bichangxiong
2025-08-28 17:28:27 +08:00
parent 1b138ab299 d6623bb9da
commit f3591e7ff1
80 changed files with 323 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/smartDevicesController/TbMeterRecordController.java
View File

@@ -1,6 +1,7 @@
package org.dromara.property.controller.smartDevicesController;
import java.util.List;
import java.util.Map;
import lombok.RequiredArgsConstructor;
import jakarta.servlet.http.HttpServletResponse;
@@ -115,13 +116,13 @@ public class TbMeterRecordController extends BaseController {
* @param year 年份
*/
@GetMapping("/trend")
public R<Void> getEnergyTrend(@RequestParam(required = false) String floorId,
public R<Map<String, Object>> getEnergyTrend(@RequestParam(required = false) String floorId,
@RequestParam(required = false) String meterId,
@RequestParam Long meterType,
@RequestParam String day,
@RequestParam String month,
@RequestParam String year) {
tbMeterRecordService.getEnergyTrend(floorId, meterId, meterType, day, month, year);
return R.ok();
Map<String, Object> resultMap = tbMeterRecordService.getEnergyTrend(floorId, meterId, meterType, day, month, year);
return R.ok(resultMap);
}
}

5
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/smartDevicesVo/TbMeterInfoVo.java
View File

@@ -133,6 +133,11 @@ public class TbMeterInfoVo implements Serializable {
@ExcelProperty(value = "采集器IP")
private String hostIp;
/**
* 租户编号
*/
private String tenantId;
/**
* 备注
*/

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

@@ -46,7 +46,7 @@ public class AppFunListServiceImpl implements IAppFunListService {
* @return APP功能列表
*/
@Override
public AppFunListVo queryById(Long id){
public AppFunListVo queryById(Long id) {
return baseMapper.selectVoById(id);
}
@@ -80,7 +80,8 @@ public class AppFunListServiceImpl implements IAppFunListService {
private LambdaQueryWrapper<AppFunList> buildQueryWrapper(AppFunListBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<AppFunList> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(AppFunList::getId);
lqw.orderByDesc(AppFunList::getCreateTime)
.orderByDesc(AppFunList::getUpdateTime);
lqw.eq(bo.getRoleid() != null, AppFunList::getRoleid, bo.getRoleid());
lqw.like(StringUtils.isNotBlank(bo.getName()), AppFunList::getName, bo.getName());
lqw.eq(StringUtils.isNotBlank(bo.getIcon()), AppFunList::getIcon, bo.getIcon());
@@ -121,7 +122,7 @@ public class AppFunListServiceImpl implements IAppFunListService {
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(AppFunList entity){
private void validEntityBeforeSave(AppFunList entity) {
//TODO 做一些数据校验,如唯一约束
}
@@ -134,7 +135,7 @@ public class AppFunListServiceImpl implements IAppFunListService {
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
if (isValid) {
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;

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

@@ -14,6 +14,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.property.domain.AppFunList;
import org.dromara.property.domain.Asset;
import org.dromara.property.domain.DepotLog;
import org.dromara.property.domain.vo.AssetVo;
@@ -134,7 +135,8 @@ public class ApplicationServiceImpl implements IApplicationService {
private LambdaQueryWrapper<Application> buildQueryWrapper(ApplicationBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<Application> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(Application::getId);
lqw.orderByDesc(Application::getCreateTime)
.orderByDesc(Application::getUpdateTime);
lqw.eq(bo.getAssetId() != null, Application::getAssetId, bo.getAssetId());
lqw.eq(bo.getUserId() != null, Application::getUserId, bo.getUserId());
lqw.eq(bo.getNumber() != null, Application::getNumber, bo.getNumber());

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

@@ -9,16 +9,13 @@ 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.AssetType;
import org.dromara.property.domain.Depot;
import org.dromara.property.domain.Suppliers;
import org.dromara.property.domain.*;
import org.dromara.property.mapper.AssetTypeMapper;
import org.dromara.property.mapper.DepotMapper;
import org.dromara.property.mapper.SuppliersMapper;
import org.springframework.stereotype.Service;
import org.dromara.property.domain.bo.AssetBo;
import org.dromara.property.domain.vo.AssetVo;
import org.dromara.property.domain.Asset;
import org.dromara.property.mapper.AssetMapper;
import org.dromara.property.service.IAssetService;
@@ -114,7 +111,8 @@ public class AssetServiceImpl implements IAssetService {
private LambdaQueryWrapper<Asset> buildQueryWrapper(AssetBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<Asset> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(Asset::getId);
lqw.orderByDesc(Asset::getCreateTime)
.orderByDesc(Asset::getUpdateTime);
lqw.like(StringUtils.isNotBlank(bo.getName()), Asset::getName, bo.getName());
lqw.eq(StringUtils.isNotBlank(bo.getModel()), Asset::getModel, bo.getModel());
lqw.eq(StringUtils.isNotBlank(bo.getSpecs()), Asset::getSpecs, bo.getSpecs());

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

@@ -9,6 +9,7 @@ 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.Asset;
import org.springframework.stereotype.Service;
import org.dromara.property.domain.bo.AssetTypeBo;
import org.dromara.property.domain.vo.AssetTypeVo;
@@ -73,7 +74,8 @@ public class AssetTypeServiceImpl implements IAssetTypeService {
private LambdaQueryWrapper<AssetType> buildQueryWrapper(AssetTypeBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<AssetType> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(AssetType::getSort);
lqw.orderByDesc(AssetType::getCreateTime)
.orderByDesc(AssetType::getUpdateTime);
lqw.like(StringUtils.isNotBlank(bo.getAssetTypeName()), AssetType::getAssetTypeName, bo.getAssetTypeName());
lqw.eq(bo.getSort() != null, AssetType::getSort, bo.getSort());
return lqw;

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

@@ -115,7 +115,8 @@ public class CapitalApplicationServiceImpl implements ICapitalApplicationService
private LambdaQueryWrapper<CapitalApplication> buildQueryWrapper(CapitalApplicationBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<CapitalApplication> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(CapitalApplication::getId);
lqw.orderByDesc(CapitalApplication::getCreateTime)
.orderByDesc(CapitalApplication::getUpdateTime);
lqw.eq(StringUtils.isNotBlank(bo.getTitle()), CapitalApplication::getTitle, bo.getTitle());
lqw.eq(bo.getApplicat() != null, CapitalApplication::getApplicat, bo.getApplicat());
lqw.eq(StringUtils.isNotBlank(bo.getPhone()), CapitalApplication::getPhone, bo.getPhone());

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

@@ -9,6 +9,7 @@ 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.CapitalApplication;
import org.springframework.stereotype.Service;
import org.dromara.property.domain.bo.CarInfoBo;
import org.dromara.property.domain.vo.CarInfoVo;
@@ -73,7 +74,8 @@ public class CarInfoServiceImpl implements ICarInfoService {
private LambdaQueryWrapper<CarInfo> buildQueryWrapper(CarInfoBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<CarInfo> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(CarInfo::getId);
lqw.orderByDesc(CarInfo::getCreateTime)
.orderByDesc(CarInfo::getUpdateTime);
lqw.eq(StringUtils.isNotBlank(bo.getCarNumber()), CarInfo::getCarNumber, bo.getCarNumber());
lqw.eq(StringUtils.isNotBlank(bo.getCarFrameNumber()), CarInfo::getCarFrameNumber, bo.getCarFrameNumber());
lqw.eq(StringUtils.isNotBlank(bo.getCarColour()), CarInfo::getCarColour, bo.getCarColour());

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

@@ -9,6 +9,7 @@ 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.CarInfo;
import org.springframework.stereotype.Service;
import org.dromara.property.domain.bo.CarTypeBo;
import org.dromara.property.domain.vo.CarTypeVo;
@@ -73,7 +74,8 @@ public class CarTypeServiceImpl implements ICarTypeService {
private LambdaQueryWrapper<CarType> buildQueryWrapper(CarTypeBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<CarType> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(CarType::getId);
lqw.orderByDesc(CarType::getCreateTime)
.orderByDesc(CarType::getUpdateTime);
lqw.eq(StringUtils.isNotBlank(bo.getCarTypeNumber()), CarType::getCarTypeNumber, bo.getCarTypeNumber());
lqw.like(StringUtils.isNotBlank(bo.getCarTypeName()), CarType::getCarTypeName, bo.getCarTypeName());
return lqw;

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

@@ -9,6 +9,7 @@ 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.CarType;
import org.springframework.stereotype.Service;
import org.dromara.property.domain.bo.ConteactBo;
import org.dromara.property.domain.vo.ConteactVo;
@@ -73,7 +74,8 @@ public class ConteactServiceImpl implements IConteactService {
private LambdaQueryWrapper<Conteact> buildQueryWrapper(ConteactBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<Conteact> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(Conteact::getId);
lqw.orderByDesc(Conteact::getCreateTime)
.orderByDesc(Conteact::getUpdateTime);
lqw.eq(StringUtils.isNotBlank(bo.getContract()), Conteact::getContract, bo.getContract());
lqw.like(StringUtils.isNotBlank(bo.getName()), Conteact::getName, bo.getName());
lqw.eq(StringUtils.isNotBlank(bo.getMsg()), Conteact::getMsg, bo.getMsg());

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

@@ -14,10 +14,7 @@ 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.CostCarCharge;
import org.dromara.property.domain.CostPayFeeAudit;
import org.dromara.property.domain.CostReturnPayFee;
import org.dromara.property.domain.ResidentPerson;
import org.dromara.property.domain.*;
import org.dromara.property.domain.bo.CostCarChargeBo;
import org.dromara.property.domain.bo.CostChargeReturnFeeBo;
import org.dromara.property.domain.enums.ChargeStatusEnum;
@@ -109,7 +106,8 @@ public class CostCarChargeServiceImpl implements ICostCarChargeService {
private LambdaQueryWrapper<CostCarCharge> buildQueryWrapper(CostCarChargeBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<CostCarCharge> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(CostCarCharge::getId);
lqw.orderByDesc(CostCarCharge::getCreateTime)
.orderByDesc(CostCarCharge::getUpdateTime);
lqw.eq(StringUtils.isNotBlank(bo.getCarNumber()), CostCarCharge::getCarNumber, bo.getCarNumber());
lqw.eq(bo.getPersonId() != null, CostCarCharge::getPersonId, bo.getPersonId());
lqw.eq(bo.getFloorId() != null, CostCarCharge::getFloorId, bo.getFloorId());

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

@@ -15,9 +15,7 @@ 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.CostPayFeeAudit;
import org.dromara.property.domain.CostReturnPayFee;
import org.dromara.property.domain.ResidentPerson;
import org.dromara.property.domain.*;
import org.dromara.property.domain.bo.CostChargeReturnFeeBo;
import org.dromara.property.domain.enums.ChargeStatusEnum;
import org.dromara.property.domain.vo.*;
@@ -26,7 +24,6 @@ import org.dromara.system.api.RemoteUserService;
import org.dromara.system.api.domain.vo.RemoteUserVo;
import org.springframework.stereotype.Service;
import org.dromara.property.domain.bo.CostHouseChargeBo;
import org.dromara.property.domain.CostHouseCharge;
import org.dromara.property.service.ICostHouseChargeService;
import org.springframework.transaction.annotation.Transactional;
@@ -117,7 +114,8 @@ public class CostHouseChargeServiceImpl implements ICostHouseChargeService {
private LambdaQueryWrapper<CostHouseCharge> buildQueryWrapper(CostHouseChargeBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<CostHouseCharge> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(CostHouseCharge::getId);
lqw.orderByDesc(CostHouseCharge::getCreateTime)
.orderByDesc(CostHouseCharge::getUpdateTime);
lqw.eq(bo.getRoomId() != null, CostHouseCharge::getRoomId, bo.getRoomId());
lqw.eq(bo.getCostItemsId() != null, CostHouseCharge::getCostItemsId, bo.getCostItemsId());
lqw.eq(StringUtils.isNotBlank(bo.getChargeCycle()), CostHouseCharge::getChargeCycle, bo.getChargeCycle());

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

@@ -10,6 +10,7 @@ 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.CostHouseCharge;
import org.springframework.stereotype.Service;
import org.dromara.property.domain.bo.CostItemsBo;
import org.dromara.property.domain.vo.CostItemsVo;
@@ -75,7 +76,8 @@ public class CostItemsServiceImpl implements ICostItemsService {
private LambdaQueryWrapper<CostItems> buildQueryWrapper(CostItemsBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<CostItems> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(CostItems::getId);
lqw.orderByDesc(CostItems::getCreateTime)
.orderByDesc(CostItems::getUpdateTime);
lqw.eq(StringUtils.isNotBlank(bo.getCostType()), CostItems::getCostType, bo.getCostType());
lqw.eq(StringUtils.isNotBlank(bo.getChargeItem()), CostItems::getChargeItem, bo.getChargeItem());
lqw.eq(StringUtils.isNotBlank(bo.getChargeNo()), CostItems::getChargeNo, bo.getChargeNo());

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

@@ -9,6 +9,7 @@ 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.CostItems;
import org.springframework.stereotype.Service;
import org.dromara.property.domain.bo.CostMeterTypeBo;
import org.dromara.property.domain.vo.CostMeterTypeVo;
@@ -74,7 +75,8 @@ public class CostMeterTypeServiceImpl implements ICostMeterTypeService {
private LambdaQueryWrapper<CostMeterType> buildQueryWrapper(CostMeterTypeBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<CostMeterType> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(CostMeterType::getId);
lqw.orderByDesc(CostMeterType::getCreateTime)
.orderByDesc(CostMeterType::getUpdateTime);
lqw.eq(StringUtils.isNotBlank(bo.getMeterType()), CostMeterType::getMeterType, bo.getMeterType());
lqw.like(StringUtils.isNotBlank(bo.getName()), CostMeterType::getName, bo.getName());
lqw.eq(StringUtils.isNotBlank(bo.getSearchValue()), CostMeterType::getSearchValue, bo.getSearchValue());

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

@@ -12,6 +12,7 @@ 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.CostMeterType;
import org.dromara.property.domain.vo.CostMeterTypeVo;
import org.dromara.property.mapper.CostMeterTypeMapper;
import org.springframework.stereotype.Service;
@@ -91,7 +92,8 @@ public class CostMeterWaterServiceImpl implements ICostMeterWaterService {
private LambdaQueryWrapper<CostMeterWater> buildQueryWrapper(CostMeterWaterBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<CostMeterWater> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(CostMeterWater::getId);
lqw.orderByDesc(CostMeterWater::getCreateTime)
.orderByDesc(CostMeterWater::getUpdateTime);
lqw.eq(bo.getItemId() != null, CostMeterWater::getItemId, bo.getItemId());
lqw.eq(bo.getMeterTypeId() != null, CostMeterWater::getMeterTypeId, bo.getMeterTypeId());
lqw.eq(StringUtils.isNotBlank(bo.getCostType()), CostMeterWater::getCostType, bo.getCostType());

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

@@ -15,6 +15,7 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.property.domain.CostCarCharge;
import org.dromara.property.domain.CostHouseCharge;
import org.dromara.property.domain.CostMeterWater;
import org.dromara.property.domain.CostPayFeeAudit;
import org.dromara.property.domain.bo.CostPayFeeAuditBo;
import org.dromara.property.domain.enums.ChargeStatusEnum;
@@ -130,7 +131,8 @@ public class CostPayFeeAuditServiceImpl implements ICostPayFeeAuditService {
private LambdaQueryWrapper<CostPayFeeAudit> buildQueryWrapper(CostPayFeeAuditBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<CostPayFeeAudit> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(CostPayFeeAudit::getId);
lqw.orderByDesc(CostPayFeeAudit::getCreateTime)
.orderByDesc(CostPayFeeAudit::getUpdateTime);
lqw.eq(bo.getChargeId() != null, CostPayFeeAudit::getChargeId, bo.getChargeId());
lqw.eq(bo.getItemId() != null, CostPayFeeAudit::getItemId, bo.getItemId());
lqw.eq(bo.getStartTime() != null, CostPayFeeAudit::getStartTime, bo.getStartTime());

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

@@ -11,6 +11,7 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.property.domain.CostCarCharge;
import org.dromara.property.domain.CostHouseCharge;
import org.dromara.property.domain.CostPayFeeAudit;
import org.dromara.property.domain.CostReturnPayFee;
import org.dromara.property.domain.bo.CostReturnPayFeeBo;
import org.dromara.property.domain.enums.ChargeStatusEnum;
@@ -81,7 +82,8 @@ public class CostReturnPayFeeServiceImpl implements ICostReturnPayFeeService {
private LambdaQueryWrapper<CostReturnPayFee> buildQueryWrapper(CostReturnPayFeeBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<CostReturnPayFee> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(CostReturnPayFee::getId);
lqw.orderByDesc(CostReturnPayFee::getCreateTime)
.orderByDesc(CostReturnPayFee::getUpdateTime);
lqw.eq(StringUtils.isNotBlank(bo.getReturnNo()), CostReturnPayFee::getReturnNo, bo.getReturnNo());
lqw.eq(StringUtils.isNotBlank(bo.getPayNo()), CostReturnPayFee::getPayNo, bo.getPayNo());
lqw.eq(StringUtils.isNotBlank(bo.getReason()), CostReturnPayFee::getReason, bo.getReason());

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

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.common.translation.annotation.Translation;
import org.dromara.property.domain.CostReturnPayFee;
import org.dromara.property.domain.CustomerContingenPlan;
import org.dromara.property.domain.CustomerContingenPlanRecord;
import org.dromara.property.domain.ResidentPerson;
@@ -110,7 +111,8 @@ public class CustomerContingenPlanServiceImpl implements ICustomerContingenPlanS
private LambdaQueryWrapper<CustomerContingenPlan> buildQueryWrapper(CustomerContingenPlanBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<CustomerContingenPlan> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(CustomerContingenPlan::getId);
lqw.orderByDesc(CustomerContingenPlan::getCreateTime)
.orderByDesc(CustomerContingenPlan::getUpdateTime);
lqw.eq(StringUtils.isNotBlank(bo.getContingenPlanType()), CustomerContingenPlan::getContingenPlanType, bo.getContingenPlanType());
lqw.eq(ObjectUtil.isNotEmpty(bo.getDutyPersion()), CustomerContingenPlan::getDutyPersion, bo.getDutyPersion());
lqw.like(StringUtils.isNotBlank(bo.getContingenPlanName()), CustomerContingenPlan::getContingenPlanName, bo.getContingenPlanName());

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

@@ -14,10 +14,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.property.domain.CustomerFeedbacks;
import org.dromara.property.domain.ServiceWorkOrders;
import org.dromara.property.domain.ServiceWorkOrdersRecord;
import org.dromara.property.domain.ServiceWorkOrdersType;
import org.dromara.property.domain.*;
import org.dromara.property.domain.bo.CustomerFeedbacksBo;
import org.dromara.property.domain.bo.ServiceWorkOrdersBo;
import org.dromara.property.domain.vo.CustomerFeedbacksVo;
@@ -138,7 +135,8 @@ public class CustomerFeedbacksServiceImpl implements ICustomerFeedbacksService {
private LambdaQueryWrapper<CustomerFeedbacks> buildQueryWrapper(CustomerFeedbacksBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<CustomerFeedbacks> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(CustomerFeedbacks::getId);
lqw.orderByDesc(CustomerFeedbacks::getCreateTime)
.orderByDesc(CustomerFeedbacks::getUpdateTime);
lqw.eq(ObjectUtil.isNotNull(bo.getFeedbackType()), CustomerFeedbacks::getFeedbackType, bo.getFeedbackType());
lqw.eq(bo.getFeedbackPersion() != null, CustomerFeedbacks::getFeedbackPersion, bo.getFeedbackPersion());
lqw.eq(StringUtils.isNotBlank(bo.getFeedbackPersionPhone()), CustomerFeedbacks::getFeedbackPersionPhone, bo.getFeedbackPersionPhone());

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

@@ -13,6 +13,7 @@ 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.common.satoken.utils.LoginHelper;
import org.dromara.property.domain.CustomerFeedbacks;
import org.dromara.property.domain.CustomerNotices;
import org.dromara.property.domain.bo.CustomerNoticesBo;
import org.dromara.property.domain.vo.CustomerNoticesVo;
@@ -153,7 +154,8 @@ public class CustomerNoticesServiceImpl implements ICustomerNoticesService {
private LambdaQueryWrapper<CustomerNotices> buildQueryWrapper(CustomerNoticesBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<CustomerNotices> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(CustomerNotices::getId);
lqw.orderByDesc(CustomerNotices::getCreateTime)
.orderByDesc(CustomerNotices::getUpdateTime);
lqw.eq(StringUtils.isNotBlank(bo.getTitle()), CustomerNotices::getTitle, bo.getTitle());
lqw.eq(StringUtils.isNotBlank(bo.getType()), CustomerNotices::getType, bo.getType());
lqw.eq(StringUtils.isNotBlank(bo.getIsAll()), CustomerNotices::getIsAll, bo.getIsAll());

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

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.property.domain.Asset;
import org.dromara.property.domain.CustomerNotices;
import org.dromara.property.domain.Depot;
import org.dromara.property.mapper.AssetMapper;
import org.dromara.property.mapper.DepotMapper;
@@ -119,7 +120,8 @@ public class DepotLogServiceImpl implements IDepotLogService {
private LambdaQueryWrapper<DepotLog> buildQueryWrapper(DepotLogBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<DepotLog> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(DepotLog::getId);
lqw.orderByDesc(DepotLog::getCreateTime)
.orderByDesc(DepotLog::getUpdateTime);
lqw.eq(bo.getDepotId() != null, DepotLog::getDepotId, bo.getDepotId());
lqw.eq(bo.getAssetId() != null, DepotLog::getAssetId, bo.getAssetId());
lqw.eq(bo.getType() != null, DepotLog::getType, bo.getType());

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

@@ -9,6 +9,7 @@ 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.DepotLog;
import org.springframework.stereotype.Service;
import org.dromara.property.domain.bo.DepotBo;
import org.dromara.property.domain.vo.DepotVo;
@@ -73,7 +74,8 @@ public class DepotServiceImpl implements IDepotService {
private LambdaQueryWrapper<Depot> buildQueryWrapper(DepotBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<Depot> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(Depot::getId);
lqw.orderByDesc(Depot::getCreateTime)
.orderByDesc(Depot::getUpdateTime);
lqw.like(StringUtils.isNotBlank(bo.getDepotName()), Depot::getDepotName, bo.getDepotName());
lqw.eq(StringUtils.isNotBlank(bo.getMsg()), Depot::getMsg, bo.getMsg());
lqw.eq(StringUtils.isNotBlank(bo.getModelType()), Depot::getModelType, bo.getModelType());

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

@@ -9,6 +9,7 @@ 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.Depot;
import org.springframework.stereotype.Service;
import org.dromara.property.domain.bo.FaqManagementBo;
import org.dromara.property.domain.vo.FaqManagementVo;
@@ -73,7 +74,8 @@ public class FaqManagementServiceImpl implements IFaqManagementService {
private LambdaQueryWrapper<FaqManagement> buildQueryWrapper(FaqManagementBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<FaqManagement> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(FaqManagement::getId);
lqw.orderByDesc(FaqManagement::getCreateTime)
.orderByDesc(FaqManagement::getUpdateTime);
lqw.like(StringUtils.isNotBlank(bo.getHead()), FaqManagement::getHead, bo.getHead());
lqw.eq(StringUtils.isNotBlank(bo.getType()), FaqManagement::getType, bo.getType());
lqw.eq(bo.getPageView() != null, FaqManagement::getPageView, bo.getPageView());

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

@@ -9,6 +9,7 @@ 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.FaqManagement;
import org.dromara.property.domain.InspectionItem;
import org.dromara.property.domain.bo.InspectionItemBo;
import org.dromara.property.domain.vo.InspectionItemVo;
@@ -74,7 +75,8 @@ public class InspectionItemServiceImpl implements IInspectionItemService {
private LambdaQueryWrapper<InspectionItem> buildQueryWrapper(InspectionItemBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<InspectionItem> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(InspectionItem::getId);
lqw.orderByDesc(InspectionItem::getCreateTime)
.orderByDesc(InspectionItem::getUpdateTime);
lqw.like(StringUtils.isNotBlank(bo.getItemName()), InspectionItem::getItemName, bo.getItemName());
lqw.eq(StringUtils.isNotBlank(bo.getSearchValue()), InspectionItem::getSearchValue, bo.getSearchValue());
return lqw;

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

@@ -17,10 +17,7 @@ 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.InspectionPlan;
import org.dromara.property.domain.InspectionPlanStaff;
import org.dromara.property.domain.InspectionRoute;
import org.dromara.property.domain.MachineMaintainPlanStaff;
import org.dromara.property.domain.*;
import org.dromara.property.domain.bo.InspectionPlanBo;
import org.dromara.property.domain.bo.InspectionPlanStaffBo;
import org.dromara.property.domain.bo.MachineMaintainPlanBo;
@@ -128,7 +125,8 @@ public class InspectionPlanServiceImpl implements IInspectionPlanService {
private LambdaQueryWrapper<InspectionPlan> buildQueryWrapper(InspectionPlanBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<InspectionPlan> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(InspectionPlan::getId);
lqw.orderByDesc(InspectionPlan::getCreateTime)
.orderByDesc(InspectionPlan::getUpdateTime);
lqw.like(StringUtils.isNotBlank(bo.getPlanName()), InspectionPlan::getPlanName, bo.getPlanName());
lqw.eq(bo.getInspectionRouteId() != null, InspectionPlan::getInspectionRouteId, bo.getInspectionRouteId());
lqw.eq(StringUtils.isNotBlank(bo.getInspectionPlanPeriod()), InspectionPlan::getInspectionPlanPeriod, bo.getInspectionPlanPeriod());

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

@@ -9,6 +9,7 @@ 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.InspectionPlan;
import org.dromara.property.domain.InspectionPlanStaff;
import org.dromara.property.domain.bo.InspectionPlanStaffBo;
import org.dromara.property.domain.vo.InspectionPlanStaffVo;
@@ -74,7 +75,8 @@ public class InspectionPlanStaffServiceImpl implements IInspectionPlanStaffServi
private LambdaQueryWrapper<InspectionPlanStaff> buildQueryWrapper(InspectionPlanStaffBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<InspectionPlanStaff> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(InspectionPlanStaff::getId);
lqw.orderByDesc(InspectionPlanStaff::getCreateTime)
.orderByDesc(InspectionPlanStaff::getUpdateTime);
lqw.eq(bo.getUserId() != null, InspectionPlanStaff::getUserId, bo.getUserId());
lqw.eq(bo.getInspectionPlanId() != null, InspectionPlanStaff::getInspectionPlanId, bo.getInspectionPlanId());
lqw.eq(bo.getStartTime() != null, InspectionPlanStaff::getStartTime, bo.getStartTime());

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

@@ -11,6 +11,7 @@ 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.InspectionPlanStaff;
import org.dromara.property.domain.InspectionPoint;
import org.dromara.property.domain.bo.InspectionPointBo;
import org.dromara.property.domain.vo.InspectionItemVo;
@@ -98,7 +99,8 @@ public class InspectionPointServiceImpl implements IInspectionPointService {
private LambdaQueryWrapper<InspectionPoint> buildQueryWrapper(InspectionPointBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<InspectionPoint> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(InspectionPoint::getId);
lqw.orderByDesc(InspectionPoint::getCreateTime)
.orderByDesc(InspectionPoint::getUpdateTime);
lqw.eq(bo.getItemId() != null, InspectionPoint::getItemId, bo.getItemId());
lqw.like(StringUtils.isNotBlank(bo.getPointName()), InspectionPoint::getPointName, bo.getPointName());
lqw.eq(StringUtils.isNotBlank(bo.getPointType()), InspectionPoint::getPointType, bo.getPointType());

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

@@ -10,6 +10,7 @@ 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.InspectionPoint;
import org.dromara.property.domain.InspectionRoute;
import org.dromara.property.domain.InspectionRoutePoint;
import org.dromara.property.domain.bo.InspectionRouteBo;
@@ -91,7 +92,8 @@ public class InspectionRouteServiceImpl implements IInspectionRouteService {
private LambdaQueryWrapper<InspectionRoute> buildQueryWrapper(InspectionRouteBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<InspectionRoute> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(InspectionRoute::getId);
lqw.orderByDesc(InspectionRoute::getCreateTime)
.orderByDesc(InspectionRoute::getUpdateTime);
lqw.like(StringUtils.isNotBlank(bo.getRouteName()), InspectionRoute::getRouteName, bo.getRouteName());
lqw.eq(StringUtils.isNotBlank(bo.getSearchValue()), InspectionRoute::getSearchValue, bo.getSearchValue());
return lqw;

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

@@ -9,6 +9,7 @@ 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.InspectionRoute;
import org.dromara.property.domain.InspectionStaff;
import org.dromara.property.domain.bo.InspectionStaffBo;
import org.dromara.property.domain.vo.InspectionStaffVo;
@@ -74,7 +75,8 @@ public class InspectionStaffServiceImpl implements IInspectionStaffService {
private LambdaQueryWrapper<InspectionStaff> buildQueryWrapper(InspectionStaffBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<InspectionStaff> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(InspectionStaff::getId);
lqw.orderByDesc(InspectionStaff::getCreateTime)
.orderByDesc(InspectionStaff::getUpdateTime);
lqw.eq(bo.getUserId() != null, InspectionStaff::getUserId, bo.getUserId());
lqw.eq(bo.getInspectionPlanId() != null, InspectionStaff::getInspectionPlanId, bo.getInspectionPlanId());
lqw.eq(bo.getStartTime() != null, InspectionStaff::getStartTime, bo.getStartTime());

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

@@ -9,6 +9,7 @@ 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.InspectionStaff;
import org.springframework.stereotype.Service;
import org.dromara.property.domain.bo.InspectionTaskDetailBo;
import org.dromara.property.domain.vo.InspectionTaskDetailVo;
@@ -73,7 +74,8 @@ public class InspectionTaskDetailServiceImpl implements IInspectionTaskDetailSer
private LambdaQueryWrapper<InspectionTaskDetail> buildQueryWrapper(InspectionTaskDetailBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<InspectionTaskDetail> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(InspectionTaskDetail::getId);
lqw.orderByDesc(InspectionTaskDetail::getCreateTime)
.orderByDesc(InspectionTaskDetail::getUpdateTime);
lqw.eq(bo.getTaskId() != null, InspectionTaskDetail::getTaskId, bo.getTaskId());
lqw.eq(bo.getRouteId() != null, InspectionTaskDetail::getRouteId, bo.getRouteId());
lqw.eq(bo.getPlanId() != null, InspectionTaskDetail::getPlanId, bo.getPlanId());

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

@@ -11,6 +11,7 @@ import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.property.domain.InspectionPlan;
import org.dromara.property.domain.InspectionTask;
import org.dromara.property.domain.InspectionTaskDetail;
import org.dromara.property.domain.bo.InspectionTaskBo;
import org.dromara.property.domain.vo.InspectionPlanVo;
import org.dromara.property.domain.vo.InspectionTaskVo;
@@ -99,7 +100,8 @@ public class InspectionTaskServiceImpl implements IInspectionTaskService {
private LambdaQueryWrapper<InspectionTask> buildQueryWrapper(InspectionTaskBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<InspectionTask> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(InspectionTask::getId);
lqw.orderByDesc(InspectionTask::getCreateTime)
.orderByDesc(InspectionTask::getUpdateTime);
lqw.eq(bo.getInspectionPlanId() != null, InspectionTask::getInspectionPlanId, bo.getInspectionPlanId());
lqw.eq(bo.getActInsTime() != null, InspectionTask::getActInsTime, bo.getActInsTime());
lqw.eq(bo.getActUserId() != null, InspectionTask::getActUserId, bo.getActUserId());

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

@@ -11,6 +11,7 @@ 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.InspectionTask;
import org.dromara.property.domain.enums.MachineLocationTypeEnum;
import org.dromara.property.domain.vo.MachineLocationDetailVo;
import org.dromara.property.mapper.*;
@@ -135,7 +136,8 @@ public class MachineLocationServiceImpl implements IMachineLocationService {
private LambdaQueryWrapper<MachineLocation> buildQueryWrapper(MachineLocationBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<MachineLocation> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(MachineLocation::getId);
lqw.orderByDesc(MachineLocation::getCreateTime)
.orderByDesc(MachineLocation::getUpdateTime);
lqw.like(StringUtils.isNotBlank(bo.getLocationName()), MachineLocation::getLocationName, bo.getLocationName());
lqw.eq(StringUtils.isNotBlank(bo.getLocationCode()), MachineLocation::getLocationCode, bo.getLocationCode());
lqw.eq(bo.getLocationObjId() != null, MachineLocation::getLocationObjId, bo.getLocationObjId());

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

@@ -17,6 +17,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.property.domain.InspectionPlanStaff;
import org.dromara.property.domain.MachineLocation;
import org.dromara.property.domain.MachineMaintainPlan;
import org.dromara.property.domain.MachineMaintainPlanStaff;
import org.dromara.property.domain.bo.InspectionPlanStaffBo;
@@ -118,7 +119,8 @@ public class MachineMaintainPlanServiceImpl implements IMachineMaintainPlanServi
private LambdaQueryWrapper<MachineMaintainPlan> buildQueryWrapper(MachineMaintainPlanBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<MachineMaintainPlan> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(MachineMaintainPlan::getId);
lqw.orderByDesc(MachineMaintainPlan::getCreateTime)
.orderByDesc(MachineMaintainPlan::getUpdateTime);
lqw.like(StringUtils.isNotBlank(bo.getPlanName()), MachineMaintainPlan::getPlanName, bo.getPlanName());
lqw.eq(StringUtils.isNotBlank(bo.getPlanNo()), MachineMaintainPlan::getPlanNo, bo.getPlanNo());
lqw.eq(StringUtils.isNotBlank(bo.getPlanPeriod()), MachineMaintainPlan::getPlanPeriod, bo.getPlanPeriod());

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

@@ -9,6 +9,7 @@ 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.MachineMaintainPlan;
import org.springframework.stereotype.Service;
import org.dromara.property.domain.bo.MachineMaintainPlanStaffBo;
import org.dromara.property.domain.vo.MachineMaintainPlanStaffVo;
@@ -73,7 +74,8 @@ public class MachineMaintainPlanStaffServiceImpl implements IMachineMaintainPlan
private LambdaQueryWrapper<MachineMaintainPlanStaff> buildQueryWrapper(MachineMaintainPlanStaffBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<MachineMaintainPlanStaff> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(MachineMaintainPlanStaff::getId);
lqw.orderByDesc(MachineMaintainPlanStaff::getCreateTime)
.orderByDesc(MachineMaintainPlanStaff::getUpdateTime);
lqw.eq(bo.getUserId() != null, MachineMaintainPlanStaff::getUserId, bo.getUserId());
lqw.eq(bo.getMaintainPlanId() != null, MachineMaintainPlanStaff::getMaintainPlanId, bo.getMaintainPlanId());
lqw.eq(StringUtils.isNotBlank(bo.getSearchValue()), MachineMaintainPlanStaff::getSearchValue, bo.getSearchValue());

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

@@ -9,6 +9,7 @@ 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.MachineMaintainPlanStaff;
import org.springframework.stereotype.Service;
import org.dromara.property.domain.bo.MachineMaintainTaskDetailBo;
import org.dromara.property.domain.vo.MachineMaintainTaskDetailVo;
@@ -73,7 +74,8 @@ public class MachineMaintainTaskDetailServiceImpl implements IMachineMaintainTas
private LambdaQueryWrapper<MachineMaintainTaskDetail> buildQueryWrapper(MachineMaintainTaskDetailBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<MachineMaintainTaskDetail> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(MachineMaintainTaskDetail::getId);
lqw.orderByDesc(MachineMaintainTaskDetail::getCreateTime)
.orderByDesc(MachineMaintainTaskDetail::getUpdateTime);
lqw.eq(bo.getTaskId() != null, MachineMaintainTaskDetail::getTaskId, bo.getTaskId());
lqw.eq(bo.getMachineId() != null, MachineMaintainTaskDetail::getMachineId, bo.getMachineId());
lqw.eq(StringUtils.isNotBlank(bo.getSendFlag()), MachineMaintainTaskDetail::getSendFlag, bo.getSendFlag());

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

@@ -9,6 +9,7 @@ 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.MachineMaintainTaskDetail;
import org.springframework.stereotype.Service;
import org.dromara.property.domain.bo.MachineMaintainTaskBo;
import org.dromara.property.domain.vo.MachineMaintainTaskVo;
@@ -73,7 +74,8 @@ public class MachineMaintainTaskServiceImpl implements IMachineMaintainTaskServi
private LambdaQueryWrapper<MachineMaintainTask> buildQueryWrapper(MachineMaintainTaskBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<MachineMaintainTask> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(MachineMaintainTask::getId);
lqw.orderByDesc(MachineMaintainTask::getCreateTime)
.orderByDesc(MachineMaintainTask::getUpdateTime);
lqw.eq(bo.getMaintainPlanId() != null, MachineMaintainTask::getMaintainPlanId, bo.getMaintainPlanId());
lqw.eq(StringUtils.isNotBlank(bo.getMaintainTaskNo()), MachineMaintainTask::getMaintainTaskNo, bo.getMaintainTaskNo());
lqw.eq(StringUtils.isNotBlank(bo.getPlanUserId()), MachineMaintainTask::getPlanUserId, bo.getPlanUserId());

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

@@ -11,6 +11,7 @@ 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.MachineMaintainTask;
import org.dromara.property.domain.MachineType;
import org.dromara.property.domain.vo.*;
import org.dromara.property.mapper.MachineLocationMapper;
@@ -90,7 +91,8 @@ public class MachineServiceImpl implements IMachineService {
private LambdaQueryWrapper<Machine> buildQueryWrapper(MachineBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<Machine> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(Machine::getId);
lqw.orderByDesc(Machine::getCreateTime)
.orderByDesc(Machine::getUpdateTime);
lqw.like(StringUtils.isNotBlank(bo.getMachineName()), Machine::getMachineName, bo.getMachineName());
lqw.eq(StringUtils.isNotBlank(bo.getMachineCode()), Machine::getMachineCode, bo.getMachineCode());
lqw.eq(StringUtils.isNotBlank(bo.getMachineBrand()), Machine::getMachineBrand, bo.getMachineBrand());

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

@@ -11,6 +11,7 @@ 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.Machine;
import org.dromara.property.domain.MachineType;
import org.dromara.property.domain.bo.MachineTypeBo;
import org.dromara.property.domain.vo.MachineTypeTreeVo;
@@ -74,7 +75,8 @@ public class MachineTypeServiceImpl implements IMachineTypeService {
private LambdaQueryWrapper<MachineType> buildQueryWrapper(MachineTypeBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<MachineType> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(MachineType::getId);
lqw.orderByDesc(MachineType::getCreateTime)
.orderByDesc(MachineType::getUpdateTime);
lqw.like(StringUtils.isNotBlank(bo.getMachineTypeName()), MachineType::getMachineTypeName, bo.getMachineTypeName());
lqw.eq(StringUtils.isNotBlank(bo.getMachineTypeCode()), MachineType::getMachineTypeCode, bo.getMachineTypeCode());
lqw.eq(bo.getParentTypeId() != null, MachineType::getParentTypeId, bo.getParentTypeId());

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

@@ -9,6 +9,7 @@ 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.MachineType;
import org.springframework.stereotype.Service;
import org.dromara.property.domain.bo.MaintainKnowledgeBo;
import org.dromara.property.domain.vo.MaintainKnowledgeVo;
@@ -73,7 +74,8 @@ public class MaintainKnowledgeServiceImpl implements IMaintainKnowledgeService {
private LambdaQueryWrapper<MaintainKnowledge> buildQueryWrapper(MaintainKnowledgeBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<MaintainKnowledge> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(MaintainKnowledge::getId);
lqw.orderByDesc(MaintainKnowledge::getCreateTime)
.orderByDesc(MaintainKnowledge::getUpdateTime);
lqw.eq(StringUtils.isNotBlank(bo.getTitle()), MaintainKnowledge::getTitle, bo.getTitle());
lqw.eq(StringUtils.isNotBlank(bo.getStatus()), MaintainKnowledge::getStatus, bo.getStatus());
lqw.eq(StringUtils.isNotBlank(bo.getCovers()), MaintainKnowledge::getCovers, bo.getCovers());

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

@@ -10,6 +10,7 @@ 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.MaintainKnowledge;
import org.dromara.property.domain.Meet;
import org.springframework.stereotype.Service;
import org.dromara.property.domain.bo.MeetAttachBo;
@@ -77,7 +78,8 @@ public class MeetAttachServiceImpl implements IMeetAttachService {
private LambdaQueryWrapper<MeetAttach> buildQueryWrapper(MeetAttachBo bo) {
LambdaQueryWrapper<MeetAttach> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(MeetAttach::getId);
lqw.orderByDesc(MeetAttach::getCreateTime)
.orderByDesc(MeetAttach::getUpdateTime);
lqw.eq(bo.getMeetId() != null, MeetAttach::getMeetId, bo.getMeetId());
lqw.like(StringUtils.isNotBlank(bo.getProjectName()), MeetAttach::getProjectName, bo.getProjectName());
lqw.eq(bo.getPrice() != null, MeetAttach::getPrice, bo.getPrice());

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

@@ -14,6 +14,7 @@ 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.MeetAttach;
import org.dromara.property.domain.MeetAttachOrder;
import org.dromara.property.domain.MeetBooking;
import org.dromara.property.domain.bo.MeetBookingBo;
@@ -224,7 +225,8 @@ public class MeetBookingServiceImpl implements IMeetBookingService {
private LambdaQueryWrapper<MeetBooking> buildQueryWrapper(MeetBookingBo bo) {
LambdaQueryWrapper<MeetBooking> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(MeetBooking::getId);
lqw.orderByDesc(MeetBooking::getCreateTime)
.orderByDesc(MeetBooking::getUpdateTime);
lqw.eq(ObjectUtil.isNotEmpty(bo.getPayState()), MeetBooking::getPayState, bo.getPayState());
lqw.eq(ObjectUtil.isNotEmpty(bo.getState()), MeetBooking::getState, bo.getState());
lqw.eq(ObjectUtil.isNotEmpty(bo.getPerson()), MeetBooking::getPerson, bo.getPerson());

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

@@ -152,7 +152,8 @@ public class MeetServiceImpl implements IMeetService {
private LambdaQueryWrapper<Meet> buildQueryWrapper(MeetBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<Meet> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(Meet::getId);
lqw.orderByDesc(Meet::getCreateTime)
.orderByDesc(Meet::getUpdateTime);
lqw.like(StringUtils.isNotBlank(bo.getName()), Meet::getName, bo.getName());
// lqw.eq(StringUtils.isNotBlank(bo.getLocation()), Meet::getLocation, bo.getLocation());
lqw.eq(bo.getPersonNumber() != null, Meet::getPersonNumber, bo.getPersonNumber());

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

@@ -10,6 +10,7 @@ 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.Meet;
import org.dromara.property.domain.PlantsOrderMaintain;
import org.dromara.property.domain.vo.PlantsRentalOrderVo;
import org.dromara.property.service.IPlantsRentalOrderService;
@@ -83,7 +84,8 @@ public class PlantsOrderChargeServiceImpl implements IPlantsOrderChargeService {
private LambdaQueryWrapper<PlantsOrderCharge> buildQueryWrapper(PlantsOrderChargeBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<PlantsOrderCharge> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(PlantsOrderCharge::getId);
lqw.orderByDesc(PlantsOrderCharge::getCreateTime)
.orderByDesc(PlantsOrderCharge::getUpdateTime);
lqw.eq(bo.getOrderId() != null, PlantsOrderCharge::getOrderId, bo.getOrderId());
lqw.eq(bo.getUserId() != null, PlantsOrderCharge::getUserId, bo.getUserId());
lqw.like(StringUtils.isNotBlank(bo.getUserName()), PlantsOrderCharge::getUserName, bo.getUserName());

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

@@ -10,6 +10,7 @@ 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.PlantsOrderCharge;
import org.dromara.property.domain.vo.PlantsRentalOrderVo;
import org.dromara.property.service.IPlantsRentalOrderService;
import org.dromara.property.service.ITbRoomService;
@@ -90,7 +91,8 @@ public class PlantsOrderMaintainServiceImpl implements IPlantsOrderMaintainServi
private LambdaQueryWrapper<PlantsOrderMaintain> buildQueryWrapper(PlantsOrderMaintainBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<PlantsOrderMaintain> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(PlantsOrderMaintain::getId);
lqw.orderByDesc(PlantsOrderMaintain::getCreateTime)
.orderByDesc(PlantsOrderMaintain::getUpdateTime);
lqw.like(StringUtils.isNotBlank(bo.getMaintainName()), PlantsOrderMaintain::getMaintainName, bo.getMaintainName());
lqw.eq(bo.getRoomId() != null, PlantsOrderMaintain::getRoomId, bo.getRoomId());
lqw.eq(bo.getServeType() != null, PlantsOrderMaintain::getServeType, bo.getServeType());

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

@@ -10,6 +10,7 @@ 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.PlantsOrderMaintain;
import org.springframework.stereotype.Service;
import org.dromara.property.domain.bo.PlantsPlanProductBo;
import org.dromara.property.domain.vo.PlantsPlanProductVo;
@@ -74,7 +75,8 @@ public class PlantsPlanProductServiceImpl implements IPlantsPlanProductService {
private LambdaQueryWrapper<PlantsPlanProduct> buildQueryWrapper(PlantsPlanProductBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<PlantsPlanProduct> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(PlantsPlanProduct::getId);
lqw.orderByDesc(PlantsPlanProduct::getCreateTime)
.orderByDesc(PlantsPlanProduct::getUpdateTime);
lqw.eq(bo.getPlanId() != null, PlantsPlanProduct::getPlanId, bo.getPlanId());
lqw.eq(bo.getProductId() != null, PlantsPlanProduct::getProductId, bo.getProductId());
lqw.in(CollectionUtils.isNotEmpty(bo.getProductIds()), PlantsPlanProduct::getProductId, bo.getProductIds());

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

@@ -11,6 +11,7 @@ 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.PlantsPlanProduct;
import org.dromara.property.domain.bo.PlantsPlanProductBo;
import org.dromara.property.domain.bo.PlantsRentalOrderBo;
import org.dromara.property.domain.vo.PlantsPlanProductVo;
@@ -90,7 +91,8 @@ public class PlantsProductServiceImpl implements IPlantsProductService {
private LambdaQueryWrapper<PlantsProduct> buildQueryWrapper(PlantsProductBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<PlantsProduct> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(PlantsProduct::getId);
lqw.orderByDesc(PlantsProduct::getCreateTime)
.orderByDesc(PlantsProduct::getUpdateTime);
lqw.eq(StringUtils.isNotBlank(bo.getPlantCode()), PlantsProduct::getPlantCode, bo.getPlantCode());
lqw.like(StringUtils.isNotBlank(bo.getPlantName()), PlantsProduct::getPlantName, bo.getPlantName());
lqw.eq(bo.getPlantType() != null, PlantsProduct::getPlantType, bo.getPlantType());

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

@@ -10,6 +10,7 @@ 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.extern.slf4j.Slf4j;
import org.dromara.property.domain.PlantsProduct;
import org.dromara.property.domain.bo.PlantsOrderChargeBo;
import org.dromara.property.domain.bo.PlantsOrderMaintainBo;
import org.dromara.property.domain.bo.PlantsProductBo;
@@ -108,7 +109,8 @@ public class PlantsRentalOrderServiceImpl implements IPlantsRentalOrderService {
private LambdaQueryWrapper<PlantsRentalOrder> buildQueryWrapper(PlantsRentalOrderBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<PlantsRentalOrder> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(PlantsRentalOrder::getId);
lqw.orderByDesc(PlantsRentalOrder::getCreateTime)
.orderByDesc(PlantsRentalOrder::getUpdateTime);
lqw.eq(StringUtils.isNotBlank(bo.getOrderNo()), PlantsRentalOrder::getOrderNo, bo.getOrderNo());
lqw.like(StringUtils.isNotBlank(bo.getCustomerName()), PlantsRentalOrder::getCustomerName, bo.getCustomerName());
lqw.eq(bo.getCustomerType() != null, PlantsRentalOrder::getCustomerType, bo.getCustomerType());

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

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.property.domain.PlantsPlanProduct;
import org.dromara.property.domain.PlantsRentalOrder;
import org.dromara.property.domain.bo.PlantsPlanProductBo;
import org.dromara.property.domain.bo.PlantsRentalOrderBo;
import org.dromara.property.domain.vo.PlantsPlanProductVo;
@@ -89,7 +90,8 @@ public class PlantsRentalPlanServiceImpl implements IPlantsRentalPlanService {
private LambdaQueryWrapper<PlantsRentalPlan> buildQueryWrapper(PlantsRentalPlanBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<PlantsRentalPlan> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(PlantsRentalPlan::getId);
lqw.orderByDesc(PlantsRentalPlan::getCreateTime)
.orderByDesc(PlantsRentalPlan::getUpdateTime);
lqw.like(StringUtils.isNotBlank(bo.getPlanName()), PlantsRentalPlan::getPlanName, bo.getPlanName());
lqw.eq(bo.getRentalPeriod() != null, PlantsRentalPlan::getRentalPeriod, bo.getRentalPeriod());
lqw.eq(StringUtils.isNotBlank(bo.getScene()), PlantsRentalPlan::getScene, bo.getScene());

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

@@ -12,6 +12,7 @@ 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.PlantsRentalPlan;
import org.dromara.property.domain.enums.ActivitiesStatusEnum;
import org.dromara.property.domain.vo.CustomerNoticesVo;
import org.dromara.system.api.RemoteUserService;
@@ -113,7 +114,8 @@ public class PopularActivitiesServiceImpl implements IPopularActivitiesService {
private LambdaQueryWrapper<PopularActivities> buildQueryWrapper(PopularActivitiesBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<PopularActivities> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(PopularActivities::getId);
lqw.orderByDesc(PopularActivities::getCreateTime)
.orderByDesc(PopularActivities::getUpdateTime);
lqw.eq(StringUtils.isNotBlank(bo.getTitle()), PopularActivities::getTitle, bo.getTitle());
lqw.eq(bo.getStartTime() != null, PopularActivities::getStartTime, bo.getStartTime());
lqw.eq(bo.getEndTime() != null, PopularActivities::getEndTime, bo.getEndTime());

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

@@ -12,6 +12,7 @@ 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.PopularActivities;
import org.dromara.property.domain.QuestionnaireQuestion;
import org.dromara.property.domain.QuestionnaireQuestionItem;
import org.dromara.property.domain.bo.QuestionnaireQuestionBo;
@@ -106,7 +107,8 @@ public class QuestionnaireServiceImpl implements IQuestionnaireService {
private LambdaQueryWrapper<Questionnaire> buildQueryWrapper(QuestionnaireBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<Questionnaire> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(Questionnaire::getId);
lqw.orderByDesc(Questionnaire::getCreateTime)
.orderByDesc(Questionnaire::getUpdateTime);
lqw.like(StringUtils.isNotBlank(bo.getHead()), Questionnaire::getHead, bo.getHead());
lqw.eq(StringUtils.isNotBlank(bo.getStatus()), Questionnaire::getStatus, bo.getStatus());
return lqw;

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

@@ -11,6 +11,7 @@ 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.extern.slf4j.Slf4j;
import org.dromara.property.domain.Questionnaire;
import org.dromara.property.domain.vo.ResidentUnitVo;
import org.dromara.property.service.IResidentUnitService;
import org.dromara.sis.api.RemoteSisAuthService;
@@ -90,7 +91,8 @@ public class ResidentPersonServiceImpl implements IResidentPersonService {
private LambdaQueryWrapper<ResidentPerson> buildQueryWrapper(ResidentPersonBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<ResidentPerson> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(ResidentPerson::getId);
lqw.orderByDesc(ResidentPerson::getCreateTime)
.orderByDesc(ResidentPerson::getUpdateTime);
lqw.like(StringUtils.isNotBlank(bo.getUserName()), ResidentPerson::getUserName, bo.getUserName());
lqw.eq(StringUtils.isNotBlank(bo.getPhone()), ResidentPerson::getPhone, bo.getPhone());
lqw.eq(bo.getGender() != null, ResidentPerson::getGender, bo.getGender());

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

@@ -10,6 +10,7 @@ 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.ResidentPerson;
import org.dromara.property.service.IResidentPersonService;
import org.dromara.property.service.ITbRoomService;
import org.springframework.stereotype.Service;
@@ -100,7 +101,8 @@ public class ResidentUnitServiceImpl implements IResidentUnitService {
private LambdaQueryWrapper<ResidentUnit> buildQueryWrapper(ResidentUnitBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<ResidentUnit> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(ResidentUnit::getId);
lqw.orderByDesc(ResidentUnit::getCreateTime)
.orderByDesc(ResidentUnit::getUpdateTime);
lqw.like(StringUtils.isNotBlank(bo.getName()), ResidentUnit::getName, bo.getName());
lqw.eq(bo.getUnitNumber() != null, ResidentUnit::getUnitNumber, bo.getUnitNumber());
lqw.eq(bo.getType() != null, ResidentUnit::getType, bo.getType());

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

@@ -9,6 +9,7 @@ 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.ResidentUnit;
import org.springframework.stereotype.Service;
import org.dromara.property.domain.bo.ServerBookingBo;
import org.dromara.property.domain.vo.ServerBookingVo;
@@ -73,7 +74,8 @@ public class ServerBookingServiceImpl implements IServerBookingService {
private LambdaQueryWrapper<ServerBooking> buildQueryWrapper(ServerBookingBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<ServerBooking> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(ServerBooking::getId);
lqw.orderByDesc(ServerBooking::getCreateTime)
.orderByDesc(ServerBooking::getUpdateTime);
lqw.eq(bo.getServerId() != null, ServerBooking::getServerId, bo.getServerId());
lqw.eq(bo.getServerNum() != null, ServerBooking::getServerNum, bo.getServerNum());
lqw.eq(StringUtils.isNotBlank(bo.getBookingType()), ServerBooking::getBookingType, bo.getBookingType());

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

@@ -9,6 +9,7 @@ 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.ServerBooking;
import org.springframework.stereotype.Service;
import org.dromara.property.domain.bo.ServerBo;
import org.dromara.property.domain.vo.ServerVo;
@@ -73,7 +74,8 @@ public class ServerServiceImpl implements IServerService {
private LambdaQueryWrapper<Server> buildQueryWrapper(ServerBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<Server> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(Server::getId);
lqw.orderByDesc(Server::getCreateTime)
.orderByDesc(Server::getUpdateTime);
lqw.like(StringUtils.isNotBlank(bo.getServerName()), Server::getServerName, bo.getServerName());
lqw.eq(bo.getServerType() != null, Server::getServerType, bo.getServerType());
lqw.eq(bo.getPrice() != null, Server::getPrice, bo.getPrice());

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

@@ -9,6 +9,7 @@ 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.Server;
import org.dromara.property.domain.ServiceWarning;
import org.dromara.property.domain.bo.ServiceWarningBo;
import org.dromara.property.domain.vo.ServiceWarningVo;
@@ -80,7 +81,8 @@ public class ServiceWarningServiceImpl implements IServiceWarningService {
private LambdaQueryWrapper<ServiceWarning> buildQueryWrapper(ServiceWarningBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<ServiceWarning> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(ServiceWarning::getId);
lqw.orderByDesc(ServiceWarning::getCreateTime)
.orderByDesc(ServiceWarning::getUpdateTime);
lqw.eq(StringUtils.isNotBlank(bo.getEventNo()), ServiceWarning::getEventNo, bo.getEventNo());
lqw.eq(bo.getEventType() != null, ServiceWarning::getEventType, bo.getEventType());
lqw.eq(bo.getAlarmLevel() != null, ServiceWarning::getAlarmLevel, bo.getAlarmLevel());

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

@@ -181,7 +181,8 @@ public class ServiceWorkOrdersServiceImpl implements IServiceWorkOrdersService {
}
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<ServiceWorkOrders> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(ServiceWorkOrders::getId);
lqw.orderByDesc(ServiceWorkOrders::getCreateTime)
.orderByDesc(ServiceWorkOrders::getUpdateTime);
lqw.eq(StringUtils.isNotBlank(bo.getOrderNo()), ServiceWorkOrders::getOrderNo, bo.getOrderNo());
lqw.in(CollUtil.isNotEmpty(statusList), ServiceWorkOrders::getStatus, statusList);
lqw.like(StringUtils.isNotBlank(bo.getOrderName()), ServiceWorkOrders::getOrderName, bo.getOrderName());

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

@@ -9,6 +9,7 @@ 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.ServiceWorkOrders;
import org.springframework.stereotype.Service;
import org.dromara.property.domain.bo.SuppliersBo;
import org.dromara.property.domain.vo.SuppliersVo;
@@ -73,7 +74,8 @@ public class SuppliersServiceImpl implements ISuppliersService {
private LambdaQueryWrapper<Suppliers> buildQueryWrapper(SuppliersBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<Suppliers> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(Suppliers::getId);
lqw.orderByDesc(Suppliers::getCreateTime)
.orderByDesc(Suppliers::getUpdateTime);
lqw.like(StringUtils.isNotBlank(bo.getSuppliersName()), Suppliers::getSuppliersName, bo.getSuppliersName());
lqw.eq(StringUtils.isNotBlank(bo.getPhone()), Suppliers::getPhone, bo.getPhone());
lqw.eq(StringUtils.isNotBlank(bo.getLocation()), Suppliers::getLocation, bo.getLocation());

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

@@ -9,6 +9,7 @@ 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.Suppliers;
import org.springframework.stereotype.Service;
import org.dromara.property.domain.bo.TbAreaGroupBo;
import org.dromara.property.domain.vo.TbAreaGroupVo;
@@ -73,7 +74,8 @@ public class TbAreaGroupServiceImpl implements ITbAreaGroupService {
private LambdaQueryWrapper<TbAreaGroup> buildQueryWrapper(TbAreaGroupBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<TbAreaGroup> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(TbAreaGroup::getId);
lqw.orderByDesc(TbAreaGroup::getCreateTime)
.orderByDesc(TbAreaGroup::getUpdateTime);
lqw.eq(bo.getAreaGroupId() != null, TbAreaGroup::getAreaGroupId, bo.getAreaGroupId());
lqw.like(StringUtils.isNotBlank(bo.getAreaGroupName()), TbAreaGroup::getAreaGroupName, bo.getAreaGroupName());
return lqw;

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

@@ -10,6 +10,7 @@ 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.TbAreaGroup;
import org.dromara.property.domain.TbBuilding;
import org.dromara.property.domain.bo.TbBuildingBo;
import org.dromara.property.domain.vo.TbBuildingVo;
@@ -77,7 +78,8 @@ public class TbBuildingServiceImpl implements ITbBuildingService {
private LambdaQueryWrapper<TbBuilding> buildQueryWrapper(TbBuildingBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<TbBuilding> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(TbBuilding::getId);
lqw.orderByDesc(TbBuilding::getCreateTime)
.orderByDesc(TbBuilding::getUpdateTime);
lqw.eq(bo.getCommunityId() != null, TbBuilding::getCommunityId, bo.getCommunityId());
lqw.like(StringUtils.isNotBlank(bo.getBuildingName()), TbBuilding::getBuildingName, bo.getBuildingName());
lqw.eq(bo.getFloorCount() != null, TbBuilding::getFloorCount, bo.getFloorCount());

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

@@ -9,6 +9,7 @@ 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.TbCeremonialserveRoombooking;
import org.springframework.stereotype.Service;
import org.dromara.property.domain.bo.TbCeremonialServeBo;
import org.dromara.property.domain.vo.TbCeremonialServeVo;
@@ -73,7 +74,8 @@ public class TbCeremonialServeServiceImpl implements ITbCeremonialServeService {
private LambdaQueryWrapper<TbCeremonialServe> buildQueryWrapper(TbCeremonialServeBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<TbCeremonialServe> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(TbCeremonialServe::getId);
lqw.orderByDesc(TbCeremonialServe::getCreateTime)
.orderByDesc(TbCeremonialServe::getUpdateTime);
lqw.eq(bo.getClassificationId() != null, TbCeremonialServe::getClassificationId, bo.getClassificationId());
lqw.eq(bo.getRoomBookId() != null, TbCeremonialServe::getRoomBookId, bo.getRoomBookId());
lqw.eq(bo.getServeNum() != null, TbCeremonialServe::getServeNum, bo.getServeNum());

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

@@ -9,6 +9,7 @@ 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.TbBuilding;
import org.springframework.stereotype.Service;
import org.dromara.property.domain.bo.TbCeremonialserveRoombookingBo;
import org.dromara.property.domain.vo.TbCeremonialserveRoombookingVo;
@@ -73,7 +74,8 @@ public class TbCeremonialserveRoombookingServiceImpl implements ITbCeremonialser
private LambdaQueryWrapper<TbCeremonialserveRoombooking> buildQueryWrapper(TbCeremonialserveRoombookingBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<TbCeremonialserveRoombooking> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(TbCeremonialserveRoombooking::getId);
lqw.orderByDesc(TbCeremonialserveRoombooking::getCreateTime)
.orderByDesc(TbCeremonialserveRoombooking::getUpdateTime);
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());

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

@@ -12,6 +12,7 @@ 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.TbCeremonialServe;
import org.dromara.property.domain.TbCommunity;
import org.dromara.property.domain.bo.TbCommunityBo;
import org.dromara.property.domain.vo.*;
@@ -170,7 +171,8 @@ public class TbCommunityServiceImpl implements ITbCommunityService {
private LambdaQueryWrapper<TbCommunity> buildQueryWrapper(TbCommunityBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<TbCommunity> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(TbCommunity::getId);
lqw.orderByDesc(TbCommunity::getCreateTime)
.orderByDesc(TbCommunity::getUpdateTime);
lqw.like(StringUtils.isNotBlank(bo.getCommunityName()), TbCommunity::getCommunityName, bo.getCommunityName());
lqw.eq(bo.getCommunityType() != null, TbCommunity::getCommunityType, bo.getCommunityType());
lqw.eq(StringUtils.isNotBlank(bo.getProvince()), TbCommunity::getProvince, bo.getProvince());

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

@@ -9,6 +9,7 @@ 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.TbCommunity;
import org.springframework.stereotype.Service;
import org.dromara.property.domain.bo.TbConferenceBo;
import org.dromara.property.domain.vo.TbConferenceVo;
@@ -73,7 +74,8 @@ public class TbConferenceServiceImpl implements ITbConferenceService {
private LambdaQueryWrapper<TbConference> buildQueryWrapper(TbConferenceBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<TbConference> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(TbConference::getId);
lqw.orderByDesc(TbConference::getCreateTime)
.orderByDesc(TbConference::getUpdateTime);
lqw.like(StringUtils.isNotBlank(bo.getRoomName()), TbConference::getRoomName, bo.getRoomName());
lqw.eq(bo.getRoomNo() != null, TbConference::getRoomNo, bo.getRoomNo());
lqw.eq(StringUtils.isNotBlank(bo.getRoomLocation()), TbConference::getRoomLocation, bo.getRoomLocation());

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

@@ -9,6 +9,7 @@ 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.TbConference;
import org.springframework.stereotype.Service;
import org.dromara.property.domain.bo.TbE8ConfigBo;
import org.dromara.property.domain.vo.TbE8ConfigVo;
@@ -73,7 +74,8 @@ public class TbE8ConfigServiceImpl implements ITbE8ConfigService {
private LambdaQueryWrapper<TbE8Config> buildQueryWrapper(TbE8ConfigBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<TbE8Config> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(TbE8Config::getId);
lqw.orderByDesc(TbE8Config::getCreateTime)
.orderByDesc(TbE8Config::getUpdateTime);
lqw.like(StringUtils.isNotBlank(bo.getE8Name()), TbE8Config::getE8Name, bo.getE8Name());
lqw.eq(StringUtils.isNotBlank(bo.getE8ServerUrl()), TbE8Config::getE8ServerUrl, bo.getE8ServerUrl());
lqw.eq(StringUtils.isNotBlank(bo.getE8Secret()), TbE8Config::getE8Secret, bo.getE8Secret());

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

@@ -10,6 +10,7 @@ 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.TbE8Config;
import org.dromara.property.domain.TbFloor;
import org.dromara.property.domain.bo.TbFloorBo;
import org.dromara.property.domain.vo.TbBuildingVo;
@@ -80,7 +81,8 @@ public class TbFloorServiceImpl implements ITbFloorService {
private LambdaQueryWrapper<TbFloor> buildQueryWrapper(TbFloorBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<TbFloor> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(TbFloor::getId);
lqw.orderByDesc(TbFloor::getCreateTime)
.orderByDesc(TbFloor::getUpdateTime);
lqw.like(StringUtils.isNotBlank(bo.getFloorName()), TbFloor::getFloorName, bo.getFloorName());
lqw.eq(bo.getFloorNumber() != null, TbFloor::getFloorNumber, bo.getFloorNumber());
lqw.eq(bo.getBuildingId()!= null, TbFloor::getUnitId, bo.getBuildingId());

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

@@ -9,6 +9,7 @@ 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.TbFloor;
import org.springframework.stereotype.Service;
import org.dromara.property.domain.bo.TbRoomBookingBo;
import org.dromara.property.domain.vo.TbRoomBookingVo;
@@ -73,7 +74,8 @@ public class TbRoomBookingServiceImpl implements ITbRoomBookingService {
private LambdaQueryWrapper<TbRoomBooking> buildQueryWrapper(TbRoomBookingBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<TbRoomBooking> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(TbRoomBooking::getId);
lqw.orderByDesc(TbRoomBooking::getCreateTime)
.orderByDesc(TbRoomBooking::getUpdateTime);
lqw.eq(bo.getTbConferenceId() != null, TbRoomBooking::getTbConferenceId, bo.getTbConferenceId());
lqw.eq(bo.getBookingStatus() != null, TbRoomBooking::getBookingStatus, bo.getBookingStatus());
lqw.eq(bo.getReviewStatus() != null, TbRoomBooking::getReviewStatus, bo.getReviewStatus());

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

@@ -11,6 +11,7 @@ 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.TbRoomBooking;
import org.dromara.property.domain.bo.TbRoomBo;
import org.dromara.property.domain.vo.TbFloorVo;
import org.dromara.property.domain.vo.TbRoomVo;
@@ -77,7 +78,8 @@ public class TbRoomServiceImpl implements ITbRoomService {
private LambdaQueryWrapper<TbRoom> buildQueryWrapper(TbRoomBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<TbRoom> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(TbRoom::getId);
lqw.orderByDesc(TbRoom::getCreateTime)
.orderByDesc(TbRoom::getUpdateTime);
lqw.eq(StringUtils.isNotBlank(bo.getRoomNumber()), TbRoom::getRoomNumber, bo.getRoomNumber());
lqw.eq(bo.getRoomType() != null, TbRoom::getRoomType, bo.getRoomType());
lqw.eq(bo.getFloorId() != null, TbRoom::getFloorId, bo.getFloorId());

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

@@ -9,6 +9,7 @@ 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.TbRoom;
import org.springframework.stereotype.Service;
import org.dromara.property.domain.bo.TbServiceClassificationBo;
import org.dromara.property.domain.vo.TbServiceClassificationVo;
@@ -73,7 +74,8 @@ public class TbServiceClassificationServiceImpl implements ITbServiceClassificat
private LambdaQueryWrapper<TbServiceClassification> buildQueryWrapper(TbServiceClassificationBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<TbServiceClassification> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(TbServiceClassification::getId);
lqw.orderByDesc(TbServiceClassification::getCreateTime)
.orderByDesc(TbServiceClassification::getUpdateTime);
lqw.eq(StringUtils.isNotBlank(bo.getType()), TbServiceClassification::getType, bo.getType());
lqw.like(StringUtils.isNotBlank(bo.getName()), TbServiceClassification::getName, bo.getName());
lqw.eq(bo.getSort() != null, TbServiceClassification::getSort, bo.getSort());

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

@@ -10,6 +10,7 @@ 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.TbServiceClassification;
import org.dromara.property.domain.TbUnit;
import org.dromara.property.domain.bo.TbUnitBo;
import org.dromara.property.domain.vo.TbBuildingVo;
@@ -77,7 +78,8 @@ public class TbUnitServiceImpl implements ITbUnitService {
private LambdaQueryWrapper<TbUnit> buildQueryWrapper(TbUnitBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<TbUnit> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(TbUnit::getId);
lqw.orderByDesc(TbUnit::getCreateTime)
.orderByDesc(TbUnit::getUpdateTime);
lqw.like(StringUtils.isNotBlank(bo.getUnitName()), TbUnit::getUnitName, bo.getUnitName());
lqw.eq(bo.getFloorCount() != null, TbUnit::getFloorCount, bo.getFloorCount());
lqw.eq(bo.getBuildingId() != null, TbUnit::getBuildingId, bo.getBuildingId());

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

@@ -9,6 +9,7 @@ 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.TbUnit;
import org.springframework.stereotype.Service;
import org.dromara.property.domain.bo.TbUserGroupBo;
import org.dromara.property.domain.vo.TbUserGroupVo;
@@ -73,7 +74,8 @@ public class TbUserGroupServiceImpl implements ITbUserGroupService {
private LambdaQueryWrapper<TbUserGroup> buildQueryWrapper(TbUserGroupBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<TbUserGroup> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(TbUserGroup::getId);
lqw.orderByDesc(TbUserGroup::getCreateTime)
.orderByDesc(TbUserGroup::getUpdateTime);
lqw.like(bo.getUserGroupId() != null, TbUserGroup::getUserGroupId, bo.getUserGroupId());
lqw.like(StringUtils.isNotBlank(bo.getUserGroupName()), TbUserGroup::getUserGroupName, bo.getUserGroupName());
return lqw;

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

@@ -14,6 +14,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.common.redis.utils.RedisUtils;
import org.dromara.property.domain.TbUserGroup;
import org.dromara.property.domain.bo.QrCodeInfo;
import org.dromara.resource.api.RemoteFileService;
import org.dromara.sis.api.RemoteVisitorService;
@@ -105,7 +106,8 @@ public class TbVisitorManagementServiceImpl implements ITbVisitorManagementServi
private LambdaQueryWrapper<TbVisitorManagement> buildQueryWrapper(TbVisitorManagementBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<TbVisitorManagement> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(TbVisitorManagement::getId);
lqw.orderByDesc(TbVisitorManagement::getCreateTime)
.orderByDesc(TbVisitorManagement::getUpdateTime);
lqw.like(StringUtils.isNotBlank(bo.getVisitorName()), TbVisitorManagement::getVisitorName, bo.getVisitorName());
lqw.eq(StringUtils.isNotBlank(bo.getVisitorUnit()), TbVisitorManagement::getVisitorUnit, bo.getVisitorUnit());
lqw.eq(StringUtils.isNotBlank(bo.getVisitorPhone()), TbVisitorManagement::getVisitorPhone, bo.getVisitorPhone());

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

@@ -9,6 +9,7 @@ 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.TbVisitorManagement;
import org.springframework.stereotype.Service;
import org.dromara.property.domain.bo.TdDeviceTypeBo;
import org.dromara.property.domain.vo.TdDeviceTypeVo;
@@ -73,7 +74,8 @@ public class TdDeviceTypeServiceImpl implements ITdDeviceTypeService {
private LambdaQueryWrapper<TdDeviceType> buildQueryWrapper(TdDeviceTypeBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<TdDeviceType> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(TdDeviceType::getId);
lqw.orderByDesc(TdDeviceType::getCreateTime)
.orderByDesc(TdDeviceType::getUpdateTime);
lqw.eq(StringUtils.isNotBlank(bo.getDvNo()), TdDeviceType::getDvNo, bo.getDvNo());
lqw.like(StringUtils.isNotBlank(bo.getDvName()), TdDeviceType::getDvName, bo.getDvName());
lqw.eq(StringUtils.isNotBlank(bo.getFactoryNo()), TdDeviceType::getFactoryNo, bo.getFactoryNo());

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

@@ -9,6 +9,7 @@ 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.TdDeviceType;
import org.springframework.stereotype.Service;
import org.dromara.property.domain.bo.TsConfigBo;
import org.dromara.property.domain.vo.TsConfigVo;
@@ -73,7 +74,8 @@ public class TsConfigServiceImpl implements ITsConfigService {
private LambdaQueryWrapper<TsConfig> buildQueryWrapper(TsConfigBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<TsConfig> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(TsConfig::getId);
lqw.orderByDesc(TsConfig::getCreateTime)
.orderByDesc(TsConfig::getUpdateTime);
lqw.eq(StringUtils.isNotBlank(bo.getCodeKind()), TsConfig::getCodeKind, bo.getCodeKind());
lqw.eq(StringUtils.isNotBlank(bo.getCodeValue()), TsConfig::getCodeValue, bo.getCodeValue());
lqw.like(StringUtils.isNotBlank(bo.getCodeName()), TsConfig::getCodeName, bo.getCodeName());

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

@@ -9,6 +9,7 @@ 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.TsConfig;
import org.springframework.stereotype.Service;
import org.dromara.property.domain.bo.TsOperationLogBo;
import org.dromara.property.domain.vo.TsOperationLogVo;
@@ -73,7 +74,8 @@ public class TsOperationLogServiceImpl implements ITsOperationLogService {
private LambdaQueryWrapper<TsOperationLog> buildQueryWrapper(TsOperationLogBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<TsOperationLog> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(TsOperationLog::getId);
lqw.orderByDesc(TsOperationLog::getCreateTime)
.orderByDesc(TsOperationLog::getUpdateTime);
lqw.eq(StringUtils.isNotBlank(bo.getUserCode()), TsOperationLog::getUserCode, bo.getUserCode());
lqw.like(StringUtils.isNotBlank(bo.getUserName()), TsOperationLog::getUserName, bo.getUserName());
lqw.eq(StringUtils.isNotBlank(bo.getSysArea()), TsOperationLog::getSysArea, bo.getSysArea());

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

@@ -9,6 +9,7 @@ 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.TsOperationLog;
import org.springframework.stereotype.Service;
import org.dromara.property.domain.bo.VerificationBo;
import org.dromara.property.domain.vo.VerificationVo;
@@ -73,7 +74,8 @@ public class VerificationServiceImpl implements IVerificationService {
private LambdaQueryWrapper<Verification> buildQueryWrapper(VerificationBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<Verification> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(Verification::getId);
lqw.orderByDesc(Verification::getCreateTime)
.orderByDesc(Verification::getUpdateTime);
lqw.eq(bo.getServerId() != null, Verification::getServerId, bo.getServerId());
lqw.eq(bo.getUserId() != null, Verification::getUserId, bo.getUserId());
lqw.eq(bo.getOutcome() != null, Verification::getOutcome, bo.getOutcome());

43
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/smartDevicesImpl/TbMeterRecordServiceImpl.java
View File

@@ -194,6 +194,7 @@ public class TbMeterRecordServiceImpl implements ITbMeterRecordService {
record.setMeterType(info.getMeterType());
record.setReaderId(1L);
record.setReadingTime(DateUtil.parse(result.getRecordTime(), "yyyy-MM-dd HH:mm:ss"));
record.setTenantId(info.getTenantId());
// 获取当前读数
BigDecimal currentReading = BigDecimal.valueOf(
@@ -234,16 +235,50 @@ public class TbMeterRecordServiceImpl implements ITbMeterRecordService {
* @param year 年份
*/
@Override
public void getEnergyTrend(String floorId, String meterId, Long meterType, String day, String month, String year) {
public Map<String, Object> getEnergyTrend(String floorId, String meterId, Long meterType, String day, String month, String year) {
Map<String, Object> resultMap = new HashMap<>();
// hour
List<Map<String, Object>> hourList = baseMapper.getHourTrend(StrUtil.isBlank(floorId) ? null : Long.parseLong(floorId), StrUtil.isBlank(meterId) ? null : Long.parseLong(meterId), meterType, day);
log.info("小时数据：{}", hourList);
Map<String, Object> hourMap = new HashMap<>();
String[] hourCategories = hourList.stream()
.map(map -> map.get("hour").toString())
.toArray(String[]::new);
BigDecimal[] hourData = hourList.stream()
.map(map -> new BigDecimal(map.get("total_consumption").toString()))
.toArray(BigDecimal[]::new);
hourMap.put("categories", hourCategories);
hourMap.put("data", hourData);
// day
String[] monthArr = month.split("-");
List<Map<String, Object>> dayList = baseMapper.getDayTrend(StrUtil.isBlank(floorId) ? null : Long.parseLong(floorId), StrUtil.isBlank(meterId) ? null : Long.parseLong(meterId), meterType, monthArr[0], monthArr[1]);
log.info("天数据：{}", dayList);
Map<String, Object> dayMap = new HashMap<>();
String[] dayCategories = dayList.stream()
.map(map -> map.get("day").toString())
.toArray(String[]::new);
BigDecimal[] dayData = dayList.stream()
.map(map -> new BigDecimal(map.get("total_consumption").toString()))
.toArray(BigDecimal[]::new);
dayMap.put("categories", dayCategories);
dayMap.put("data", dayData);
// month
List<Map<String, Object>> monthList = baseMapper.getMonthTrend(StrUtil.isBlank(floorId) ? null : Long.parseLong(floorId), StrUtil.isBlank(meterId) ? null : Long.parseLong(meterId), meterType, year);
log.info("月数据：{}", monthList);
Map<String, Object> monthMap = new HashMap<>();
String[] monthCategories = monthList.stream()
.map(map -> map.get("month").toString())
.toArray(String[]::new);
BigDecimal[] monthData = monthList.stream()
.map(map -> new BigDecimal(map.get("total_consumption").toString()))
.toArray(BigDecimal[]::new);
monthMap.put("categories", monthCategories);
monthMap.put("data", monthData);
resultMap.put("hour", hourMap);
resultMap.put("day", dayMap);
resultMap.put("month", monthMap);
return resultMap;
}
}

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

@@ -8,6 +8,7 @@ import org.dromara.property.rocketmq.domain.MeterResult;
import java.util.Collection;
import java.util.List;
import java.util.Map;
/**
* 抄记录Service接口
@@ -84,5 +85,5 @@ public interface ITbMeterRecordService {
* @param month 月份
* @param year 年份
*/
void getEnergyTrend(String floorId, String meterId, Long meterType, String day, String month, String year);
Map<String, Object> getEnergyTrend(String floorId, String meterId, Long meterType, String day, String month, String year);
}

4
ruoyi-modules/Property/src/main/resources/mapper/Property/smartDevicesService/TbMeterReocordMapper.xml
View File

@@ -15,8 +15,8 @@
<if test="meterId != '' and meterId != null">
AND a.meter_id = #{meterId}
</if>
GROUP BY CONCAT_WS(':', HOUR(reading_time), '00')
ORDER BY hour
GROUP BY CONCAT_WS(':', HOUR(reading_time), '00'), HOUR(reading_time)
ORDER BY HOUR(reading_time)
</select>

75
ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisVisitorController.java
View File

@@ -4,6 +4,8 @@ package org.dromara.sis.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.date.DateField;
import cn.hutool.core.date.DateUtil;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.RequiredArgsConstructor;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -17,6 +19,7 @@ import org.dromara.sis.service.ISisPersonLibImgService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
@@ -40,46 +43,38 @@ public class SisVisitorController {
* 查询人员通行记录
*/
@GetMapping("/list")
public TableDataInfo<AccessRecordFindRes> list(QueryDto dto) {
public TableDataInfo<AccessRecordFindRes> list(@RequestParam(required = false) String beginTime,
@RequestParam(required = false) String endTime,
@NotNull(message = "页码不能为空") @RequestParam Integer pageNum,
@NotNull(message = "页数不能为空") @RequestParam Integer pageSize,
@RequestParam(required = false) String personName,
@RequestParam(required = false) Integer recordType) {
AccessRecordFindReq req = new AccessRecordFindReq();
if (beginTime != null && !beginTime.isEmpty()) {
req.setStartTime(DateUtil.format(DateUtil.parse(beginTime), "yyyy-MM-dd 00:00:00"));
} else {
// 默认设置为7天前
req.setStartTime(DateUtil.format(DateUtil.offset(new Date(), DateField.DAY_OF_MONTH, -7), "yyyy-MM-dd 00:00:00"));
}
if (endTime != null && !endTime.isEmpty()) {
req.setEndTime(DateUtil.format(DateUtil.parse(endTime), "yyyy-MM-dd 23:59:59"));
} else {
// 默认设置为今天
req.setEndTime(DateUtil.format(new Date(), "yyyy-MM-dd 23:59:59"));
}
TableDataInfo tableDataInfo = new TableDataInfo();
List<AccessRecordFindRes> accessRecordFindResList = new ArrayList<>();
AccessRecordFindRes accessRecordFindRes = new AccessRecordFindRes();
accessRecordFindRes.setDeviceName("4#岗亭09");
accessRecordFindRes.setDoorName("4#岗亭09");
accessRecordFindRes.setDeviceType(1102);
accessRecordFindRes.setReaderName("");
accessRecordFindRes.setGatewayType(1);
accessRecordFindRes.setCustomerName("德隆吴鹏");
accessRecordFindRes.setOrganFullPath("主楼11楼");
accessRecordFindRes.setPictureUrl("https://bpic.588ku.com/back_list_pic/23/04/21/ef5e2a3dd5cfc336fdcf2fd000474f0f.jpg");
accessRecordFindRes.setCardType(34);
accessRecordFindRes.setRecordType(2);
accessRecordFindRes.setActionTime(new Date());
accessRecordFindResList.add(accessRecordFindRes);
tableDataInfo.setRows(accessRecordFindResList);
tableDataInfo.setTotal(1);
tableDataInfo.setCode(200);
return tableDataInfo;
//
// dto.setPageIndex(1);
// dto.setMaxResultCount(20);
//
// // 10秒内
// String starTime = DateUtil.format(DateUtil.offset(new Date(), DateField.SECOND, -10), "yyyy-MM-dd HH:mm:ss");
// String endTime = DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss");
//
// AccessRecordFindReq lift = new AccessRecordFindReq();
// lift.setStartTime(starTime);
// lift.setEndTime(endTime);
// lift.setRecordType(2);
// // 9号电梯
// lift.setDeviceId(550757939925061L);
// dto.setQueryDto(lift);
//// TableDataInfo<AccessRecordFindRes> nineLiftList = e8PlatformApi.getPageAccessRecordList(dto);
// TableDataInfo<AccessRecordFindRes> pageAccessRecordList = new TableDataInfo();
//
// return e8PlatformApi.getPageAccessRecordList(dto);
//如果pageAccessRecordList报错就捕获并封装
if (personName != null && !personName.isEmpty()) {
req.setCustomerName(personName);
}
if (recordType != null) {
req.setRecordType(recordType);
}
QueryDto dto = new QueryDto();
dto.setQueryDto(req);
dto.setPageIndex(pageNum);
dto.setMaxResultCount(pageSize);
return e8PlatformApi.getPageAccessRecordList(dto);
}
}

18
ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/service/E8PlatformApiService.java
View File

@@ -37,6 +37,7 @@ import org.dromara.sis.sdk.e8.domain.voucher.req.IssueVoucherReq;
import org.dromara.sis.sdk.e8.domain.voucher.req.OperateVoucherReq;
import org.dromara.sis.sdk.e8.domain.voucher.res.IssueVoucherRes;
import org.dromara.sis.sdk.e8.utils.E8ApiUtil;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import java.util.HashMap;
@@ -55,6 +56,11 @@ public class E8PlatformApiService implements E8PlatformApi {
private final E8ApiUtil e8ApiUtil;
@Value("${E8Plat.imgUrl}")
private String imgUrl;
private final static String URL = "http://192.168.24.8:50030";
//***************************************客户信息接口*******************************************
private final static String CUSTOMER_GET_PAGE_LIST = "/api/E8/customer/get-page-list";
private final static String CUSTOMER_GET_FIRST_OR_DEFAULT = "/api/E8/customer/get-first-or-default";
@@ -422,6 +428,18 @@ public class E8PlatformApiService implements E8PlatformApi {
tableData.setTotal(Long.parseLong(result.get("total").toString()));
// 从结果映射中获取项目列表，转换为访问记录信息列表后设置到分页对象中
tableData.setRows(JSONUtil.toList(JSONUtil.toJsonStr(result.get("item")), AccessRecordFindRes.class));
for (AccessRecordFindRes res : tableData.getRows()){
if (res.getVoucherUrl() != null && !res.getVoucherUrl().isEmpty()) {
res.setVoucherUrl(res.getVoucherUrl().replace(URL, imgUrl));
}
if (res.getPictureUrl() != null && !res.getPictureUrl().isEmpty()) {
res.setPictureUrl(res.getPictureUrl().replace(URL, imgUrl));
}
}
tableData.setCode(200);
tableData.setMsg("查询成功");
// 返回填充了数据的分页对象
return tableData;
}