From e2f8fb1fbe26ba6d92f3e5dfcaeb0c69abe76b25 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期四, 14 十二月 2023 14:28:57 +0800 Subject: [PATCH] 海康接口对接开发 --- server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java | 52 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 49 insertions(+), 3 deletions(-) diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java index f9ae463..14d23b5 100644 --- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java +++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java @@ -1,31 +1,44 @@ package com.doumee.service.business.impl; +import cn.hutool.core.lang.PatternPool; +import cn.hutool.core.lang.Validator; +import cn.hutool.core.util.ReUtil; import com.doumee.core.model.PageData; import com.doumee.core.model.PageWrap; import com.doumee.core.utils.Utils; +import com.doumee.dao.admin.request.RetentionQuery; import com.doumee.dao.business.RetentionMapper; -import com.doumee.dao.business.model.Retention; +import com.doumee.dao.business.join.RetentionJoinMapper; +import com.doumee.dao.business.model.*; import com.doumee.service.business.RetentionService; 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.Date; import java.util.List; +import java.util.Objects; /** * 鍦ㄥ巶浜哄憳淇℃伅 琛紙婊炵暀锛塖ervice瀹炵幇 * @author 姹熻箘韫� - * @date 2023/11/23 18:16 + * @date 2023/11/30 15:33 */ @Service public class RetentionServiceImpl implements RetentionService { @Autowired private RetentionMapper retentionMapper; + + @Autowired + private RetentionJoinMapper retentionJoinMapper; + @Override public Integer create(Retention retention) { @@ -83,7 +96,7 @@ QueryWrapper<Retention> wrapper = new QueryWrapper<>(retention); return retentionMapper.selectList(wrapper); } - + @Override public PageData<Retention> findPage(PageWrap<Retention> pageWrap) { IPage<Retention> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity()); @@ -171,4 +184,37 @@ QueryWrapper<Retention> wrapper = new QueryWrapper<>(retention); return retentionMapper.selectCount(wrapper); } + + @Override + public PageData<Retention> findTrainTimePage(PageWrap<RetentionQuery> pageWrap) { + + //鏄惁鏄暟瀛� + boolean number = Validator.isNumber(pageWrap.getModel().getKeyWords()); + //鏄惁鍖呭惈涓枃 + boolean b = Validator.hasChinese(pageWrap.getModel().getKeyWords()); + //鏄惁鍖呭惈鑻辨枃 + boolean hasWord = ReUtil.contains(PatternPool.WORD, pageWrap.getModel().getKeyWords()); + + IPage<Retention> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity()); + MPJLambdaWrapper<Retention> queryWrapper = new MPJLambdaWrapper<>(); + Utils.MP.blankToNull(pageWrap.getModel()); + queryWrapper.leftJoin(Company.class,Company::getId,Retention::getId); + queryWrapper.selectAll(Retention.class) + .selectAs(Company::getName,Retention::getCompanyName); + queryWrapper.like(number,Retention::getPhone,pageWrap.getModel().getKeyWords()) + .like((b||hasWord),Retention::getName,pageWrap.getModel().getKeyWords()) + .eq(Objects.nonNull(pageWrap.getModel().getType()), + Retention::getType, + pageWrap.getModel().getType()) + .like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()), + Company::getName, + pageWrap.getModel().getCompanyName()) + .ge(Objects.nonNull(pageWrap.getModel().getStartTime()), + Retention::getEventDate,pageWrap.getModel().getStartTime()) + .le(Objects.nonNull(pageWrap.getModel().getEndTime()), + Retention::getEventDate,pageWrap.getModel().getStartTime()); + queryWrapper.orderByDesc(Retention::getCreateDate); + IPage<Retention> retentionIPage = retentionJoinMapper.selectJoinPage(page, Retention.class, queryWrapper); + return PageData.from(retentionIPage); + } } -- Gitblit v1.9.3