From 1fb2cfb2bcb152bee03f8a332700241693cfd9b6 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期二, 16 八月 2022 13:37:00 +0800
Subject: [PATCH] bug处理
---
src/main/java/com/example/jz/service/impl/CauseServiceImpl.java | 166 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 142 insertions(+), 24 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 bcc2ce5..ac5649a 100644
--- a/src/main/java/com/example/jz/service/impl/CauseServiceImpl.java
+++ b/src/main/java/com/example/jz/service/impl/CauseServiceImpl.java
@@ -1,30 +1,40 @@
package com.example.jz.service.impl;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
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.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.*;
-import com.example.jz.modle.vo.AnnouncementVo;
import com.example.jz.modle.vo.CauseReportVo;
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.Date;
-import java.util.List;
+import java.util.*;
import java.util.stream.Collectors;
/**
- * 锟斤拷锟斤拷锟斤拷(Cause)锟斤拷锟斤拷锟绞碉拷锟斤拷锟�
+ * 妗堜欢琛�(Cause)琛ㄦ湇鍔″疄鐜扮被
*
* @author makejava
* @since 2022-07-13 11:52:58
@@ -44,6 +54,10 @@
GroupDao groupDao;
@Resource
GroupUserDao groupUserDao;
+ @Resource
+ UserService userService;
+ @Resource
+ ReportService reportService;
@Resource
AnnouncementDao announcementDao;
@@ -56,7 +70,7 @@
BeanUtils.copyProperties(causeDto, cause);
cause.setCtime(new Date());
causeService.save(cause);
- //锟斤拷锟斤拷群锟斤拷
+ //鍒涘缓缇ょ粍
Group group = new Group();
group.setCtime(new Date());
group.setGroupName(causeDto.getName());
@@ -119,37 +133,101 @@
}
@Override
- public List<CauseReportVo> getReporterList(Integer causeId) {
- return reportDao.selectList(new QueryWrapper<Report>().eq("cause_id", causeId)).stream()
+ 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.setUserIdcard(user.getUserIdcard());
- causeReportVo.setUserMobile(user.getUserMobile());
- causeReportVo.setUserIdcard(causeReportVo.getUserIdcard().replaceAll("(?<=[\\d]{3})\\d(?=[\\d]{4})", "*"));
- causeReportVo.setUserName(user.getRealName());
+ 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);
+ return causeReportVoPageParam;
}
@Override
- public List<AnnouncementVo> getGroupAnnouncement(Integer groupId) {
- return announcementDao.selectList(new QueryWrapper<Announcement>().eq("group_id", groupId)).stream()
- .map(
- a -> {
- AnnouncementVo announcementVo = new AnnouncementVo();
- BeanUtils.copyProperties(a, announcementVo);
- return announcementVo;
- }
- ).collect(Collectors.toList());
+ public List<Announcement> getGroupAnnouncement(Integer groupId) {
+ return announcementDao.selectList(new QueryWrapper<Announcement>().eq("group_id", groupId));
}
@Override
public void deleteCause(Integer id) {
causeDao.deleteById(id);
+ 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>() {
+ @Override
+ public void invoke(CauseLoadDto data, AnalysisContext context) {
+ if (StringUtils.isNotBlank(data.getName()) && StringUtils.isNotBlank(data.getUserName())) {
+ causeLoadDtos.add(data);
+ }
+ }
+
+ @Override
+ public void doAfterAllAnalysed(AnalysisContext analysisContext) {
+
+ }
+ })
+ .autoCloseStream(true)
+ .doReadAll();
+ causeLoadDtos.forEach(
+ 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());
+ }
+ if (a.getStatus().equals(CauseEnums.NOTTOPUTONRECORD.getMsg())) {
+ cause.setStatus(CauseEnums.NOTTOPUTONRECORD.value());
+ }
+ if (a.getStatus().equals(CauseEnums.UNDERCONSIDERATION.getMsg())) {
+ cause.setStatus(CauseEnums.UNDERCONSIDERATION.value());
+ }
+ if (a.getStatus().equals(CauseEnums.CASECLOSED.getMsg())) {
+ cause.setStatus(CauseEnums.CASECLOSED.value());
+ }
+ if (a.getStatus().equals(CauseEnums.HASBEENDROPPED.getMsg())) {
+ cause.setStatus(CauseEnums.HASBEENDROPPED.value());
+ }
+ cause.setCtime(new Date());
+ 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);
+ });
}
@Override
@@ -160,20 +238,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("鐜板満褰曞叆")
.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