From f9691d544e62d6c04dbfe45d05a6c7bc5e004291 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 29 十二月 2023 11:52:29 +0800
Subject: [PATCH] 服务商
---
server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java | 100 ++++++++++++++++++++++++++++---------------------
1 files changed, 57 insertions(+), 43 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 e75b451..6adcb52 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,8 +1,13 @@
package com.doumee.service.business.impl;
import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
+import com.doumee.core.model.LoginUserInfo;
import com.google.common.collect.Lists;
+import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.Constants;
+import com.doumee.core.dingding.DingDingNotice;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
@@ -20,11 +25,12 @@
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.apache.shiro.SecurityUtils;
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;
@@ -49,6 +55,7 @@
@Autowired
private MultifileMapper multifileMapper;
+
@Override
public String create(BikeRepair bikeRepair) {
@@ -79,6 +86,23 @@
public void updateById(BikeRepair bikeRepair) {
bikeRepairMapper.updateById(bikeRepair);
}
+ @Override
+ public void dealDo(BikeRepair param){
+
+ BikeRepair bikeRepair = findById(param.getId());
+ if(bikeRepair == null ){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ if(Constants.formatIntegerNum(bikeRepair.getStatus()) != Constants.ZERO ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇ヤ笂鎶ュ凡澶勭悊锛屾棤闇�閲嶅澶勭悊锛�");
+ }
+ LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ bikeRepair.setDealInfo(param.getDealInfo());
+ bikeRepair.setDealUser(user.getId());
+ bikeRepair.setStatus(Constants.ONE);
+ bikeRepair.setDealDate(new Date());
+ bikeRepairMapper.updateById(bikeRepair);
+ }
@Override
public void updateByIdInBatch(List<BikeRepair> bikeRepairs) {
@@ -98,7 +122,7 @@
@Override
public BikeRepair findOne(BikeRepair bikeRepair) {
QueryWrapper<BikeRepair> wrapper = new QueryWrapper<>(bikeRepair);
- return bikeRepairMapper.selectOne(wrapper);
+ return bikeRepairMapper.selectOne(wrapper.last(" limit 1"));
}
@Override
@@ -112,46 +136,27 @@
IPage<BikeRepair> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<BikeRepair> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
- 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.eq(BikeRepair::getStatus, pageWrap.getModel().getStatus());
- }
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()));
+ .leftJoin(BaseParam.class,BaseParam::getId,BikeRepair::getTypeId);
+ queryWrapper.selectAll(BikeRepair.class)
+ .selectAs(Member::getOpenid,BikeRepairDTO::getOpenid)
+ .selectAs(BikeRepair::getBinkeId,BikeRepairDTO::getBikeCode)
+ .selectAs(BaseParam::getName,BikeRepairDTO::getBikeTypeName);
+ queryWrapper.like(StringUtils.isNotEmpty(pageWrap.getModel().getOpenid()),Member::getOpenid,pageWrap.getModel().getOpenid())
+ .like(StringUtils.isNotEmpty(pageWrap.getModel().getBikeCode()),BikeRepair::getBinkeId,pageWrap.getModel().getBikeCode())
+ .eq( pageWrap.getModel().getStatus() !=null,BikeRepair::getStatus,pageWrap.getModel().getStatus());
+ if (Objects.nonNull(pageWrap.getModel().getStartDate())) {
+ queryWrapper.ge(BikeRepair::getCreateDate,Utils.Date.getStart(pageWrap.getModel().getStartDate()));
+ }
+ if (Objects.nonNull(pageWrap.getModel().getEndDate())) {
+ queryWrapper.le(BikeRepair::getCreateDate,Utils.Date.getEnd(pageWrap.getModel().getEndDate()));
+ }
+ queryWrapper.orderByDesc(BikeRepair::getCreateDate);
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);
+ public List<Multifile> getBikeRepairProblemDTO(String id) {
QueryWrapper<Multifile> wrapper = new QueryWrapper<>();
wrapper.lambda()
.eq(Multifile::getObjId,id)
@@ -159,16 +164,17 @@
.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();
+ String path =systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.FILE_DIR).getCode()+ systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.REPAIR).getCode();
if (!CollectionUtils.isEmpty(multifiles)){
multifiles.forEach(s->{
- s.setFileurlfull(path+projectFile+s.getFileurl());
+ if(StringUtils.isNotBlank(s.getFileurl())){
+ //瀹屾暣闄勪欢鍦板潃
+ s.setFileurlfull(path+s.getFileurl());
+ }
});
- bikeRepairProblemDTO.setList(multifiles);
}
- return null;
+ return multifiles;
}
@Override
@@ -179,17 +185,20 @@
@Override
- public void saveRepair(RepairRequest repairRequest){
+ public void saveRepair(RepairRequest repairRequest) throws Exception{
BikeRepair bikeRepair = new BikeRepair();
BeanUtils.copyProperties(repairRequest,bikeRepair);
bikeRepair.setCreateDate(new Date());
bikeRepair.setIsdeleted(Constants.ZERO);
+ bikeRepair.setStatus(Constants.ZERO);
+ bikeRepair.setId(Constants.getUUID());
bikeRepairMapper.insert(bikeRepair);
//澶勭悊闄勪欢淇℃伅
List<String> stringList = repairRequest.getFileUrlList();
if(!Objects.isNull(stringList)&&stringList.size()>Constants.ZERO){
for (int i = 0; i < stringList.size(); i++) {
Multifile multifile = new Multifile();
+ multifile.setId(Constants.getUUID());
multifile.setCreateDate(new Date());
multifile.setIsdeleted(Constants.ZERO);
multifile.setSortnum(i+Constants.ONE);
@@ -200,6 +209,11 @@
multifileMapper.insert(multifile);
}
}
+ //鍙戦�侀拤閽夐�氱煡
+ DingDingNotice.bikeRepair(repairRequest,
+ systemDictDataBiz.queryByCode(Constants.DINGDING,Constants.DINGDING_URL).getCode(),
+ systemDictDataBiz.queryByCode(Constants.DINGDING,Constants.DINGDING_SECRET).getCode());
+
}
--
Gitblit v1.9.3