From 3cd5c749ca237103a5014e902ce21b7148b9b6e3 Mon Sep 17 00:00:00 2001
From: Jinquan_Ou <Jinquan@gdut.com>
Date: 星期六, 08 四月 2023 12:46:39 +0800
Subject: [PATCH] aaa
---
zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java | 90 +++++++++++++++++++++++++++++++++++----------
1 files changed, 70 insertions(+), 20 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 c39ef1d..bcd6416 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
@@ -8,7 +8,9 @@
import com.ruoyi.common.utils.MapUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ZInfoUser;
+import com.ruoyi.domain.ZfProperty;
import com.ruoyi.domain.ZfEvent;
import com.ruoyi.domain.ZfProperty;
import com.ruoyi.mapper.ZfPropertyMapper;
@@ -16,6 +18,7 @@
import com.ruoyi.service.ZInfoUserService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import java.text.ParseException;
@@ -25,6 +28,7 @@
import java.util.Date;
import java.util.HashMap;
import java.util.List;
+import java.util.function.Consumer;
import java.util.stream.Collectors;
@@ -40,60 +44,106 @@
@Resource
ZInfoUserService zInfoUserService;
+ @Resource
+ IZfPropertyService zfPropertyService;
+
@Override
public List<ZfProperty> selectByCondition(ZfProperty zfProperty) {
String familyIds = listFamilyIds();
- LambdaQueryWrapper<ZfProperty> lambdaQueryWrapper = buildCondition(zfProperty,familyIds);
+ LambdaQueryWrapper<ZfProperty> lambdaQueryWrapper = buildCondition(zfProperty, familyIds);
List<ZfProperty> list = list(lambdaQueryWrapper);
- log.info("杩斿洖鐨勬暟鎹负:{}",list);
+ log.info("杩斿洖鐨勬暟鎹负:{}", list);
return list;
}
private LambdaQueryWrapper<ZfProperty> buildCondition(ZfProperty zfProperty) {
LambdaQueryWrapper<ZfProperty> lqw = new LambdaQueryWrapper<>();
- lqw.like(!StringUtils.isEmpty(zfProperty.getType()),ZfProperty::getType, zfProperty.getType());
- lqw.like(!StringUtils.isEmpty(zfProperty.getTitle()),ZfProperty::getTitle, zfProperty.getTitle());
- lqw.like(!StringUtils.isEmpty(zfProperty.getLocation()),ZfProperty::getLocation, zfProperty.getLocation());
- lqw.like(!StringUtils.isEmpty(zfProperty.getHolder()),ZfProperty::getHolder, zfProperty.getHolder());
- lqw.like(!StringUtils.isEmpty(zfProperty.getAddress()),ZfProperty::getAddress, zfProperty.getAddress());
- lqw.like(!StringUtils.isEmpty(zfProperty.getRemark()),ZfProperty::getRemark, zfProperty.getRemark());
- lqw.like(zfProperty.getCreateTime()!=null,ZfProperty::getCreateTime, zfProperty.getCreateTime());
+
+ lqw.like(!StringUtils.isEmpty(zfProperty.getType()), ZfProperty::getType, zfProperty.getType())
+ .like(!StringUtils.isEmpty(zfProperty.getTitle()), ZfProperty::getTitle, zfProperty.getTitle())
+ .like(!StringUtils.isEmpty(zfProperty.getLocation()), ZfProperty::getLocation, zfProperty.getLocation())
+ .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());
return lqw;
}
- private LambdaQueryWrapper<ZfProperty> buildCondition(ZfProperty zfProperty,String familyIds) {
+ private LambdaQueryWrapper<ZfProperty> buildCondition(ZfProperty zfProperty, String familyIds) {
LambdaQueryWrapper<ZfProperty> lqw = buildCondition(zfProperty);
if (familyIds.contains(",")) {
String[] familyList = familyIds.split(",");
- for (String familyId : familyList) {
- lqw.or().eq(ZfProperty::getFamilyId,familyId);
- }
- }else {
- lqw.eq(ZfProperty::getFamilyId,familyIds);
+ lqw.in(ZfProperty::getFamilyId,familyList);
+ } else {
+ lqw.eq(ZfProperty::getFamilyId, familyIds);
}
return lqw;
}
- private String listFamilyIds(){
+ private String listFamilyIds() {
SysUser user = SecurityUtils.getLoginUser().getUser();
Long userId = user.getUserId();
LambdaQueryWrapper<ZInfoUser> zInfoUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
- zInfoUserLambdaQueryWrapper.eq(ZInfoUser::getUserId,userId);
+ zInfoUserLambdaQueryWrapper.eq(ZInfoUser::getUserId, userId);
ZInfoUser zInfoUser = zInfoUserService.getOne(zInfoUserLambdaQueryWrapper);
return zInfoUser.getFamilyId();
}
@Override
- public AjaxResult selectPropertyList(ZfProperty zfProperty,Integer pageNum,Integer pageSize) {
+ public AjaxResult selectPropertyList(ZfProperty zfProperty, Integer pageNum, Integer pageSize) {
String familyIds = listFamilyIds();
- LambdaQueryWrapper<ZfProperty> lqw = buildCondition(zfProperty,familyIds);
- Page<ZfProperty> zfPropertyPage = new Page<>(pageNum,pageSize);
+ LambdaQueryWrapper<ZfProperty> lqw = buildCondition(zfProperty, familyIds);
+ Page<ZfProperty> zfPropertyPage = new Page<>(pageNum, pageSize);
Page<ZfProperty> pageResult = page(zfPropertyPage, lqw);
HashMap<String, Object> data = MapUtils.getResult(pageResult);
return AjaxResult.success(data);
}
+ @Override
+ public int addProperty(ZfProperty zfProperty) {
+
+ String familyIds = listFamilyIds();
+ boolean flag = false;//鍒ゆ柇褰撳墠鐢ㄦ埛鐨刬d鏄惁鏈夋潈鍔犲叆褰撳墠瀹跺涵id鐨勫璞�
+ if (familyIds.contains(",")) {
+ String[] familyList = familyIds.split(",");
+ for (String familyId : familyList) {
+ if (familyId.equals(zfProperty.getFamilyId())) {
+ flag = true;
+ }
+ }
+ } else {
+ if (zfProperty.getFamilyId().equals(familyIds)) {
+ flag = true;
+ }
+ }
+ if (flag) {
+ boolean save = save(zfProperty);
+ return save ? 1 : 0;
+ } else {
+ throw new RuntimeException("浣犳病鏈夋搷浣滆瀹跺涵鍙蜂负" + zfProperty.getFamilyId() + "鏁版嵁鐨勬潈闄�");
+ }
+ }
+
+ @Override
+ public AjaxResult importExcel(MultipartFile file) {
+ ExcelUtil<ZfProperty> util = new ExcelUtil<>(ZfProperty.class);
+ List<ZfProperty> propertyList = null;
+ try {
+ propertyList = util.importExcel(file.getInputStream());
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ log.info("璧勪骇鍒楄〃涓猴細{}", propertyList);
+
+ for (ZfProperty zfProperty : propertyList) {
+ zfPropertyService.addProperty(zfProperty);
+ }
+
+ return AjaxResult.success("瀵煎叆鏁版嵁鎴愬姛");
+
+ }
+
}
--
Gitblit v1.9.1