From a2299a6d4a6f99e9c11132138f5d3e9ec68f03ea Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期五, 06 六月 2025 19:19:34 +0800 Subject: [PATCH] 开发更新 --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwMaterialServiceImpl.java | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 104 insertions(+), 10 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwMaterialServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwMaterialServiceImpl.java index 22b0839..ea498da 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwMaterialServiceImpl.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwMaterialServiceImpl.java @@ -1,6 +1,8 @@ package com.doumee.service.business.impl; +import com.alibaba.nacos.shaded.org.checkerframework.checker.units.qual.A; import com.doumee.biz.system.SystemDictDataBiz; +import com.doumee.core.annotation.excel.ExcelImporter; import com.doumee.core.constants.ResponseStatus; import com.doumee.core.exception.BusinessException; import com.doumee.core.model.LoginUserInfo; @@ -9,11 +11,14 @@ import com.doumee.core.model.PageWrap; import com.doumee.core.utils.Constants; import com.doumee.core.utils.Utils; +import com.doumee.dao.business.CategoryMapper; import com.doumee.dao.business.YwMaterialMapper; import com.doumee.dao.business.YwOutinboundMapper; import com.doumee.dao.business.YwOutinboundRecordMapper; import com.doumee.dao.business.model.*; import com.doumee.dao.system.MultifileMapper; +import com.doumee.dao.system.dto.ImportMaterialDTO; +import com.doumee.dao.system.dto.ImportSystemUserDTO; import com.doumee.dao.system.model.Multifile; import com.doumee.service.business.YwMaterialService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -22,16 +27,19 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.base.MPJBaseMapper; import com.github.yulichang.wrapper.MPJLambdaWrapper; +import javafx.scene.paint.Material; import org.apache.commons.lang.StringUtils; -import org.checkerframework.checker.units.qual.A; +import org.apache.shiro.SecurityUtils; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import org.springframework.web.multipart.MultipartFile; -import java.util.Date; -import java.util.List; -import java.util.Objects; +import java.util.*; +import java.util.stream.Collectors; /** * 杩愮淮璧勪骇淇℃伅琛⊿ervice瀹炵幇 @@ -51,6 +59,9 @@ private YwOutinboundRecordMapper ywOutinboundRecordMapper; @Autowired + private CategoryMapper categoryMapper; + + @Autowired private SystemDictDataBiz systemDictDataBiz; @Override @@ -59,7 +70,6 @@ //TODO rk 鎵�灞為」鐩�/鎴块棿闇�姹傞棶棰� if(Objects.isNull(ywMaterial) || StringUtils.isBlank(ywMaterial.getName()) - || StringUtils.isBlank(ywMaterial.getCode()) || StringUtils.isBlank(ywMaterial.getQrcode()) || Objects.isNull(ywMaterial.getCateId()) ){ @@ -68,8 +78,17 @@ ywMaterial.setId(null); if(StringUtils.isBlank(ywMaterial.getCode())){ //鑷姩鐢熸垚 TODO 瀛樺湪闂 - Long countCode = ywMaterialMapper.selectCount(new QueryWrapper<YwMaterial>().lambda().eq(YwMaterial::getAutoCode, Constants.ONE)); - String nextCode = StringUtils.leftPad(Long.toString(countCode + 1),4,"0"); + YwMaterial lastAutoMaterial = ywMaterialMapper.selectOne(new QueryWrapper<YwMaterial>().lambda().eq(YwMaterial::getAutoCode,Constants.ONE).last("limit 1 ")); + Long countCode = 0L; + String nextCode = StringUtils.leftPad(Long.toString(countCode + 1 ),4,"0"); + if(Objects.nonNull(lastAutoMaterial)){ + Long maxCode = Long.valueOf(lastAutoMaterial.getCode().replace("P","")); + nextCode = StringUtils.leftPad(Long.toString(maxCode + 1),4,"0"); + while (ywMaterialMapper.selectCount(new QueryWrapper<YwMaterial>().lambda().eq(YwMaterial::getCode, "P"+nextCode))>Constants.ZERO){ + countCode = countCode + 1 ; + nextCode = StringUtils.leftPad(Long.toString(countCode),4,"0"); + } + } ywMaterial.setCode("P"+nextCode); ywMaterial.setAutoCode(Constants.ONE); }else{ @@ -104,7 +123,7 @@ @Override public void deleteById(Integer id) { if(ywOutinboundRecordMapper.selectCount(new QueryWrapper<YwOutinboundRecord>().lambda().eq(YwOutinboundRecord::getMaterialId,id))>Constants.ZERO){ - throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠璧勪骇宸叉湁鍑哄叆搴撹褰曪紝涓嶅彲鍒犻櫎"); + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠鐗╂枡宸叉湁鍑哄叆搴撹褰曪紝涓嶅彲鍒犻櫎"); } ywMaterialMapper.update(new UpdateWrapper<YwMaterial>().lambda().set(YwMaterial::getIsdeleted,Constants.ONE).eq(YwMaterial::getId,id)); } @@ -190,7 +209,7 @@ Multifile multifile = multifileMapper.selectOne(new QueryWrapper<Multifile>().lambda().eq(Multifile::getObjId,id).eq(Multifile::getObjType,Constants.MultiFile.MATERIAL_FILE.getKey())); if(Objects.nonNull(multifile)){ String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() - +systemDictDataBiz.queryByCode(Constants.FTP,Constants.YW_CONTRACT_BILL).getCode(); + +systemDictDataBiz.queryByCode(Constants.FTP,Constants.YW_MATERIAL).getCode(); multifile.setFileurlFull(path + multifile.getFileurl()); ywMaterial.setMultifile(multifile); } @@ -220,14 +239,26 @@ .and(StringUtils.isNotBlank(model.getCode()),i->i.like(YwMaterial::getCode,model.getCode()).or().like(YwMaterial::getName,model.getCode())) .like(StringUtils.isNotBlank(model.getAttr()),YwMaterial::getAttr,model.getAttr()) .eq(Objects.nonNull(model.getProjectId()),YwRoom::getProjectId,model.getProjectId()) + .eq(Objects.nonNull(model.getStatus()),YwMaterial::getStatus,model.getStatus()) .eq(Objects.nonNull(model.getRoomId()),YwMaterial::getRoomId,model.getRoomId()) + .eq(Objects.nonNull(model.getCateId()),YwMaterial::getCateId,model.getCateId()) + .eq(Objects.nonNull(model.getParentCateId()),YwMaterial::getParentCateId,model.getParentCateId()) .eq(Objects.nonNull(model.getFloorId()),YwRoom::getFloor,model.getFloorId()) .eq(Objects.nonNull(model.getBuildingId()),YwRoom::getBuildingId,model.getBuildingId()) .eq(YwMaterial::getIsdeleted,Constants.ZERO) .orderByAsc(YwMaterial::getCode) ; - IPage iPage = ywMaterialMapper.selectJoinPage(page,YwMaterial.class,queryWrapper); + IPage<YwMaterial> iPage = ywMaterialMapper.selectJoinPage(page,YwMaterial.class,queryWrapper); + String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() + +systemDictDataBiz.queryByCode(Constants.FTP,Constants.YW_MATERIAL).getCode(); + for (YwMaterial ywMaterial:iPage.getRecords()) { + Multifile multifile = multifileMapper.selectOne(new QueryWrapper<Multifile>().lambda().eq(Multifile::getObjId,ywMaterial.getId()).eq(Multifile::getObjType,Constants.MultiFile.MATERIAL_FILE.getKey())); + if(Objects.nonNull(multifile)){ + multifile.setFileurlFull(path + multifile.getFileurl()); + ywMaterial.setMultifile(multifile); + } + } return PageData.from(iPage); } @@ -236,4 +267,67 @@ QueryWrapper<YwMaterial> wrapper = new QueryWrapper<>(ywMaterial); return ywMaterialMapper.selectCount(wrapper); } + + + @Override + public Integer importMaterialBatch(MultipartFile file,LoginUserInfo loginUserInfo) { + try { + ExcelImporter ie = new ExcelImporter(file, 0, 0); + List<ImportMaterialDTO> dataList = ie.getDataList(ImportMaterialDTO.class, null); + if (CollectionUtils.isEmpty(dataList)) { + throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝褰曞叆鏁版嵁涓虹┖锛�"); + } + + List<Category> allCategory = categoryMapper.selectList(new QueryWrapper<Category>().lambda() + .eq(Category::getIsdeleted,Constants.ZERO).eq(Category::getIsdeleted,Constants.ZERO) + .eq(Category::getType,Constants.SEVEN) + ); + if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isEmpty(allCategory)){ + throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝鏃犲垎绫诲熀纭�鏁版嵁锛�"); + } + List<Category> categoryList = allCategory.stream().filter(i->Objects.isNull(i.getParentId())).collect(Collectors.toList()); + for (Category category: categoryList) { + category.setChildCategoryList( + allCategory.stream().filter(i->Objects.nonNull(i.getParentId())&&Constants.equalsInteger(i.getParentId(),category.getId())).collect(Collectors.toList()) + ); + } + List<YwMaterial> ywMaterialList = new ArrayList<>(); + for (int i = 0; i < dataList.size(); i++) { + ImportMaterialDTO importMaterialDTO = dataList.get(i); + if(Objects.isNull(importMaterialDTO) + || StringUtils.isBlank(importMaterialDTO.getName()) + || StringUtils.isBlank(importMaterialDTO.getCategoryName()) + || StringUtils.isBlank(importMaterialDTO.getCategoryChildName()) + || StringUtils.isBlank(importMaterialDTO.getQrcode()) + ){ + throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝绗�"+(i+1)+"琛屽繀濉」缂哄け锛�"); + } + YwMaterial ywMaterial = new YwMaterial(); + BeanUtils.copyProperties(importMaterialDTO,ywMaterial); + Optional<Category> categoryOptional = categoryList.stream().filter(j->j.getName().equals(importMaterialDTO.getCategoryName())).findAny(); + if(categoryOptional.isPresent()){ + Category category = categoryOptional.get(); + ywMaterial.setParentCateId(category.getId()); + Optional<Category> childCategoryOptional = category.getChildCategoryList().stream().filter(j->j.getName().equals(importMaterialDTO.getCategoryChildName())).findAny(); + if(childCategoryOptional.isPresent()){ + ywMaterial.setCateId(childCategoryOptional.get().getId()); + }else{ + throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝绗�"+(i+1)+"琛岀墿鏂欏瓙鍒嗙被鏈煡璇㈠埌锛�"); + } + }else{ + throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝绗�"+(i+1)+"琛岀墿鏂欏垎绫绘湭鏌ヨ鍒帮紒"); + } + ywMaterialList.add(ywMaterial); + } + + for (YwMaterial ywMaterial:ywMaterialList) { + ywMaterial.setLoginUserInfo(loginUserInfo); + this.create(ywMaterial); + } + } catch (Exception e) { + throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),e.getMessage()); + + } + return null; + } } -- Gitblit v1.9.3