From 29cd606f6e2c614f765aa043435e6ca110c5c6cf Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 16 八月 2024 18:14:27 +0800
Subject: [PATCH] 代码初始化
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java
index b2e4027..552bbf5 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java
@@ -2,14 +2,17 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.PlatformMapper;
import com.doumee.dao.business.model.Platform;
+import com.doumee.dao.business.model.PlatformGroup;
import com.doumee.service.business.PlatformService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -19,7 +22,7 @@
/**
* 鏈堝彴淇℃伅琛⊿ervice瀹炵幇
* @author 姹熻箘韫�
- * @since 2024/04/28 16:06
+ * @date 2024/06/28 10:03
*/
@Service
public class PlatformServiceImpl implements PlatformService {
@@ -87,9 +90,13 @@
@Override
public PageData<Platform> findPage(PageWrap<Platform> pageWrap) {
IPage<Platform> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<Platform> queryWrapper = new QueryWrapper<>();
+ MPJLambdaWrapper<Platform> queryWrapper = new MPJLambdaWrapper<>();
+ queryWrapper.selectAll(Platform.class)
+ .selectAs(PlatformGroup::getName,Platform::getGroupName)
+ .leftJoin(PlatformGroup.class,PlatformGroup::getId,Platform::getGroupId);
Utils.MP.blankToNull(pageWrap.getModel());
- queryWrapper.lambda()
+ pageWrap.getModel().setIsdeleted(Constants.ZERO);
+ queryWrapper
.eq(pageWrap.getModel().getId() != null, Platform::getId, pageWrap.getModel().getId())
.eq(pageWrap.getModel().getCreator() != null, Platform::getCreator, pageWrap.getModel().getCreator())
.ge(pageWrap.getModel().getCreateDate() != null, Platform::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()))
@@ -105,15 +112,19 @@
.eq(pageWrap.getModel().getGroupId() != null, Platform::getGroupId, pageWrap.getModel().getGroupId())
.eq(pageWrap.getModel().getStartTime() != null, Platform::getStartTime, pageWrap.getModel().getStartTime())
.eq(pageWrap.getModel().getEndTime() != null, Platform::getEndTime, pageWrap.getModel().getEndTime())
- .eq(pageWrap.getModel().getDeviceIds() != null, Platform::getDeviceIds, pageWrap.getModel().getDeviceIds())
- .eq(pageWrap.getModel().getScreenIds() != null, Platform::getScreenIds, pageWrap.getModel().getScreenIds())
.eq(pageWrap.getModel().getWorkingNum() != null, Platform::getWorkingNum, pageWrap.getModel().getWorkingNum())
- .eq(pageWrap.getModel().getWariCallTime() != null, Platform::getWariCallTime, pageWrap.getModel().getWariCallTime())
.eq(pageWrap.getModel().getAlermTime() != null, Platform::getAlermTime, pageWrap.getModel().getAlermTime())
.ge(pageWrap.getModel().getLastEventTime() != null, Platform::getLastEventTime, Utils.Date.getStart(pageWrap.getModel().getLastEventTime()))
.le(pageWrap.getModel().getLastEventTime() != null, Platform::getLastEventTime, Utils.Date.getEnd(pageWrap.getModel().getLastEventTime()))
.eq(pageWrap.getModel().getDeviceNames() != null, Platform::getDeviceNames, pageWrap.getModel().getDeviceNames())
.eq(pageWrap.getModel().getScreenName() != null, Platform::getScreenName, pageWrap.getModel().getScreenName())
+ .eq(pageWrap.getModel().getHkId() != null, Platform::getHkId, pageWrap.getModel().getHkId())
+ .eq(pageWrap.getModel().getCompanys() != null, Platform::getCompanys, pageWrap.getModel().getCompanys())
+ .eq(pageWrap.getModel().getXpos() != null, Platform::getXpos, pageWrap.getModel().getXpos())
+ .eq(pageWrap.getModel().getYpos() != null, Platform::getYpos, pageWrap.getModel().getYpos())
+ .eq(pageWrap.getModel().getWidth() != null, Platform::getWidth, pageWrap.getModel().getWidth())
+ .eq(pageWrap.getModel().getHeight() != null, Platform::getHeight, pageWrap.getModel().getHeight())
+ .eq(pageWrap.getModel().getAngle() != null, Platform::getAngle, pageWrap.getModel().getAngle())
;
for(PageWrap.SortData sortData: pageWrap.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
@@ -122,7 +133,7 @@
queryWrapper.orderByAsc(sortData.getProperty());
}
}
- return PageData.from(platformMapper.selectPage(page, queryWrapper));
+ return PageData.from(platformMapper.selectJoinPage(page,Platform.class, queryWrapper));
}
@Override
--
Gitblit v1.9.3