From 4a5879a5454a5b396a13ab0b3c7386cdc0779ea7 Mon Sep 17 00:00:00 2001
From: baizonghao <1719256278@qq.com>
Date: 星期一, 17 四月 2023 13:54:39 +0800
Subject: [PATCH] 一系列修改，主要包括添加，警方通告
---
src/main/java/com/example/jz/service/impl/CauseServiceImpl.java | 118 ++++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 88 insertions(+), 30 deletions(-)
diff --git a/src/main/java/com/example/jz/service/impl/CauseServiceImpl.java b/src/main/java/com/example/jz/service/impl/CauseServiceImpl.java
index 63ecf0f..2a0731c 100644
--- a/src/main/java/com/example/jz/service/impl/CauseServiceImpl.java
+++ b/src/main/java/com/example/jz/service/impl/CauseServiceImpl.java
@@ -6,6 +6,8 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.example.jz.dao.*;
import com.example.jz.enums.CauseEnums;
@@ -18,10 +20,12 @@
import com.example.jz.modle.entity.*;
import com.example.jz.modle.vo.CauseReportVo;
import com.example.jz.modle.vo.CauseVo;
+import com.example.jz.modle.vo.NewCauseVo;
import com.example.jz.modle.vo.UserVo;
import com.example.jz.service.CauseService;
import com.example.jz.service.ReportService;
import com.example.jz.service.UserService;
+import com.example.jz.utils.IdUtils;
import lombok.SneakyThrows;
import org.springframework.beans.BeanUtils;
import org.springframework.security.core.context.SecurityContextHolder;
@@ -31,6 +35,8 @@
import javax.annotation.Resource;
import java.util.*;
+import java.util.function.Function;
+import java.util.function.Predicate;
import java.util.stream.Collectors;
/**
@@ -58,7 +64,8 @@
UserService userService;
@Resource
ReportService reportService;
-
+ @Resource
+ MessageDao messageDao;
@Resource
AnnouncementDao announcementDao;
@@ -115,7 +122,7 @@
}
@Override
- public PageParam<CauseVo> getCauserListByCondition(String cause, Integer status, Integer size, Integer current,Integer id) {
+ public PageParam<CauseVo> getCauserListByCondition(String cause, Integer status, Integer size, Integer current, Integer id) {
QueryWrapper<Cause> causeQueryWrapper = new QueryWrapper<>();
if (StringUtils.isNotBlank(cause)) {
causeQueryWrapper.and(a -> a.like(StringUtils.isNotBlank(cause), "number", cause)
@@ -125,7 +132,7 @@
if (status != null) {
causeQueryWrapper.eq("status", status);
}
- causeQueryWrapper.eq("user_id",id);
+ causeQueryWrapper.eq("user_id", id);
causeQueryWrapper.orderByDesc("ctime");
PageParam<Cause> causePageParam = new PageParam<>();
if (size != null) {
@@ -151,6 +158,41 @@
}
@Override
+ public List<NewCauseVo> getVxCauseList(String phone) {
+
+ User user = userDao.selectOne(new LambdaQueryWrapper<User>().eq(User::getUserMobile, phone));
+
+ List<Report> reports = reportDao.selectList(new LambdaQueryWrapper<Report>().eq(Report::getUserId, user.getId()));
+
+ List<Integer> list = reports.stream()
+ .map(item -> item.getCauseId())
+ .filter(integer -> integer != null)
+ .distinct()
+ .collect(Collectors.toList());
+ List<NewCauseVo> res;
+ if (!Objects.isNull(list) && list.size()!= 0){
+ List<Cause> causes = causeDao.selectList(new LambdaQueryWrapper<Cause>().notIn(Cause::getId, list));
+ res = causes.stream()
+ .map(item -> {
+ NewCauseVo newCauseVo = new NewCauseVo();
+ newCauseVo.setName(item.getName());
+ newCauseVo.setId(item.getId());
+ return newCauseVo;
+ }).collect(Collectors.toList());
+ }else {
+ List<Cause> causes = causeDao.selectList(null);
+ res = causes.stream()
+ .map(item -> {
+ NewCauseVo newCauseVo = new NewCauseVo();
+ newCauseVo.setName(item.getName());
+ newCauseVo.setId(item.getId());
+ return newCauseVo;
+ }).collect(Collectors.toList());
+ }
+ return res;
+ }
+
+ @Override
public List<UserVo> getManagerList() {
return userDao.selectList(new QueryWrapper<User>().eq("role", 1)).stream().map(a -> {
UserVo userVo = new UserVo();
@@ -165,6 +207,10 @@
Cause cause = new Cause();
BeanUtils.copyProperties(causeDto, cause);
cause.setId(id);
+ groupDao.update(null, Wrappers.lambdaUpdate(Group.class)
+ .set(Group::getGroupName, causeDto.getName())
+ .set(Group::getUserId, causeDto.getUserId())
+ .eq(Group::getCauseId, id));
return causeDao.updateById(cause);
}
@@ -172,25 +218,26 @@
public PageParam<CauseReportVo> getReporterList(Integer causeId) {
PageParam<Report> PageParam = new PageParam<>();
PageParam<Report> reportPageParam = reportDao.selectPage(PageParam, new QueryWrapper<Report>().eq("cause_id", causeId).orderByDesc("ctime"));
- List<CauseReportVo> causeReportVos = reportPageParam.getRecords().stream()
- .map(
- a -> {
- CauseReportVo causeReportVo = new CauseReportVo();
- User user = userDao.selectOne(new QueryWrapper<User>().eq("id", a.getUserId()));
- BeanUtils.copyProperties(a, causeReportVo);
- causeReportVo.setMobile(user.getUserMobile());
- causeReportVo.setIdcard(user.getUserIdcard().replaceAll("(?<=[\\d]{3})\\d(?=[\\d]{4})", "*"));
- causeReportVo.setReporterName(user.getRealName());
- if (causeReportVo.getIsInGroup()==1) {
- causeReportVo.setGroupId(groupDao.selectOne(new QueryWrapper<Group>().eq("cause_id",causeId)).getId());
- }
- return causeReportVo;
- }
- ).collect(Collectors.toList());
-
PageParam<CauseReportVo> causeReportVoPageParam = new PageParam<>();
BeanUtils.copyProperties(reportPageParam, causeReportVoPageParam);
- causeReportVoPageParam.setRecords(causeReportVos);
+ if (!reportPageParam.getRecords().isEmpty()) {
+ List<CauseReportVo> causeReportVos = reportPageParam.getRecords().stream()
+ .map(
+ a -> {
+ CauseReportVo causeReportVo = new CauseReportVo();
+ User user = userDao.selectOne(new QueryWrapper<User>().eq("id", a.getUserId()));
+ BeanUtils.copyProperties(a, causeReportVo);
+ causeReportVo.setMobile(user.getUserMobile());
+ causeReportVo.setIdcard(user.getUserIdcard().replaceAll("(?<=[\\d]{3})\\d(?=[\\d]{4})", "*"));
+ causeReportVo.setReporterName(user.getRealName());
+ if (causeReportVo.getIsInGroup() == 1) {
+ causeReportVo.setGroupId(groupDao.selectOne(new QueryWrapper<Group>().eq("cause_id", causeId)).getId());
+ }
+ return causeReportVo;
+ }
+ ).collect(Collectors.toList());
+ causeReportVoPageParam.setRecords(causeReportVos);
+ }
return causeReportVoPageParam;
}
@@ -201,7 +248,16 @@
@Override
public void deleteCause(Integer id) {
+ List<Report> reports = reportDao.selectList(new LambdaQueryWrapper<Report>().eq(Report::getCauseId, id));
+ for (Report report : reports) {
+ reportDao.deleteById(report.getId());
+ }
causeDao.deleteById(id);
+ Group group = groupDao.selectOne(new LambdaQueryWrapper<Group>().eq(Group::getCauseId, id));
+ if (group != null) {
+ messageDao.delete(new LambdaQueryWrapper<Message>().eq(Message::getGroupId, group.getId()));
+ groupUserDao.delete(new LambdaQueryWrapper<GroupUser>().eq(GroupUser::getGroupId, group.getId()));
+ }
groupDao.delete(new QueryWrapper<Group>().eq("cause_id", id));
}
@@ -229,6 +285,7 @@
a -> {
Cause cause = new Cause();
BeanUtils.copyProperties(a, cause);
+ cause.setNumber(IdUtils.getAduitId());
if (StringUtils.isBlank(a.getStatus())) {
throw new BusinessException("鐘舵�佷笉鑳戒负绌�");
}
@@ -278,27 +335,28 @@
}
Group group = groupDao.selectOne(new QueryWrapper<Group>().eq("cause_id", addReportDto.getCauseId()));
// 娣诲姞浜哄憳杩涚兢缁�
- // groupUserDao.insert(new GroupUser().setGroupId(group.getId()).setUserId(user.getId()).setCtime(new Date()).setBanSpeech(0));
+ // groupUserDao.insert(new GroupUser().setGroupId(group.getId()).setUserId(user.getId()).setCtime(new Date()).setBanSpeech(0));
// 娣诲姞鎶ユ淇℃伅
Report report = new Report();
BeanUtils.copyProperties(addReportDto, report);
report
.setIsInGroup(1)
- .setCreator(userDao.selectOne(new QueryWrapper<User>().eq("login_username", SecurityContextHolder.getContext().getAuthentication().getPrincipal())).getId())
+ .setCreator(userDao.selectOne(new QueryWrapper<User>().eq("login_username", SecurityContextHolder.getContext().getAuthentication().getPrincipal())).getId())
.setUserId(user.getId())
.setCtime(new Date())
- .setStatus(0)
- .setReportMethod("鍚庡彴褰曞叆")
- .setIsCommission("0").setReportTime(new Date())
+ .setStatus(1)
+ .setReportMethod("鐜板満鎶ユ")
+ .setIsCommission("0")
+ .setReportTime(new Date())
.setCauseId(addReportDto.getCauseId());
reportService.save(report);
- return groupUserDao.insert(new GroupUser().setGroupId(group.getId()).setUserId(report.getId()).setCtime(new Date()).setBanSpeech(0))> 0;
+ return groupUserDao.insert(new GroupUser().setGroupId(group.getId()).setUserId(report.getId()).setCtime(new Date()).setBanSpeech(0)) > 0;
}
@Override
public List<Map<String, String>> getCauseIdAndName() {
ArrayList<Map<String, String>> maps = new ArrayList<>();
- causeDao.selectList(null).stream().forEach(a -> {
+ causeDao.selectList(new QueryWrapper<Cause>().eq("status", 0).or().eq("status", 2)).stream().forEach(a -> {
Map<String, String> map = new HashMap<>();
map.put("id", a.getId().toString());
map.put("name", a.getName());
@@ -309,13 +367,13 @@
@Override
@SneakyThrows
- public void loadFileReport(MultipartFile multipartFile,Integer causeId) {
+ public void loadFileReport(MultipartFile multipartFile, Integer causeId) {
EasyExcel.read(multipartFile.getInputStream(), AddReportLoadDto.class, new AnalysisEventListener<AddReportLoadDto>() {
@Override
public void invoke(AddReportLoadDto data, AnalysisContext context) {
- if (StringUtils.isNotBlank(data.getReporterName())&&StringUtils.isNotBlank(data.getIdcard())){
+ if (StringUtils.isNotBlank(data.getReporterName()) && StringUtils.isNotBlank(data.getIdcard())) {
AddReportDto addReportDto = new AddReportDto();
- BeanUtils.copyProperties(data,addReportDto);
+ BeanUtils.copyProperties(data, addReportDto);
addReportDto.setCauseId(causeId);
addReportPeople(addReportDto);
}
--
Gitblit v1.8.0