From 10b083b7b32e050d670761dce9817fc7238865b1 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期五, 29 十一月 2024 14:50:07 +0800 Subject: [PATCH] git ch --- server/service/src/main/java/com/doumee/service/business/impl/InsuranceServiceImpl.java | 96 +++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 82 insertions(+), 14 deletions(-) diff --git a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceServiceImpl.java index 2bc2611..4acc4f0 100644 --- a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceServiceImpl.java +++ b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceServiceImpl.java @@ -1,5 +1,6 @@ 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; @@ -10,6 +11,7 @@ import com.doumee.dao.business.InsuranceMapper; import com.doumee.dao.business.WorktypeMapper; import com.doumee.dao.business.model.Insurance; +import com.doumee.dao.business.model.Solutions; import com.doumee.dao.business.model.Worktype; import com.doumee.dao.system.model.SystemUser; import com.doumee.service.business.InsuranceService; @@ -25,10 +27,8 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.UUID; +import java.util.*; +import java.util.stream.Collectors; /** * 淇濋櫓鍏徃淇℃伅琛⊿ervice瀹炵幇 @@ -42,6 +42,8 @@ private InsuranceMapper insuranceMapper; @Autowired private WorktypeMapper worktypeMapper; + @Autowired + private SystemDictDataBiz systemDictDataBiz; @Override @Transactional @@ -49,6 +51,13 @@ LoginUserInfo user= (LoginUserInfo)SecurityUtils.getSubject().getPrincipal(); initCreateParam(insurance);//宸ョ鏁版嵁鏈夋晥鎬ф楠岋紝鍘婚櫎绌虹櫧琛屾暟鎹� + + if(insuranceMapper.selectCount(new QueryWrapper<Insurance>().lambda().eq(Insurance::getName,insurance.getName()) + .eq(Insurance::getIsdeleted,Constants.ZERO) + .eq(Insurance::getDataType,Constants.ZERO) + )>Constants.ZERO){ + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"淇濋櫓鍏徃鍚嶇О宸插瓨鍦�"); + } insurance.setIsdeleted(Constants.ZERO); insurance.setCreator(user.getId()); @@ -72,7 +81,22 @@ } private void dealWorkTypeData(Insurance insurance, Insurance newModel, List<Worktype> worktypeList,boolean isNew) { int num=0; + List<String> workTypeName = worktypeList.stream().map(m->m.getName()).collect(Collectors.toList()); + Set<String> set = new HashSet<>(workTypeName); + if(workTypeName.size() != set.size()){ + throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"瀵逛笉璧凤紝宸ョ褰曞叆鏁版嵁瀛樺湪鐩稿悓鏁版嵁锛�"); + } for(Worktype w : worktypeList) { + if(!isNew){ + //鏌ヨ淇濋櫓鍏徃涓嬫槸鍚﹀凡瀛樺湪璇ュ伐绉� + if(worktypeMapper.selectCount(new QueryWrapper<Worktype>().lambda().eq(Worktype::getInsuranceId,insurance.getId()) + .eq(Worktype::getIsdeleted,Constants.ZERO) + .eq(Worktype::getDataType,Constants.ZERO) + .eq(Worktype::getName,w.getName()) + )>Constants.ZERO){ + throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"褰撳墠淇濋櫓鍏徃涓嬪瓨鍦ㄣ��"+w.getName()+"銆戣宸ョ淇℃伅"); + } + } //鍩虹鐗堟湰 w.setInsuranceId(insurance.getId()); w.setIsdeleted(Constants.ZERO); @@ -84,12 +108,13 @@ w.setSortnum(num++); worktypeMapper.insert(w); + //鍘嗗彶鐗堟湰鐨勫伐绉嶄俊鎭� Worktype newType = new Worktype(); BeanUtils.copyProperties(w, newType); newType.setInsuranceId(newModel.getId()); newType.setBaseId(w.getId()); - newType.setDataType(Constants.ONE); + newType.setDataType(Constants.TWO); newType.setVersion(newModel.getVersion()); w.setSortnum(num++); worktypeMapper.insert(newType); @@ -110,6 +135,15 @@ } if(worktypeList.size()==0){ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝宸ョ涓嶈兘涓虹┖锛�"); + } + if(StringUtils.isNotBlank(insurance.getEnglishName()) && insurance.getEnglishName().length()>100){ + throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝鑻辨枃鍚嶈秴闀匡紒"); + } + if(StringUtils.isNotBlank(insurance.getLinkName()) && insurance.getLinkName().length()>10){ + throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝鑱旂郴浜哄悕绉拌秴闀匡紒"); + } + if(StringUtils.isNotBlank(insurance.getLinkPhone()) && insurance.getLinkPhone().length()!=11){ + throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇疯緭鍏ユ纭殑鎵嬫満鍙凤紒"); } insurance.setWorktypeList(worktypeList); } @@ -169,6 +203,14 @@ } //鏁版嵁鏈夋晥鎬ф牎楠� initCreateParam(insurance); + if(insuranceMapper.selectCount(new QueryWrapper<Insurance>().lambda().eq(Insurance::getName,insurance.getName()) + .eq(Insurance::getIsdeleted,Constants.ZERO) + .eq(Insurance::getDataType,Constants.ZERO) + .ne(Insurance::getId,insurance.getId()) + )>Constants.ZERO){ + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"淇濋櫓鍏徃鍚嶇О宸插瓨鍦�"); + } + LoginUserInfo user= (LoginUserInfo)SecurityUtils.getSubject().getPrincipal(); Insurance updateModel = new Insurance(); updateModel.setEditor(user.getId()); @@ -178,6 +220,13 @@ updateModel.setEditDate(new Date()); updateModel.setRemark(insurance.getRemark()); updateModel.setSortnum(insurance.getSortnum()); + updateModel.setLogo(insurance.getLogo()); + updateModel.setEnglishName(insurance.getEnglishName()); + updateModel.setLinkName(insurance.getLinkName()); + updateModel.setLinkPhone(insurance.getLinkPhone()); + updateModel.setPolicy(insurance.getPolicy()); + updateModel.setAgreement(insurance.getAgreement()); + updateModel.setClaimsInformation(insurance.getClaimsInformation()); insuranceMapper.updateById(updateModel); //濡傛灉淇敼锛屽垯浜х敓涓�涓柊鐨勫巻鍙茬増鏈� ~ @@ -186,8 +235,16 @@ newModel.setId(null); newModel.setVersion(updateModel.getVersion()); newModel.setCreateDate(new Date()); + newModel.setName(updateModel.getName()); newModel.setBaseId(insurance.getId()); newModel.setDataType(Constants.TWO); + newModel.setLogo(insurance.getLogo()); + newModel.setEnglishName(insurance.getEnglishName()); + newModel.setLinkName(insurance.getLinkName()); + newModel.setLinkPhone(insurance.getLinkPhone()); + newModel.setPolicy(insurance.getPolicy()); + newModel.setAgreement(insurance.getAgreement()); + newModel.setClaimsInformation(insurance.getClaimsInformation()); insuranceMapper.insert(newModel); //鍒犻櫎鎵�鏈夊伐绉嶆暟鎹� @@ -199,8 +256,16 @@ .lambda() .eq(Insurance::getBaseId,insurance.getId()) .eq(Insurance::getDataType,Constants.TWO) + .ne(Insurance::getId,newModel.getId()) .set(Insurance::getDataType,Constants.ONE) ); + worktypeMapper.update(null,new UpdateWrapper<Worktype>() + .lambda() + .eq(Worktype::getBaseId,insurance.getId()) + .eq(Worktype::getDataType,Constants.TWO) + .set(Worktype::getDataType,Constants.ONE) + ); + //澶勭悊宸ヤ綔淇℃伅锛屾柊澧炴渶鏂扮殑锛屽悓鏃朵骇鐢熷巻鍙茬増鏈� dealWorkTypeData(updateModel,newModel,insurance.getWorktypeList(),false); } @@ -316,16 +381,19 @@ if (pageWrap.getModel().getBaseId() != null) { queryWrapper.lambda().eq(Insurance::getBaseId, pageWrap.getModel().getBaseId()); } - /* for(PageWrap.SortData sortData: pageWrap.getSorts()) { - if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) { - queryWrapper.orderByDesc(sortData.getProperty()); - } else { - queryWrapper.orderByAsc(sortData.getProperty()); - } - - }*/ queryWrapper.lambda().orderByAsc(Insurance::getSortnum); - return PageData.from(insuranceMapper.selectPage(page, queryWrapper)); + PageData<Insurance> pageData = PageData.from(insuranceMapper.selectPage(page, queryWrapper)); + if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(pageData.getRecords())){ + String path = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode() + +systemDictDataBiz.queryByCode(Constants.OSS,Constants.INSURANCE).getCode(); + for (Insurance insurance:pageData.getRecords()) { + if (StringUtils.isNotBlank(insurance.getLogo())) { + insurance.setLogoFullUrl(path + insurance.getLogo() ); + } + } + } + + return pageData; } @Override -- Gitblit v1.9.3