From e067f714c0588407b1c20ddd6b7af3b2043e35f8 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 29 九月 2025 11:29:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WarningPushServiceImpl.java | 69 +++++++++++++++++++++++-----------
1 files changed, 46 insertions(+), 23 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WarningPushServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WarningPushServiceImpl.java
index d1cb6d2..afc5810 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WarningPushServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WarningPushServiceImpl.java
@@ -1,20 +1,27 @@
package com.doumee.service.business.impl;
+import com.doumee.core.utils.Constants;
+import com.doumee.dao.business.model.Visits;
+import com.doumee.dao.business.model.Warning;
import com.doumee.service.business.third.model.PageData;
import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.WarningPushMapper;
import com.doumee.dao.business.model.WarningPush;
+import com.doumee.dao.business.model.Member;
import com.doumee.service.business.WarningPushService;
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.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.List;
+import java.util.Objects;
/**
* 鎶ヨ鎺ㄩ�佽褰昐ervice瀹炵幇
@@ -83,65 +90,78 @@
QueryWrapper<WarningPush> wrapper = new QueryWrapper<>(warningPush);
return warningPushMapper.selectList(wrapper);
}
-
+
@Override
public PageData<WarningPush> findPage(PageWrap<WarningPush> pageWrap) {
IPage<WarningPush> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<WarningPush> queryWrapper = new QueryWrapper<>();
+ MPJLambdaWrapper<WarningPush> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
+ pageWrap.getModel().setIsdeleted(Constants.ZERO);
+ queryWrapper.selectAll(WarningPush.class )
+ .selectAs(Member::getName,WarningPush::getMemberName)
+ .selectAs(Warning::getName,WarningPush::getWarningName)
+ .selectAs(Warning::getType,WarningPush::getWarningType)
+ .selectAs(Warning::getLevel,WarningPush::getWarningLevel)
+ .leftJoin(Member.class,Member::getId,WarningPush::getMemberId)
+ .leftJoin(Warning.class,Warning::getId,WarningPush::getWarningId);
+ queryWrapper.eq(pageWrap.getModel().getWarningType()!=null,Warning::getType, pageWrap.getModel().getWarningType());
+ queryWrapper.eq(pageWrap.getModel().getWarningLevel()!=null,Warning::getLevel, pageWrap.getModel().getWarningLevel());
+ queryWrapper.eq(pageWrap.getModel().getWarningLevel()!=null,Warning::getLevel, pageWrap.getModel().getWarningLevel());
+ queryWrapper.ge(Objects.nonNull(pageWrap.getModel().getQueryStarttime()), WarningPush::getCreateDate,Utils.Date.getStart(pageWrap.getModel().getQueryStarttime()));
+ queryWrapper.le(Objects.nonNull(pageWrap.getModel().getQueryEndtime()),WarningPush::getCreateDate,Utils.Date.getEnd(pageWrap.getModel().getQueryEndtime()));
if (pageWrap.getModel().getId() != null) {
- queryWrapper.lambda().eq(WarningPush::getId, pageWrap.getModel().getId());
+ queryWrapper.eq(WarningPush::getId, pageWrap.getModel().getId());
}
if (pageWrap.getModel().getCreator() != null) {
- queryWrapper.lambda().eq(WarningPush::getCreator, pageWrap.getModel().getCreator());
+ queryWrapper.eq(WarningPush::getCreator, pageWrap.getModel().getCreator());
}
if (pageWrap.getModel().getCreateDate() != null) {
- queryWrapper.lambda().ge(WarningPush::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
- queryWrapper.lambda().le(WarningPush::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
+ queryWrapper.ge(WarningPush::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
+ queryWrapper.le(WarningPush::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
}
if (pageWrap.getModel().getEditor() != null) {
- queryWrapper.lambda().eq(WarningPush::getEditor, pageWrap.getModel().getEditor());
+ queryWrapper.eq(WarningPush::getEditor, pageWrap.getModel().getEditor());
}
if (pageWrap.getModel().getEditDate() != null) {
- queryWrapper.lambda().ge(WarningPush::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
- queryWrapper.lambda().le(WarningPush::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
+ queryWrapper.ge(WarningPush::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
+ queryWrapper.le(WarningPush::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
}
if (pageWrap.getModel().getIsdeleted() != null) {
- queryWrapper.lambda().eq(WarningPush::getIsdeleted, pageWrap.getModel().getIsdeleted());
+ queryWrapper.eq(WarningPush::getIsdeleted, pageWrap.getModel().getIsdeleted());
}
if (pageWrap.getModel().getInfo() != null) {
- queryWrapper.lambda().eq(WarningPush::getInfo, pageWrap.getModel().getInfo());
+ queryWrapper.eq(WarningPush::getInfo, pageWrap.getModel().getInfo());
}
if (pageWrap.getModel().getMemberId() != null) {
- queryWrapper.lambda().eq(WarningPush::getMemberId, pageWrap.getModel().getMemberId());
+ queryWrapper.eq(WarningPush::getMemberId, pageWrap.getModel().getMemberId());
}
if (pageWrap.getModel().getWarningId() != null) {
- queryWrapper.lambda().eq(WarningPush::getWarningId, pageWrap.getModel().getWarningId());
+ queryWrapper.eq(WarningPush::getWarningId, pageWrap.getModel().getWarningId());
}
if (pageWrap.getModel().getTitle() != null) {
- queryWrapper.lambda().eq(WarningPush::getTitle, pageWrap.getModel().getTitle());
+ queryWrapper.like(WarningPush::getTitle, pageWrap.getModel().getTitle());
}
if (pageWrap.getModel().getContent() != null) {
- queryWrapper.lambda().eq(WarningPush::getContent, pageWrap.getModel().getContent());
+ queryWrapper.like(WarningPush::getContent, pageWrap.getModel().getContent());
}
if (pageWrap.getModel().getStatus() != null) {
- queryWrapper.lambda().eq(WarningPush::getStatus, pageWrap.getModel().getStatus());
+ queryWrapper.eq(WarningPush::getStatus, pageWrap.getModel().getStatus());
}
if (pageWrap.getModel().getPushInfo() != null) {
- queryWrapper.lambda().eq(WarningPush::getPushInfo, pageWrap.getModel().getPushInfo());
+ queryWrapper.eq(WarningPush::getPushInfo, pageWrap.getModel().getPushInfo());
}
if (pageWrap.getModel().getEventInfo() != null) {
- queryWrapper.lambda().eq(WarningPush::getEventInfo, pageWrap.getModel().getEventInfo());
+ queryWrapper.eq(WarningPush::getEventInfo, pageWrap.getModel().getEventInfo());
}
if (pageWrap.getModel().getPushId() != null) {
- queryWrapper.lambda().eq(WarningPush::getPushId, pageWrap.getModel().getPushId());
+ queryWrapper.eq(WarningPush::getPushId, pageWrap.getModel().getPushId());
}
if (pageWrap.getModel().getPushDate() != null) {
- queryWrapper.lambda().ge(WarningPush::getPushDate, Utils.Date.getStart(pageWrap.getModel().getPushDate()));
- queryWrapper.lambda().le(WarningPush::getPushDate, Utils.Date.getEnd(pageWrap.getModel().getPushDate()));
+ queryWrapper.ge(WarningPush::getPushDate, Utils.Date.getStart(pageWrap.getModel().getPushDate()));
+ queryWrapper.le(WarningPush::getPushDate, Utils.Date.getEnd(pageWrap.getModel().getPushDate()));
}
if (pageWrap.getModel().getPushType() != null) {
- queryWrapper.lambda().eq(WarningPush::getPushType, pageWrap.getModel().getPushType());
+ queryWrapper.eq(WarningPush::getPushType, pageWrap.getModel().getPushType());
}
for(PageWrap.SortData sortData: pageWrap.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
@@ -150,7 +170,10 @@
queryWrapper.orderByAsc(sortData.getProperty());
}
}
- return PageData.from(warningPushMapper.selectPage(page, queryWrapper));
+
+ queryWrapper.orderByDesc(WarningPush::getCreateDate);
+ IPage<WarningPush> result = warningPushMapper.selectJoinPage(page, WarningPush.class,queryWrapper);
+ return PageData.from(result);
}
@Override
--
Gitblit v1.9.3