From 02f18587bd8860b305e2c688e20465be166bb48c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 22 七月 2021 15:14:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtServeServiceImpl.java | 89 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 77 insertions(+), 12 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtServeServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtServeServiceImpl.java
index a1b87e3..59bafa6 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtServeServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtServeServiceImpl.java
@@ -1,5 +1,7 @@
package com.panzhihua.service_community.service.impl;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -10,6 +12,7 @@
import com.panzhihua.common.model.vos.community.ComCvtBusinessCategoryServeVO;
import com.panzhihua.common.model.vos.community.ComCvtServeExcelVO;
import com.panzhihua.common.model.vos.community.ComCvtServeVO;
+import com.panzhihua.common.model.vos.community.ComMngPopulationImportErrorVO;
import com.panzhihua.service_community.dao.ComCvtBusinessAreaDAO;
import com.panzhihua.service_community.dao.ComCvtBusinessDAO;
import com.panzhihua.service_community.dao.ComCvtCategoryDAO;
@@ -24,10 +27,7 @@
import org.springframework.util.ObjectUtils;
import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -69,6 +69,9 @@
public R addComCvtServe(ComCvtServeDTO comCvtServeDTO) {
ComCvtServeDO comCvtServeDO = new ComCvtServeDO();
BeanUtils.copyProperties(comCvtServeDTO, comCvtServeDO);
+ if(checkRepeat(comCvtServeDO)){
+ return R.fail("服务已存在");
+ }
int insert = comCvtServeDAO.insert(comCvtServeDO);
if (insert > 0) {
return R.ok();
@@ -82,8 +85,12 @@
if (null == comCvtServeDO) {
return R.fail("该服务不存在");
}
- BeanUtils.copyProperties(comCvtServeDTO, comCvtServeDO);
- int update = comCvtServeDAO.updateById(comCvtServeDO);
+ ComCvtServeDO comCvtServeDO2 = new ComCvtServeDO();
+ BeanUtils.copyProperties(comCvtServeDTO, comCvtServeDO2);
+ if(!comCvtServeDO.equals(comCvtServeDO2) && checkRepeat(comCvtServeDO2)){
+ return R.fail("该服务与其他服务重复");
+ }
+ int update = comCvtServeDAO.updateById(comCvtServeDO2);
if (update > 0) {
return R.ok();
}
@@ -160,28 +167,69 @@
@Override
public R listSaveConvenientServeExcelVO(List<ComCvtServeExcelVO> list, Long communityId) {
List<ComCvtServeDO> comCvtServeDOS = new ArrayList<>();
+ List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
List<ComCvtCategoryDO> categoryDOS = comCvtCategoryDAO.selectList(new QueryWrapper<ComCvtCategoryDO>().lambda().orderByDesc(ComCvtCategoryDO::getWeight));
Map<String, Long> categoryMap = getCategoryMap(categoryDOS);
List<ComCvtBusinessDO> comCvtBusinessDOS;
if (null != communityId && communityId != 0) {
comCvtBusinessDOS = comCvtBusinessDAO.selectList(new QueryWrapper<ComCvtBusinessDO>().lambda().eq(ComCvtBusinessDO::getCommunityId, communityId));
} else {
- comCvtBusinessDOS = comCvtBusinessDAO.selectList(null);
+ comCvtBusinessDOS = comCvtBusinessDAO.selectList(new LambdaQueryWrapper<>());
}
Map<String, Long> businessMap = getBusinessMap(comCvtBusinessDOS);
- list.forEach(comCvtServeExcelVO -> {
+ int index = 2;
+ for (ComCvtServeExcelVO comCvtServeExcelVO:list) {
+
+ /**
+ * 便民服务分类存在 并且 便民服务商家 匹配上
+ */
if (categoryMap.containsKey(comCvtServeExcelVO.getCategoryName()) && businessMap.containsKey(comCvtServeExcelVO.getBusinessName())) {
ComCvtServeDO comCvtServeDO = new ComCvtServeDO();
BeanUtils.copyProperties(comCvtServeExcelVO, comCvtServeDO);
comCvtServeDO.setCategoryId(categoryMap.get(comCvtServeExcelVO.getCategoryName()));
comCvtServeDO.setBusinessId(businessMap.get(comCvtServeExcelVO.getBusinessName()));
- comCvtServeDOS.add(comCvtServeDO);
+ //检查商家是否已有某服务
+ if(!checkRepeat(comCvtServeDO)){
+ comCvtServeDOS.add(comCvtServeDO);
+ }else{
+ ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ importErrorVO.setErrorMsg(String.format("导入失败：商家【%s】下已有服务【%s】",comCvtServeExcelVO.getBusinessName(),comCvtServeExcelVO.getServiceName()));
+ importErrorVO.setErrorPosition("第" + index + "行");
+ populationImportErrorVOList.add(importErrorVO);
+ log.error(String.format("导入失败：商家【%s】下已有服务【%s】",comCvtServeExcelVO.getBusinessName(),comCvtServeExcelVO.getServiceName()));
+ }
+ }else{
+ if(!categoryMap.containsKey(comCvtServeExcelVO.getCategoryName())) {
+ ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ importErrorVO.setErrorMsg("导入失败: 服务分类" + comCvtServeExcelVO.getCategoryName() +"不存在");
+ importErrorVO.setErrorPosition("第" + index + "行，第1列");
+ populationImportErrorVOList.add(importErrorVO);
+// errorInfo.add(comCvtServeExcelVO.getCategoryName() +"导入失败: 服务分类不存在");
+ }
+ if(!businessMap.containsKey(comCvtServeExcelVO.getBusinessName())) {
+ ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ importErrorVO.setErrorMsg("导入失败: 便民服务商家" + comCvtServeExcelVO.getBusinessName() +"不存在");
+ importErrorVO.setErrorPosition("第" + index + "行，第5列");
+ populationImportErrorVOList.add(importErrorVO);
+ }
}
- });
- this.saveBatch(comCvtServeDOS);
- return R.ok();
+ index++;
+ }
+ boolean saveBatched = this.saveBatch(comCvtServeDOS);
+ if(saveBatched) {
+ if (comCvtServeDOS.size()>0 && populationImportErrorVOList.size() > 0) {
+ return R.fail(JSON.toJSONString(populationImportErrorVOList));
+ }
+ if(comCvtServeDOS.size()==0 && populationImportErrorVOList.size() > 0){
+ return R.fail(JSON.toJSONString(populationImportErrorVOList));
+ }
+ }else {
+ return R.fail(JSON.toJSONString(populationImportErrorVOList));
+ }
+ return R.ok("共计导入服务数量："+comCvtServeDOS.size());
}
+ //获取分类集合
private Map<String, Long> getCategoryMap(List<ComCvtCategoryDO> categoryDOS) {
Map<String, Long> categoryMap = new HashMap<>();
if (!ObjectUtils.isEmpty(categoryDOS)) {
@@ -192,6 +240,7 @@
return categoryMap;
}
+ //获取商家集合
private Map<String, Long> getBusinessMap(List<ComCvtBusinessDO> comCvtBusinessDOS) {
Map<String, Long> businessMap = new HashMap<>();
if (!ObjectUtils.isEmpty(comCvtBusinessDOS)) {
@@ -201,4 +250,20 @@
}
return businessMap;
}
+
+ /**
+ * 检查服务是否重复 商家名称、分类名称，服务名称、服务价格、服务描述不能同时重复
+ * @param comCvtServeDO
+ * @return
+ */
+ private boolean checkRepeat(ComCvtServeDO comCvtServeDO){
+ Integer count = comCvtServeDAO.selectCount(new QueryWrapper<ComCvtServeDO>().lambda()
+ .eq(ComCvtServeDO::getBusinessId,comCvtServeDO.getBusinessId())
+ .and(wrapper->wrapper.eq(ComCvtServeDO::getCategoryId,comCvtServeDO.getCategoryId()))
+ .and(wrapper->wrapper.eq(ComCvtServeDO::getServiceName,comCvtServeDO.getServiceName()))
+ .and(wrapper->wrapper.eq(ComCvtServeDO::getServicePrice,comCvtServeDO.getServicePrice()))
+ .and(wrapper->wrapper.eq(ComCvtServeDO::getServiceDesc,comCvtServeDO.getServiceDesc()))
+ );
+ return count>0 ? true : false;
+ }
}
--
Gitblit v1.7.1