From f227e6ac3439116a0f8cc185bce053e19bd65307 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期三, 28 十二月 2022 11:50:16 +0800
Subject: [PATCH] fix: 优化code
---
src/main/java/com/example/jz/service/impl/CauseServiceImpl.java | 175 +++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 147 insertions(+), 28 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 5be530f..c59dd88 100644
--- a/src/main/java/com/example/jz/service/impl/CauseServiceImpl.java
+++ b/src/main/java/com/example/jz/service/impl/CauseServiceImpl.java
@@ -9,8 +9,10 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.example.jz.dao.*;
import com.example.jz.enums.CauseEnums;
+import com.example.jz.exception.BusinessException;
import com.example.jz.modle.PageParam;
import com.example.jz.modle.dto.AddReportDto;
+import com.example.jz.modle.dto.AddReportLoadDto;
import com.example.jz.modle.dto.CauseDto;
import com.example.jz.modle.dto.CauseLoadDto;
import com.example.jz.modle.entity.*;
@@ -18,16 +20,17 @@
import com.example.jz.modle.vo.CauseVo;
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 lombok.SneakyThrows;
import org.springframework.beans.BeanUtils;
+import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -51,7 +54,12 @@
GroupDao groupDao;
@Resource
GroupUserDao groupUserDao;
-
+ @Resource
+ UserService userService;
+ @Resource
+ ReportService reportService;
+ @Resource
+ MessageDao messageDao;
@Resource
AnnouncementDao announcementDao;
@@ -108,6 +116,42 @@
}
@Override
+ 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)
+ .or(StringUtils.isNotBlank(cause))
+ .like(StringUtils.isNotBlank(cause), "name", cause));
+ }
+ if (status != null) {
+ causeQueryWrapper.eq("status", status);
+ }
+ causeQueryWrapper.eq("user_id", id);
+ causeQueryWrapper.orderByDesc("ctime");
+ PageParam<Cause> causePageParam = new PageParam<>();
+ if (size != null) {
+ causePageParam.setSize(size);
+ }
+ if (current != null) {
+ causePageParam.setCurrent(current);
+ }
+ PageParam<Cause> causePage = causeDao.selectPage(causePageParam, causeQueryWrapper);
+ List<CauseVo> causeVos = causePage.getRecords().stream().map(
+ a -> {
+ CauseVo causeVo = new CauseVo();
+ BeanUtils.copyProperties(a, causeVo);
+ causeVo.setUserName(userDao.selectOne(new QueryWrapper<User>().eq("id", a.getUserId())).getRealName());
+ causeVo.setReportNumber(reportDao.selectCount(new QueryWrapper<Report>().eq("cause_id", a.getId())));
+ causeVo.setGroupId(groupDao.selectOne(new QueryWrapper<Group>().eq("cause_id", a.getId())).getId());
+ return causeVo;
+ }).collect(Collectors.toList());
+ PageParam<CauseVo> causeVoPageParam = new PageParam<>();
+ BeanUtils.copyProperties(causePage, causeVoPageParam);
+ causeVoPageParam.setRecords(causeVos);
+ return causeVoPageParam;
+ }
+
+ @Override
public List<UserVo> getManagerList() {
return userDao.selectList(new QueryWrapper<User>().eq("role", 1)).stream().map(a -> {
UserVo userVo = new UserVo();
@@ -126,20 +170,30 @@
}
@Override
- public List<CauseReportVo> getReporterList(Integer causeId) {
- return reportDao.selectList(new QueryWrapper<Report>().eq("cause_id", causeId)).stream()
- .map(
- a -> {
- CauseReportVo causeReportVo = new CauseReportVo();
- User user = userDao.selectOne(new QueryWrapper<User>().eq("id", a.getUserId()));
- BeanUtils.copyProperties(a, causeReportVo);
- causeReportVo.setUserIdcard(user.getUserIdcard());
- causeReportVo.setUserMobile(user.getUserMobile());
- causeReportVo.setUserIdcard(causeReportVo.getUserIdcard().replaceAll("(?<=[\\d]{3})\\d(?=[\\d]{4})", "*"));
- causeReportVo.setUserName(user.getRealName());
- return causeReportVo;
- }
- ).collect(Collectors.toList());
+ 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"));
+ PageParam<CauseReportVo> causeReportVoPageParam = new PageParam<>();
+ BeanUtils.copyProperties(reportPageParam, causeReportVoPageParam);
+ 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;
}
@Override
@@ -150,16 +204,25 @@
@Override
public void deleteCause(Integer id) {
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));
}
@Override
@SneakyThrows
+ @Transactional(rollbackFor = BusinessException.class)
public void loadFile(MultipartFile multipartFile) {
ArrayList<CauseLoadDto> causeLoadDtos = new ArrayList<>();
- EasyExcel.read(multipartFile.getInputStream(),CauseLoadDto.class, new AnalysisEventListener<CauseLoadDto>() {
+ EasyExcel.read(multipartFile.getInputStream(), CauseLoadDto.class, new AnalysisEventListener<CauseLoadDto>() {
@Override
public void invoke(CauseLoadDto data, AnalysisContext context) {
- causeLoadDtos.add(data);
+ if (StringUtils.isNotBlank(data.getName()) && StringUtils.isNotBlank(data.getUserName())) {
+ causeLoadDtos.add(data);
+ }
}
@Override
@@ -173,6 +236,9 @@
a -> {
Cause cause = new Cause();
BeanUtils.copyProperties(a, cause);
+ if (StringUtils.isBlank(a.getStatus())) {
+ throw new BusinessException("鐘舵�佷笉鑳戒负绌�");
+ }
if (a.getStatus().equals(CauseEnums.UNCHECKED.getMsg())) {
cause.setStatus(CauseEnums.UNCHECKED.value());
}
@@ -189,8 +255,21 @@
cause.setStatus(CauseEnums.HASBEENDROPPED.value());
}
cause.setCtime(new Date());
- cause.setUserId(userDao.selectOne(new QueryWrapper<User>().eq("real_name", a.getUserName())).getId());
- causeDao.insert(cause);
+ if (StringUtils.isBlank(a.getUserName())) {
+ throw new BusinessException("璐熻矗浜轰笉鍏佽涓虹┖");
+ }
+ if (userDao.selectOne(new QueryWrapper<User>().eq("real_name", a.getUserName())) == null) {
+ throw new BusinessException("璐熻矗浜轰笉瀛樺湪");
+ }
+ Integer id = userDao.selectOne(new QueryWrapper<User>().eq("real_name", a.getUserName())).getId();
+ cause.setUserId(id);
+ causeService.save(cause);
+ Group group = new Group();
+ group.setCtime(new Date());
+ group.setUserId(id);
+ group.setGroupName(a.getName());
+ group.setCauseId(cause.getId());
+ groupDao.insert(group);
});
}
@@ -202,20 +281,60 @@
// 濡傛灉鐢ㄦ埛涓嶅瓨鍦� 鍒欐坊鍔犵敤鎴�
user = new User().setUserIdcard(addReportDto.getIdcard()).setUserMobile(addReportDto.getMobile()).setRealName(addReportDto.getReporterName())
.setModifyTime(new Date()).setUserRegtime(new Date()).setPic(addReportDto.getPic());
- userDao.insert(user);
+ userService.save(user);
}
+ Group group = groupDao.selectOne(new QueryWrapper<Group>().eq("cause_id", addReportDto.getCauseId()));
// 娣诲姞浜哄憳杩涚兢缁�
- groupUserDao.insert(new GroupUser().setGroupId(addReportDto.getGroupId()).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())
.setUserId(user.getId())
.setCtime(new Date())
- .setStatus(0)
- .setReportMethod("鐜板満褰曞叆")
+ .setStatus(1)
+ .setReportMethod("鍚庡彴褰曞叆")
.setIsCommission("0").setReportTime(new Date())
- .setCauseId(groupDao.selectOne(new QueryWrapper<Group>().eq("id", addReportDto.getGroupId())).getCauseId());
- return reportDao.insert(report) > 0;
+ .setCauseId(addReportDto.getCauseId());
+ reportService.save(report);
+ 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 -> {
+ Map<String, String> map = new HashMap<>();
+ map.put("id", a.getId().toString());
+ map.put("name", a.getName());
+ maps.add(map);
+ });
+ return maps;
+ }
+
+ @Override
+ @SneakyThrows
+ 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())) {
+ AddReportDto addReportDto = new AddReportDto();
+ BeanUtils.copyProperties(data, addReportDto);
+ addReportDto.setCauseId(causeId);
+ addReportPeople(addReportDto);
+ }
+
+ }
+
+ @Override
+ public void doAfterAllAnalysed(AnalysisContext context) {
+
+ }
+ })
+ .autoCloseStream(true)
+ .doReadAll();
}
}
\ No newline at end of file
--
Gitblit v1.8.0