From cac8f41a47915de2a30a8784fe1fc35c364e86df Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期二, 10 十月 2023 18:27:08 +0800
Subject: [PATCH] #pgsql 运营监控
---
server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java | 143 +++++++++++++++++++++++------------------------
1 files changed, 71 insertions(+), 72 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java
index 2406bd9..e75b451 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java
@@ -1,4 +1,6 @@
package com.doumee.service.business.impl;
+import com.doumee.biz.system.SystemDictDataBiz;
+import com.google.common.collect.Lists;
import com.doumee.core.constants.Constants;
import com.doumee.core.model.PageData;
@@ -6,18 +8,23 @@
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.BikeRepairMapper;
import com.doumee.dao.business.MultifileMapper;
-import com.doumee.dao.business.model.BikeRepair;
-import com.doumee.dao.business.model.Multifile;
+import com.doumee.dao.business.join.BikeRepairJoinMapper;
+import com.doumee.dao.business.model.*;
+import com.doumee.dao.business.web.request.BikeRepairDTO;
+import com.doumee.dao.business.web.request.BikeRepairProblemDTO;
+import com.doumee.dao.business.web.request.BikeRepairQuery;
import com.doumee.dao.business.web.request.RepairRequest;
import com.doumee.service.business.BikeRepairService;
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.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
import java.util.Date;
import java.util.List;
@@ -33,6 +40,12 @@
@Autowired
private BikeRepairMapper bikeRepairMapper;
+
+ @Autowired
+ private BikeRepairJoinMapper bikeRepairJoinMapper;
+
+ @Autowired
+ SystemDictDataBiz systemDictDataBiz;
@Autowired
private MultifileMapper multifileMapper;
@@ -93,83 +106,69 @@
QueryWrapper<BikeRepair> wrapper = new QueryWrapper<>(bikeRepair);
return bikeRepairMapper.selectList(wrapper);
}
-
+
@Override
- public PageData<BikeRepair> findPage(PageWrap<BikeRepair> pageWrap) {
+ public PageData<BikeRepairDTO> findPage(PageWrap<BikeRepairQuery> pageWrap) {
IPage<BikeRepair> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<BikeRepair> queryWrapper = new QueryWrapper<>();
+ MPJLambdaWrapper<BikeRepair> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
- if (pageWrap.getModel().getId() != null) {
- queryWrapper.lambda().eq(BikeRepair::getId, pageWrap.getModel().getId());
- }
- if (pageWrap.getModel().getCreateDate() != null) {
- queryWrapper.lambda().ge(BikeRepair::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
- queryWrapper.lambda().le(BikeRepair::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
- }
- if (pageWrap.getModel().getCreator() != null) {
- queryWrapper.lambda().eq(BikeRepair::getCreator, pageWrap.getModel().getCreator());
- }
- if (pageWrap.getModel().getEditDate() != null) {
- queryWrapper.lambda().ge(BikeRepair::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
- queryWrapper.lambda().le(BikeRepair::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
- }
- if (pageWrap.getModel().getEditor() != null) {
- queryWrapper.lambda().eq(BikeRepair::getEditor, pageWrap.getModel().getEditor());
- }
- if (pageWrap.getModel().getIsdeleted() != null) {
- queryWrapper.lambda().eq(BikeRepair::getIsdeleted, pageWrap.getModel().getIsdeleted());
- }
- if (pageWrap.getModel().getBinkeId() != null) {
- queryWrapper.lambda().eq(BikeRepair::getBinkeId, pageWrap.getModel().getBinkeId());
- }
- if (pageWrap.getModel().getLongitude() != null) {
- queryWrapper.lambda().eq(BikeRepair::getLongitude, pageWrap.getModel().getLongitude());
- }
- if (pageWrap.getModel().getLatitude() != null) {
- queryWrapper.lambda().eq(BikeRepair::getLatitude, pageWrap.getModel().getLatitude());
- }
- if (pageWrap.getModel().getAddr() != null) {
- queryWrapper.lambda().eq(BikeRepair::getAddr, pageWrap.getModel().getAddr());
- }
- if (pageWrap.getModel().getParamId() != null) {
- queryWrapper.lambda().eq(BikeRepair::getParamId, pageWrap.getModel().getParamId());
- }
- if (pageWrap.getModel().getParam() != null) {
- queryWrapper.lambda().eq(BikeRepair::getParam, pageWrap.getModel().getParam());
+ if (pageWrap.getModel().getCreateDateStart() != null
+ && pageWrap.getModel().getCreateDateEnd() != null) {
+ queryWrapper.ge(BikeRepair::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDateStart()));
+ queryWrapper.le(BikeRepair::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDateEnd()));
}
if (pageWrap.getModel().getStatus() != null) {
- queryWrapper.lambda().eq(BikeRepair::getStatus, pageWrap.getModel().getStatus());
+ queryWrapper.eq(BikeRepair::getStatus, pageWrap.getModel().getStatus());
}
- if (pageWrap.getModel().getInfo() != null) {
- queryWrapper.lambda().eq(BikeRepair::getInfo, pageWrap.getModel().getInfo());
+ queryWrapper.leftJoin(Member.class,Member::getId,BikeRepair::getMemberId)
+ .leftJoin(Bikes.class,Bikes::getId,BikeRepair::getBinkeId)
+ .leftJoin(BaseParam.class,BaseParam::getId,Bikes::getParamId)
+ .leftJoin("base_param bpp on b.param_id = bp.id and bp.type = 1");
+ queryWrapper.selectAs(Member::getOpenid,BikeRepairDTO::getOpenid)
+ .selectAs(BikeRepair::getLinkname,BikeRepairDTO::getLinkname)
+ .selectAs(BikeRepair::getLinkphone,BikeRepairDTO::getLinkphone)
+ .selectAs(Bikes::getCode,BikeRepairDTO::getBikeCode)
+ .selectAs(BikeRepair::getCreateDate,BikeRepairDTO::getCreateDate)
+ .selectAs(BikeRepair::getStatus,BikeRepairDTO::getStatus)
+ .selectAs(BaseParam::getName,BikeRepairDTO::getBikeTypeName)
+ .select("bpp.name as problemName");
+ queryWrapper.like(!StringUtils.isEmpty(pageWrap.getModel().getOpenid()),Member::getOpenid,pageWrap.getModel().getOpenid())
+ .like(!StringUtils.isEmpty(pageWrap.getModel().getBikeId()),Bikes::getId,pageWrap.getModel().getBikeId())
+ .eq(!StringUtils.isEmpty(pageWrap.getModel().getStatus()),BikeRepair::getStatus,pageWrap.getModel().getStatus())
+ .ge(Objects.nonNull(pageWrap.getModel().getCreateDateStart()),
+ BikeRepair::getCreateDate,
+ Utils.Date.getStart(pageWrap.getModel().getCreateDateStart()))
+ .le(Objects.nonNull(pageWrap.getModel().getCreateDateEnd()),
+ BikeRepair::getCreateDate,
+ Utils.Date.getStart(pageWrap.getModel().getCreateDateEnd()));
+ return PageData.from(bikeRepairJoinMapper.selectJoinPage(page, BikeRepairDTO.class,queryWrapper));
+ }
+
+ @Override
+ public BikeRepairProblemDTO getBikeRepairProblemDTO(String id) {
+ BikeRepairProblemDTO bikeRepairProblemDTO = new BikeRepairProblemDTO();
+
+ BikeRepair bikeRepair = bikeRepairMapper.selectById(id);
+ bikeRepairProblemDTO.setParam(bikeRepair.getParam());
+
+// multifileMapper.multifile);
+ QueryWrapper<Multifile> wrapper = new QueryWrapper<>();
+ wrapper.lambda()
+ .eq(Multifile::getObjId,id)
+ .eq(Multifile::getObjType,Constants.ZERO)
+ .eq(Multifile::getIsdeleted,Constants.ZERO);
+ List<Multifile> multifiles = multifileMapper.selectList(wrapper);
+ //TODO 闇�瑕佷慨鏀�
+ String path =systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode();
+ String projectFile = systemDictDataBiz.queryByCode(Constants.OSS, Constants.PROJECT_FILE).getCode();
+ if (!CollectionUtils.isEmpty(multifiles)){
+ multifiles.forEach(s->{
+ s.setFileurlfull(path+projectFile+s.getFileurl());
+ });
+ bikeRepairProblemDTO.setList(multifiles);
}
- if (pageWrap.getModel().getLinkname() != null) {
- queryWrapper.lambda().eq(BikeRepair::getLinkname, pageWrap.getModel().getLinkname());
- }
- if (pageWrap.getModel().getLinkphone() != null) {
- queryWrapper.lambda().eq(BikeRepair::getLinkphone, pageWrap.getModel().getLinkphone());
- }
- if (pageWrap.getModel().getDealUser() != null) {
- queryWrapper.lambda().eq(BikeRepair::getDealUser, pageWrap.getModel().getDealUser());
- }
- if (pageWrap.getModel().getDealDate() != null) {
- queryWrapper.lambda().ge(BikeRepair::getDealDate, Utils.Date.getStart(pageWrap.getModel().getDealDate()));
- queryWrapper.lambda().le(BikeRepair::getDealDate, Utils.Date.getEnd(pageWrap.getModel().getDealDate()));
- }
- if (pageWrap.getModel().getDealInfo() != null) {
- queryWrapper.lambda().eq(BikeRepair::getDealInfo, pageWrap.getModel().getDealInfo());
- }
- if (pageWrap.getModel().getContent() != null) {
- queryWrapper.lambda().eq(BikeRepair::getContent, pageWrap.getModel().getContent());
- }
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
- }
- }
- return PageData.from(bikeRepairMapper.selectPage(page, queryWrapper));
+
+ return null;
}
@Override
--
Gitblit v1.9.3