From b019df4914f99aeb6b6c0ff111b1c8a4424d3331 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期三, 17 五月 2023 10:36:52 +0800
Subject: [PATCH] 调整了字段顺序与前端对应，添加了发生时间
---
zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java | 193 +++++++++++++++++++++++++++++------------------
1 files changed, 119 insertions(+), 74 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 8f27f1b..6fd2c53 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,17 +11,21 @@
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ZInfoUser;
+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.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.stream.Collectors;
@@ -39,20 +43,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 +58,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;
}
@@ -84,24 +80,7 @@
//閫楀彿闅斿紑寰楀埌濡備笅涓诧細3{2007 2018 2015}
String[] authorityList = secondFamilyAuthority.split(",");
for (String authorityAndId : authorityList) {
-
- //寰楀埌鏉冮檺涓�
- String authorities = authorityAndId.substring(2, authorityAndId.length() - 1);
-
- if (authorities.contains(" ")) {
- //绌烘牸闅斿紑寰楀埌鑿滃崟id锛岀湅鏄惁鏈夊搴旂殑鏉冮檺
- String[] authorityIdList = authorities.split(" ");
- for (String s : authorityIdList) {
- if (s.equals(PROPERTY_LIST)) {
- secondFamilyIdsBuffer.append(authorityAndId.charAt(0)).append(",");
- break;
- }
- }
- } else {
- if (authorities.equals(PROPERTY_LIST)) {
- secondFamilyIdsBuffer.append(authorityAndId.charAt(0)).append(",");
- }
- }
+ setSecondFamilyAuthority(secondFamilyIdsBuffer, authorityAndId);
}
//鎶婂悗闈㈢殑閫楀彿鍘绘帀
@@ -109,32 +88,16 @@
secondFamilyIdsBuffer.deleteCharAt(secondFamilyIdsBuffer.length() - 1);
}
- }else{
- String authorities = secondFamilyAuthority.substring(2, secondFamilyAuthority.length() - 1);
- if (authorities.contains(" ")) {
- //绌烘牸闅斿紑寰楀埌鑿滃崟id锛岀湅鏄惁鏈夊搴旂殑鏉冮檺
- String[] authorityIdList = authorities.split(" ");
- for (String s : authorityIdList) {
- if (s.equals(PROPERTY_LIST)) {
- secondFamilyIdsBuffer.append(secondFamilyAuthority.charAt(0)).append(",");
- break;
- }
- }
- } else {
- if (authorities.equals(PROPERTY_LIST)) {
- secondFamilyIdsBuffer.append(secondFamilyAuthority.charAt(0)).append(",");
- }
- }
+ } else {
+ setSecondFamilyAuthority(secondFamilyIdsBuffer, secondFamilyAuthority);
//鎶婂悗闈㈢殑閫楀彿鍘绘帀
if (secondFamilyIdsBuffer.length() > 1) {
secondFamilyIdsBuffer.deleteCharAt(secondFamilyIdsBuffer.length() - 1);
}
}
-
}
//灏哠tringBuffer杞垚String
String secondFamilyIds = secondFamilyIdsBuffer.toString();
-
//绗竴瀹跺涵鍙风殑鏉′欢
if (familyIds.contains(",")) {
@@ -179,10 +142,29 @@
}
- lqw.orderByDesc(ZfProperty::getId);
+ lqw.orderByDesc(ZfProperty::getCreateTime);
return lqw;
}
+ private void setSecondFamilyAuthority(StringBuilder secondFamilyIdsBuffer, String authorityAndId) {
+ //寰楀埌鏉冮檺涓�
+ String authorities = authorityAndId.substring(2, authorityAndId.length() - 1);
+
+ if (authorities.contains(" ")) {
+ //绌烘牸闅斿紑寰楀埌鑿滃崟id锛岀湅鏄惁鏈夊搴旂殑鏉冮檺
+ String[] authorityIdList = authorities.split(" ");
+ for (String s : authorityIdList) {
+ if (s.equals(PROPERTY_LIST)) {
+ secondFamilyIdsBuffer.append(authorityAndId.charAt(0)).append(",");
+ break;
+ }
+ }
+ } else {
+ if (authorities.equals(PROPERTY_LIST)) {
+ secondFamilyIdsBuffer.append(authorityAndId.charAt(0)).append(",");
+ }
+ }
+ }
private ZInfoUser getMySelf() {
SysUser user = SecurityUtils.getLoginUser().getUser();
@@ -203,6 +185,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();
@@ -213,32 +223,14 @@
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 AjaxResult addData(ZfProperty zfProperty) {
String familyIds = listFamilyIds();
boolean flag = false;//鍒ゆ柇褰撳墠鐢ㄦ埛鐨刬d鏄惁鏈夋潈鍔犲叆褰撳墠瀹跺涵id鐨勫璞�
@@ -255,14 +247,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;
@@ -274,7 +319,7 @@
log.info("璧勪骇鍒楄〃涓猴細{}", propertyList);
for (ZfProperty zfProperty : propertyList) {
- zfPropertyService.addProperty(zfProperty);
+ zfPropertyService.addData2(zfProperty);
}
return AjaxResult.success("瀵煎叆鏁版嵁鎴愬姛");
--
Gitblit v1.9.1