From 2322a5e61aef24a39e948c66e1fc554c8fcac570 Mon Sep 17 00:00:00 2001 From: whywhyo <1511349576@qq.com> Date: 星期二, 11 七月 2023 23:55:00 +0800 Subject: [PATCH] 123456 --- zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java | 150 ++++++++++++++++++++++++++++++++++++------------- 1 files changed, 109 insertions(+), 41 deletions(-) diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java index 92428e1..a684a63 100644 --- a/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java +++ b/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java @@ -11,19 +11,22 @@ import com.ruoyi.common.utils.bean.BeanUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.domain.ZInfoUser; +import com.ruoyi.domain.ZfEquipment; +import com.ruoyi.domain.ZfEvent; import com.ruoyi.domain.ZfProperty; -import com.ruoyi.domain.dto.ZfPropertyDto; import com.ruoyi.mapper.ZfPropertyMapper; import com.ruoyi.service.IZfPropertyService; import com.ruoyi.service.ZInfoUserService; import com.ruoyi.util.ArraysUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; -import java.util.HashMap; -import java.util.List; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.*; import java.util.stream.Collectors; import static com.ruoyi.constant.MenuAuthority.PROPERTY_LIST; @@ -39,20 +42,11 @@ public class IZfPropertyServiceImpl extends ServiceImpl<ZfPropertyMapper, ZfProperty> implements IZfPropertyService { @Resource - ZInfoUserService zInfoUserService; - - @Resource IZfPropertyService zfPropertyService; - @Override - public List<ZfProperty> selectByCondition(ZfProperty zfProperty) { - String familyIds = listFamilyIds(); - String secondFamilyIds = listSecondFamilyIds(); - LambdaQueryWrapper<ZfProperty> lambdaQueryWrapper = buildCondition(zfProperty, familyIds, secondFamilyIds); - List<ZfProperty> list = list(lambdaQueryWrapper); - log.info("杩斿洖鐨勬暟鎹负:{}", list); - return list; - } + @Resource + ZInfoUserService zInfoUserService; + private LambdaQueryWrapper<ZfProperty> buildCondition(ZfProperty zfProperty) { LambdaQueryWrapper<ZfProperty> lqw = new LambdaQueryWrapper<>(); @@ -63,7 +57,8 @@ .like(!StringUtils.isEmpty(zfProperty.getHolder()), ZfProperty::getHolder, zfProperty.getHolder()) .like(!StringUtils.isEmpty(zfProperty.getAddress()), ZfProperty::getAddress, zfProperty.getAddress()) .like(!StringUtils.isEmpty(zfProperty.getRemark()), ZfProperty::getRemark, zfProperty.getRemark()) - .like(zfProperty.getCreateTime() != null, ZfProperty::getCreateTime, zfProperty.getCreateTime()); + .eq(zfProperty.getHappenTime()!=null,ZfProperty::getHappenTime,zfProperty.getHappenTime()) + .between(zfProperty.getHappenStartTime() != null && zfProperty.getHappenEndTime() != null, ZfProperty::getHappenTime, zfProperty.getHappenStartTime(), zfProperty.getHappenEndTime()); return lqw; } @@ -92,7 +87,7 @@ secondFamilyIdsBuffer.deleteCharAt(secondFamilyIdsBuffer.length() - 1); } - }else{ + } else { setSecondFamilyAuthority(secondFamilyIdsBuffer, secondFamilyAuthority); //鎶婂悗闈㈢殑閫楀彿鍘绘帀 if (secondFamilyIdsBuffer.length() > 1) { @@ -146,7 +141,7 @@ } - lqw.orderByDesc(ZfProperty::getId); + lqw.orderByDesc(ZfProperty::getCreateTime); return lqw; } @@ -189,6 +184,34 @@ } @Override + public List<ZfProperty> selectByCondition(ZfProperty zfProperty) { + String familyIds = listFamilyIds(); + String secondFamilyIds = listSecondFamilyIds(); + LambdaQueryWrapper<ZfProperty> lambdaQueryWrapper = buildCondition(zfProperty, familyIds, secondFamilyIds); + List<ZfProperty> beanRecords = list(lambdaQueryWrapper); + log.info("浠庢暟鎹簱涓煡鍒扮殑涓�:{}", beanRecords); + return markOwnData(familyIds, beanRecords); + } + + private static List<ZfProperty> markOwnData(String familyIds, List<ZfProperty> beanRecords) { + return beanRecords.stream().peek(record -> { + String recordFamilyId = record.getFamilyId(); + if (familyIds.contains(",")) { + String[] familyIdList = familyIds.split(","); + for (String familyId : familyIdList) { + if (familyId.equals(recordFamilyId)) { + record.setOwnData(1); + } + } + } else { + if (familyIds.equals(recordFamilyId)) { + record.setOwnData(1); + } + } + }).collect(Collectors.toList()); + } + + @Override public AjaxResult selectPropertyList(ZfProperty zfProperty, Integer pageNum, Integer pageSize) { String familyIds = listFamilyIds(); String secondFamilyAuthority = listSecondFamilyIds(); @@ -199,32 +222,24 @@ List<ZfProperty> beanRecords = pageResult.getRecords();//寰楀埌鏌ヨ鍑烘潵鐨勬暟鎹� - List<ZfPropertyDto> dtoResult = beanRecords.stream().map(record -> { - String recordFamilyId = record.getFamilyId(); - ZfPropertyDto zfPropertyDto = new ZfPropertyDto(); - BeanUtils.copyProperties(record, zfPropertyDto); - - if (familyIds.contains(",")) { - String[] familyIdList = familyIds.split(","); - for (String familyId : familyIdList) { - if (familyId.equals(recordFamilyId)) { - zfPropertyDto.setOwnData(1); - } - } - } else { - if (familyIds.equals(recordFamilyId)) { - zfPropertyDto.setOwnData(1); - } - } - return zfPropertyDto; - }).collect(Collectors.toList()); + List<ZfProperty> dtoResult = markOwnData(familyIds, beanRecords); HashMap<String, Object> data = MapUtils.getResult(pageResult, dtoResult); return AjaxResult.success(data); } @Override - public int addProperty(ZfProperty zfProperty) { + public List<ZfProperty> selectByIds(Long[] ids) { + List<ZfProperty> list = new ArrayList<>(); + if(ids.length!=0) + list = listByIds(Arrays.asList(ids)); + else + list = list(); + return list; + } + + @Override + public AjaxResult addData(ZfProperty zfProperty) { String familyIds = listFamilyIds(); boolean flag = false;//鍒ゆ柇褰撳墠鐢ㄦ埛鐨刬d鏄惁鏈夋潈鍔犲叆褰撳墠瀹跺涵id鐨勫璞� @@ -241,14 +256,67 @@ } } if (flag) { - boolean save = save(zfProperty); - return save ? 1 : 0; + if (save(zfProperty)) { + return AjaxResult.success(); + } else { + return AjaxResult.error(); + } + } else { throw new RuntimeException("浣犳病鏈夋搷浣滆瀹跺涵鍙蜂负" + zfProperty.getFamilyId() + "鏁版嵁鐨勬潈闄�"); } } @Override + public AjaxResult addData2(ZfProperty zfProperty) { + ZInfoUser mySelf = getMySelf(); + String myFamilyId = mySelf.getFamilyId(); + + if (StringUtils.isNotEmpty(zfProperty.getFamilyId())) { + throw new RuntimeException("瀵煎叆鏁版嵁鏃舵偍涓嶈兘鎸囧畾瀹跺涵鍙�"); + } + + if (StringUtils.isEmpty(myFamilyId)) { + throw new RuntimeException("鎮ㄨ繕鏈姞鍏ヤ换浣曞搴�"); + } + + if (myFamilyId.contains(",")) { + String[] myFamilyIds = myFamilyId.split(","); + //榛樿娣诲姞绗竴涓搴殑鏁版嵁 + zfProperty.setFamilyId(myFamilyIds[0]); + } else { + zfProperty.setFamilyId(myFamilyId); + } + + //鍒ゆ柇鏄惁鏈夐噸澶嶆暟鎹� + LambdaQueryWrapper<ZfProperty> lqw = uniqueCondition(zfProperty); + List<ZfProperty> list = list(lqw); + if(list.size()>0){ + throw new RuntimeException("璇峰嬁鏂板閲嶅鏁版嵁"); + } + + if (save(zfProperty)) { + return AjaxResult.success(); + } else { + return AjaxResult.error(); + } + } + + private LambdaQueryWrapper<ZfProperty> uniqueCondition(ZfProperty zfProperty) { + LambdaQueryWrapper<ZfProperty> lqw = new LambdaQueryWrapper<>(); + lqw.eq(!StringUtils.isEmpty(zfProperty.getType()), ZfProperty::getType, zfProperty.getType()) + .eq(!StringUtils.isEmpty(zfProperty.getTitle()), ZfProperty::getTitle, zfProperty.getTitle()) + .eq(!StringUtils.isEmpty(zfProperty.getLocation()), ZfProperty::getLocation, zfProperty.getLocation()) + .eq(!StringUtils.isEmpty(zfProperty.getHolder()), ZfProperty::getHolder, zfProperty.getHolder()) + .eq(!StringUtils.isEmpty(zfProperty.getAddress()), ZfProperty::getAddress, zfProperty.getAddress()) + .eq(!StringUtils.isEmpty(zfProperty.getRemark()), ZfProperty::getRemark, zfProperty.getRemark()) + .eq(zfProperty.getHappenTime()!=null,ZfProperty::getHappenTime,zfProperty.getHappenTime()); + return lqw; + + } + + @Override + @Transactional public AjaxResult importExcel(MultipartFile file) { ExcelUtil<ZfProperty> util = new ExcelUtil<>(ZfProperty.class); List<ZfProperty> propertyList = null; @@ -260,7 +328,7 @@ log.info("璧勪骇鍒楄〃涓猴細{}", propertyList); for (ZfProperty zfProperty : propertyList) { - zfPropertyService.addProperty(zfProperty); + zfPropertyService.addData2(zfProperty); } return AjaxResult.success("瀵煎叆鏁版嵁鎴愬姛"); -- Gitblit v1.9.1