From 9638a186728cafd9f35200ee5fec81538e8148af Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 29 九月 2025 18:02:06 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WarningEventServiceImpl.java | 72 ++++++++++++++++++++++-------------
1 files changed, 45 insertions(+), 27 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WarningEventServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WarningEventServiceImpl.java
index b9bd74b..53b7ea3 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WarningEventServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WarningEventServiceImpl.java
@@ -1,8 +1,9 @@
package com.doumee.service.business.impl;
+import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.WarningEventMapper;
-import com.doumee.dao.business.model.WarningEvent;
+import com.doumee.dao.business.model.*;
import com.doumee.service.business.WarningEventService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -10,11 +11,14 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.doumee.service.business.third.model.PageData;
import com.doumee.service.business.third.model.PageWrap;
+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瀹炵幇
@@ -87,75 +91,86 @@
@Override
public PageData<WarningEvent> findPage(PageWrap<WarningEvent> pageWrap) {
IPage<WarningEvent> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<WarningEvent> queryWrapper = new QueryWrapper<>();
+ MPJLambdaWrapper<WarningEvent> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
+ pageWrap.getModel().setIsdeleted(Constants.ZERO);
+ queryWrapper.selectAll(WarningEvent.class )
+ .selectAs(Warning::getName,WarningEvent::getWarningName)
+ .selectAs(Warning::getType,WarningEvent::getWarningType)
+ .selectAs(Warning::getLevel,WarningEvent::getWarningLevel)
+ .leftJoin(Warning.class,Warning::getId,WarningEvent::getWarningId);
+ queryWrapper.eq(pageWrap.getModel().getWarningType()!=null,Warning::getType, pageWrap.getModel().getWarningType());
+ queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getWarningName()),Warning::getName, pageWrap.getModel().getWarningName());
+ queryWrapper.eq(pageWrap.getModel().getWarningLevel()!=null,Warning::getLevel, pageWrap.getModel().getWarningLevel());
+ queryWrapper.ge(Objects.nonNull(pageWrap.getModel().getQueryStarttime()), WarningEvent::getCreateDate, pageWrap.getModel().getQueryStarttime());
+ queryWrapper.le(Objects.nonNull(pageWrap.getModel().getQueryEndtime()),WarningEvent::getCreateDate, pageWrap.getModel().getQueryEndtime());
if (pageWrap.getModel().getId() != null) {
- queryWrapper.lambda().eq(WarningEvent::getId, pageWrap.getModel().getId());
+ queryWrapper.eq(WarningEvent::getId, pageWrap.getModel().getId());
}
if (pageWrap.getModel().getCreator() != null) {
- queryWrapper.lambda().eq(WarningEvent::getCreator, pageWrap.getModel().getCreator());
+ queryWrapper.eq(WarningEvent::getCreator, pageWrap.getModel().getCreator());
}
if (pageWrap.getModel().getCreateDate() != null) {
- queryWrapper.lambda().ge(WarningEvent::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
- queryWrapper.lambda().le(WarningEvent::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
+ queryWrapper.ge(WarningEvent::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
+ queryWrapper.le(WarningEvent::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
}
if (pageWrap.getModel().getEditor() != null) {
- queryWrapper.lambda().eq(WarningEvent::getEditor, pageWrap.getModel().getEditor());
+ queryWrapper.eq(WarningEvent::getEditor, pageWrap.getModel().getEditor());
}
if (pageWrap.getModel().getEditDate() != null) {
- queryWrapper.lambda().ge(WarningEvent::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
- queryWrapper.lambda().le(WarningEvent::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
+ queryWrapper.ge(WarningEvent::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
+ queryWrapper.le(WarningEvent::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
}
if (pageWrap.getModel().getIsdeleted() != null) {
- queryWrapper.lambda().eq(WarningEvent::getIsdeleted, pageWrap.getModel().getIsdeleted());
+ queryWrapper.eq(WarningEvent::getIsdeleted, pageWrap.getModel().getIsdeleted());
}
if (pageWrap.getModel().getInfo() != null) {
- queryWrapper.lambda().eq(WarningEvent::getInfo, pageWrap.getModel().getInfo());
+ queryWrapper.eq(WarningEvent::getInfo, pageWrap.getModel().getInfo());
}
if (pageWrap.getModel().getWarningId() != null) {
- queryWrapper.lambda().eq(WarningEvent::getWarningId, pageWrap.getModel().getWarningId());
+ queryWrapper.eq(WarningEvent::getWarningId, pageWrap.getModel().getWarningId());
}
if (pageWrap.getModel().getTitle() != null) {
- queryWrapper.lambda().eq(WarningEvent::getTitle, pageWrap.getModel().getTitle());
+ queryWrapper.like(WarningEvent::getTitle, pageWrap.getModel().getTitle());
}
if (pageWrap.getModel().getContent() != null) {
- queryWrapper.lambda().eq(WarningEvent::getContent, pageWrap.getModel().getContent());
+ queryWrapper.eq(WarningEvent::getContent, pageWrap.getModel().getContent());
}
if (pageWrap.getModel().getStatus() != null) {
- queryWrapper.lambda().eq(WarningEvent::getStatus, pageWrap.getModel().getStatus());
+ queryWrapper.eq(WarningEvent::getStatus, pageWrap.getModel().getStatus());
}
if (pageWrap.getModel().getRegion() != null) {
- queryWrapper.lambda().eq(WarningEvent::getRegion, pageWrap.getModel().getRegion());
+ queryWrapper.eq(WarningEvent::getRegion, pageWrap.getModel().getRegion());
}
if (pageWrap.getModel().getEventId() != null) {
- queryWrapper.lambda().eq(WarningEvent::getEventId, pageWrap.getModel().getEventId());
+ queryWrapper.eq(WarningEvent::getEventId, pageWrap.getModel().getEventId());
}
if (pageWrap.getModel().getEventType() != null) {
- queryWrapper.lambda().eq(WarningEvent::getEventType, pageWrap.getModel().getEventType());
+ queryWrapper.eq(WarningEvent::getEventType, pageWrap.getModel().getEventType());
}
if (pageWrap.getModel().getEventLevel() != null) {
- queryWrapper.lambda().eq(WarningEvent::getEventLevel, pageWrap.getModel().getEventLevel());
+ queryWrapper.eq(WarningEvent::getEventLevel, pageWrap.getModel().getEventLevel());
}
if (pageWrap.getModel().getHappenTime() != null) {
- queryWrapper.lambda().eq(WarningEvent::getHappenTime, pageWrap.getModel().getHappenTime());
+ queryWrapper.eq(WarningEvent::getHappenTime, pageWrap.getModel().getHappenTime());
}
if (pageWrap.getModel().getImgServeCode() != null) {
- queryWrapper.lambda().eq(WarningEvent::getImgServeCode, pageWrap.getModel().getImgServeCode());
+ queryWrapper.eq(WarningEvent::getImgServeCode, pageWrap.getModel().getImgServeCode());
}
if (pageWrap.getModel().getImgurl() != null) {
- queryWrapper.lambda().eq(WarningEvent::getImgurl, pageWrap.getModel().getImgurl());
+ queryWrapper.eq(WarningEvent::getImgurl, pageWrap.getModel().getImgurl());
}
if (pageWrap.getModel().getJsonContent() != null) {
- queryWrapper.lambda().eq(WarningEvent::getJsonContent, pageWrap.getModel().getJsonContent());
+ queryWrapper.eq(WarningEvent::getJsonContent, pageWrap.getModel().getJsonContent());
}
if (pageWrap.getModel().getSrcIndex() != null) {
- queryWrapper.lambda().eq(WarningEvent::getSrcIndex, pageWrap.getModel().getSrcIndex());
+ queryWrapper.eq(WarningEvent::getSrcIndex, pageWrap.getModel().getSrcIndex());
}
if (pageWrap.getModel().getSrcType() != null) {
- queryWrapper.lambda().eq(WarningEvent::getSrcType, pageWrap.getModel().getSrcType());
+ queryWrapper.eq(WarningEvent::getSrcType, pageWrap.getModel().getSrcType());
}
if (pageWrap.getModel().getSrcName() != null) {
- queryWrapper.lambda().eq(WarningEvent::getSrcName, pageWrap.getModel().getSrcName());
+ queryWrapper.eq(WarningEvent::getSrcName, pageWrap.getModel().getSrcName());
}
for(PageWrap.SortData sortData: pageWrap.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
@@ -164,7 +179,10 @@
queryWrapper.orderByAsc(sortData.getProperty());
}
}
- return PageData.from(warningEventMapper.selectPage(page, queryWrapper));
+
+ queryWrapper.orderByDesc(WarningEvent::getCreateDate);
+ IPage<WarningEvent> result = warningEventMapper.selectJoinPage(page, WarningEvent.class,queryWrapper);
+ return PageData.from(result);
}
@Override
--
Gitblit v1.9.3