From def06893b9706ac62cd56ad9da989f688f94cb64 Mon Sep 17 00:00:00 2001
From: Jinquan_Ou <Jinquan@gdut.com>
Date: 星期四, 06 四月 2023 22:17:17 +0800
Subject: [PATCH] 8888
---
zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java | 102 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 88 insertions(+), 14 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 3628078..a6d3abf 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
@@ -4,13 +4,23 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysUser;
+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;
import com.ruoyi.service.IZfPropertyService;
+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;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
@@ -30,9 +40,16 @@
@Service
public class IZfPropertyServiceImpl extends ServiceImpl<ZfPropertyMapper, ZfProperty> implements IZfPropertyService {
+ @Resource
+ ZInfoUserService zInfoUserService;
+
+ @Resource
+ IZfPropertyService zfPropertyService;
+
@Override
public List<ZfProperty> selectByCondition(ZfProperty zfProperty) {
- LambdaQueryWrapper<ZfProperty> lambdaQueryWrapper = buildCondition(zfProperty);
+ String familyIds = listFamilyIds();
+ LambdaQueryWrapper<ZfProperty> lambdaQueryWrapper = buildCondition(zfProperty,familyIds);
List<ZfProperty> list = list(lambdaQueryWrapper);
log.info("杩斿洖鐨勬暟鎹负:{}",list);
return list;
@@ -50,26 +67,83 @@
return lqw;
}
- @Override
- public AjaxResult selectUserList(ZfProperty zfProperty,Integer pageNum,Integer pageSize) {
-
+ 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);
+ }
+ return lqw;
+ }
+ private String listFamilyIds(){
+ SysUser user = SecurityUtils.getLoginUser().getUser();
+ Long userId = user.getUserId();
+ LambdaQueryWrapper<ZInfoUser> zInfoUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ zInfoUserLambdaQueryWrapper.eq(ZInfoUser::getUserId,userId);
+ ZInfoUser zInfoUser = zInfoUserService.getOne(zInfoUserLambdaQueryWrapper);
+ return zInfoUser.getFamilyId();
+ }
+
+ @Override
+ 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);
Page<ZfProperty> pageResult = page(zfPropertyPage, lqw);
-
-
- HashMap<String, Object> data = new HashMap<>();
-
- data.put("data",pageResult.getRecords());
- data.put("total",pageResult.getTotal());
- data.put("pageNum",pageResult.getCurrent());
- data.put("pageSize",pageResult.getSize());
-
-
+ 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