合并更新 #1

Merged
root merged 13 commits from xinwei into master 2024-08-13 09:38:42 +08:00
2 changed files with 78 additions and 69 deletions
Showing only changes of commit f18d321415 - Show all commits

View File

@ -6,6 +6,7 @@ import cn.iocoder.yudao.module.ticket.controller.admin.checkticket.vo.vo.CheckTi
import cn.iocoder.yudao.module.ticket.controller.admin.checkticket.vo.vo.CheckTicketSaveReqVO; import cn.iocoder.yudao.module.ticket.controller.admin.checkticket.vo.vo.CheckTicketSaveReqVO;
import cn.iocoder.yudao.module.ticket.dal.dataobject.checkticket.CheckTicket; import cn.iocoder.yudao.module.ticket.dal.dataobject.checkticket.CheckTicket;
import cn.iocoder.yudao.module.ticket.dal.mongodb.checkticket.CheckTicketRepository; import cn.iocoder.yudao.module.ticket.dal.mongodb.checkticket.CheckTicketRepository;
import com.mongodb.MongoException;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -118,11 +119,13 @@ public class CheckTicketServiceImpl implements CheckTicketService {
@Override @Override
public String createCheckTicketByMongoDB(CheckTicketSaveReqDTO checkTicketSaveReqDTO) { public String createCheckTicketByMongoDB(CheckTicketSaveReqDTO checkTicketSaveReqDTO) {
CheckTicket checkTicket = BeanUtils.toBean(checkTicketSaveReqDTO, CheckTicket.class); CheckTicket checkTicket = BeanUtils.toBean(checkTicketSaveReqDTO, CheckTicket.class);
// TODO 插入失败会自动抛出异常需要对异常进行处理 try {
// DuplicateKeyException当插入的文档违反唯一索引约束时会抛出此异常 // 执行插入操作
// MongoWriteException在写入操作中发生的其他错误例如文档格式不正确或数据库连接问题
checkTicketRepository.insert(checkTicket); checkTicketRepository.insert(checkTicket);
return "添加成功"; return "添加成功";
} catch (MongoException e){
return "Mongo数据库写入异常";
}
} }
} }

View File

@ -5,6 +5,7 @@ import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.ticket.api.saledata.dto.SaleDataSaveReqDTO; import cn.iocoder.yudao.module.ticket.api.saledata.dto.SaleDataSaveReqDTO;
import cn.iocoder.yudao.module.ticket.dal.dataobject.saledata.SaleData; import cn.iocoder.yudao.module.ticket.dal.dataobject.saledata.SaleData;
import cn.iocoder.yudao.module.ticket.dal.mongodb.saledata.SaleDataRepository; import cn.iocoder.yudao.module.ticket.dal.mongodb.saledata.SaleDataRepository;
import com.mongodb.MongoException;
import kotlin.jvm.internal.Lambda; import kotlin.jvm.internal.Lambda;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -189,6 +190,7 @@ public class SaleDataServiceImpl implements SaleDataService {
wrapperX.between(SaleDataDO::getSddate, start, end).select(SaleDataDO::getCertificateno, SaleDataDO::getAmount); wrapperX.between(SaleDataDO::getSddate, start, end).select(SaleDataDO::getCertificateno, SaleDataDO::getAmount);
return saleDataMapper.selectList(wrapperX); return saleDataMapper.selectList(wrapperX);
} }
@Override @Override
public List<SaleDataDO> findEventsThisYear() { public List<SaleDataDO> findEventsThisYear() {
DateTimeFormatter date = DateTimeFormatter.ofPattern("yyyyMMdd"); DateTimeFormatter date = DateTimeFormatter.ofPattern("yyyyMMdd");
@ -242,7 +244,6 @@ public class SaleDataServiceImpl implements SaleDataService {
} }
@Override @Override
public List<Map<String, String>> findBySaleMethod() { public List<Map<String, String>> findBySaleMethod() {
List<SaleDataDO> saleDataList = saleDataMapper.selectList(new LambdaQueryWrapperX<SaleDataDO>().select(SaleDataDO::getTransactiontypeno)); List<SaleDataDO> saleDataList = saleDataMapper.selectList(new LambdaQueryWrapperX<SaleDataDO>().select(SaleDataDO::getTransactiontypeno));
@ -435,8 +436,13 @@ public class SaleDataServiceImpl implements SaleDataService {
@Override @Override
public String createSaleDataByMongoDB(SaleDataSaveReqDTO saleDataSaveReqDTO) { public String createSaleDataByMongoDB(SaleDataSaveReqDTO saleDataSaveReqDTO) {
SaleData saleData = BeanUtils.toBean(saleDataSaveReqDTO, SaleData.class); SaleData saleData = BeanUtils.toBean(saleDataSaveReqDTO, SaleData.class);
try {
saleDataRepository.insert(saleData); saleDataRepository.insert(saleData);
return "添加成功"; return "添加成功";
} catch (MongoException e) {
return "Mongo数据库写入异常";
}
} }