From 2918688dff476da47f17723ad136149f3bde4add Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期五, 15 七月 2022 10:27:28 +0800
Subject: [PATCH] 案件区案件录入相关接口
---
src/main/java/com/example/jz/modle/vo/CauseReportVo.java | 43 ++++++++++
src/main/java/com/example/jz/modle/R.java | 2
src/main/java/com/example/jz/modle/entity/Announcement.java | 9 ++
src/main/java/com/example/jz/modle/vo/CauseVo.java | 4 +
src/main/java/com/example/jz/controller/CauseController.java | 31 ++++++-
src/main/java/com/example/jz/modle/vo/AnnouncementVo.java | 17 ++++
src/main/java/com/example/jz/service/impl/CauseServiceImpl.java | 64 ++++++++++++---
src/main/java/com/example/jz/modle/dto/CauseDto.java | 4 +
src/main/java/com/example/jz/service/CauseService.java | 33 ++++++++
9 files changed, 187 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/example/jz/controller/CauseController.java b/src/main/java/com/example/jz/controller/CauseController.java
index 43fe51b..67f349e 100644
--- a/src/main/java/com/example/jz/controller/CauseController.java
+++ b/src/main/java/com/example/jz/controller/CauseController.java
@@ -20,7 +20,7 @@
*/
@RestController
@RequestMapping("cause")
-@Api(tags = "妗堜欢鍖�")
+@Api(tags = "妗堜欢鍖�-妗堜欢褰曞叆")
public class CauseController extends ApiController {
/**
* 鏈嶅姟瀵硅薄
@@ -32,11 +32,12 @@
@PostMapping("/addCause")
@ApiResponse(message = "鎵ц鎴愬姛", code = 200)
public R addCause(@RequestBody CauseDto causeDto) {
- return R.ok(causeService.addCause(causeDto));
+ causeService.addCause(causeDto);
+ return R.ok();
}
- @ApiOperation(httpMethod = "POST", value = "淇敼妗堜欢")
- @PostMapping("/updateCause")
+ @ApiOperation(httpMethod = "PUT", value = "淇敼妗堜欢")
+ @PutMapping("/updateCause")
@ApiResponse(message = "鎵ц鎴愬姛", code = 200)
public R updateCause(@RequestBody CauseDto causeDto,Integer id) {
return R.ok(causeService.updateCause(causeDto,id));
@@ -56,5 +57,27 @@
public R getManagerList() {
return R.ok(causeService.getManagerList());
}
+
+ @ApiOperation(httpMethod = "GET", value = "鑾峰彇鎶ユ浜哄憳")
+ @GetMapping("/getReporterList")
+ @ApiResponse(message = "鎵ц鎴愬姛", code = 200)
+ public R getReporterList(Integer causeId) {
+ return R.ok(causeService.getReporterList(causeId));
+ }
+
+ @ApiOperation(httpMethod = "GET", value = "鑾峰彇妗堜欢缇ゅ叕鍛�")
+ @GetMapping("/getGroupAnnouncement")
+ @ApiResponse(message = "鎵ц鎴愬姛", code = 200)
+ public R getGroupAnnouncement(Integer groupId) {
+ return R.ok(causeService.getGroupAnnouncement(groupId));
+ }
+
+ @ApiOperation(httpMethod = "Delete", value = "妗堜欢鍒犻櫎")
+ @DeleteMapping("/deleteCause")
+ @ApiResponse(message = "鎵ц鎴愬姛", code = 200)
+ public R deleteCause(@RequestParam(value = "id") Integer id) {
+ causeService.deleteCause(id);
+ return R.ok();
+ }
}
diff --git a/src/main/java/com/example/jz/modle/R.java b/src/main/java/com/example/jz/modle/R.java
index 5f25390..766ebbb 100644
--- a/src/main/java/com/example/jz/modle/R.java
+++ b/src/main/java/com/example/jz/modle/R.java
@@ -33,7 +33,7 @@
private T data;
public static <T> R<T> ok() {
- return restResult(null, BusinessHttpStatus.SUCCESS.value(), null);
+ return restResult(null, BusinessHttpStatus.SUCCESS.value(), "鎵ц鎴愬姛");
}
public static <T> R<T> ok(T data) {
diff --git a/src/main/java/com/example/jz/modle/dto/CauseDto.java b/src/main/java/com/example/jz/modle/dto/CauseDto.java
index 125558e..e62c1ea 100644
--- a/src/main/java/com/example/jz/modle/dto/CauseDto.java
+++ b/src/main/java/com/example/jz/modle/dto/CauseDto.java
@@ -29,4 +29,8 @@
//妗堜欢鎻忚堪
@ApiModelProperty(dataType = "String", value = "妗堜欢鎻忚堪")
private String description;
+
+ //妗堜欢鐘舵��
+ @ApiModelProperty(dataType = "Integer", value = "妗堜欢鐘舵��")
+ private Integer status;
}
diff --git a/src/main/java/com/example/jz/modle/entity/Announcement.java b/src/main/java/com/example/jz/modle/entity/Announcement.java
index 2cd3553..c828dcf 100644
--- a/src/main/java/com/example/jz/modle/entity/Announcement.java
+++ b/src/main/java/com/example/jz/modle/entity/Announcement.java
@@ -40,5 +40,14 @@
* 鍒涘缓鏃堕棿
*/
private Date ctime;
+
+ //鍏憡鏈夋晥寮�濮嬫椂闂�
+ private Date effectiveStime;
+
+ //鍏叡鏈夋晥缁撴潫鏃堕棿
+ private Date effectiveEtime;
+
+ //鍒涘缓浜�
+ private Integer creator;
}
diff --git a/src/main/java/com/example/jz/modle/vo/AnnouncementVo.java b/src/main/java/com/example/jz/modle/vo/AnnouncementVo.java
new file mode 100644
index 0000000..f5089db
--- /dev/null
+++ b/src/main/java/com/example/jz/modle/vo/AnnouncementVo.java
@@ -0,0 +1,17 @@
+package com.example.jz.modle.vo;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel(description = "妗堜欢缇ゅ叕鍛�",value = "AnnouncementVo")
+public class AnnouncementVo {
+
+ private String text;
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ private Date ctime;
+}
diff --git a/src/main/java/com/example/jz/modle/vo/CauseReportVo.java b/src/main/java/com/example/jz/modle/vo/CauseReportVo.java
new file mode 100644
index 0000000..71e0e42
--- /dev/null
+++ b/src/main/java/com/example/jz/modle/vo/CauseReportVo.java
@@ -0,0 +1,43 @@
+package com.example.jz.modle.vo;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@ApiModel(description = "妗堜欢褰曞叆妗堜欢浜哄憳璇︽儏",value = "CauseReportVo")
+public class CauseReportVo {
+ //澶村儚鍦板潃
+ private String pic;
+ //鎶ユ浜篿d
+ private String userName;
+ /**
+ * 鎵嬫満鍙风爜
+ */
+ private String userMobile;
+ /**
+ * 鐢ㄦ埛韬唤璇佸彿鐮�
+ */
+ private String userIdcard;
+ //鏄惁浠ｅ姙 1锛堜唬鍔烇級 0锛堜笉鏄唬鍔烇級
+ private String isCommission;
+ //娑夋閲戦
+ private Double amountInvolved;
+ //鎶ユ鏉愭枡鍥剧墖鍦板潃 澶氫釜鐢�,鍒嗛殧
+ private String reportMaterials;
+ //鎶ユ鏃堕棿
+ private Date reportTime;
+ //鐘舵�侊紝1涓洪�氳繃 0涓烘湭瀹℃牳
+ private Integer status;
+ //鍒涘缓鏃堕棿
+ private Date ctime;
+ //琚獥鏃堕棿
+ private Date cheatTime;
+ //琛ュ厖淇℃伅
+ private String information;
+ //妗堜欢Id
+ private Integer causeId;
+ //缇ょ粍id
+ private Integer groupId;
+}
diff --git a/src/main/java/com/example/jz/modle/vo/CauseVo.java b/src/main/java/com/example/jz/modle/vo/CauseVo.java
index 2aedd56..24e09ea 100644
--- a/src/main/java/com/example/jz/modle/vo/CauseVo.java
+++ b/src/main/java/com/example/jz/modle/vo/CauseVo.java
@@ -44,4 +44,8 @@
//妗堜欢鎶ユ浜烘暟
@ApiModelProperty(dataType = "Integer", value = "妗堜欢鎶ユ浜烘暟")
private Integer reportNumber;
+
+ //妗堜欢缇や富id
+ @ApiModelProperty(dataType = "Integer", value = "妗堜欢缇や富id")
+ private Integer groupId;
}
diff --git a/src/main/java/com/example/jz/service/CauseService.java b/src/main/java/com/example/jz/service/CauseService.java
index 8c6e0f9..0d4adcb 100644
--- a/src/main/java/com/example/jz/service/CauseService.java
+++ b/src/main/java/com/example/jz/service/CauseService.java
@@ -4,6 +4,8 @@
import com.example.jz.modle.PageParam;
import com.example.jz.modle.dto.CauseDto;
import com.example.jz.modle.entity.Cause;
+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;
@@ -31,8 +33,39 @@
**/
PageParam<CauseVo> getCauserListByCondition(String cause, Integer status, Integer size, Integer current);
+ /**
+ * @Description 鑾峰彇鎵�鏈夎礋璐ｄ汉
+ * @Param []
+ * @return java.util.List<com.example.jz.modle.vo.UserVo>
+ **/
List<UserVo> getManagerList();
+ /**
+ * @Description 淇敼妗堜欢
+ * @Param [causeDto, id]
+ * @return java.lang.Integer
+ **/
Integer updateCause(CauseDto causeDto,Integer id);
+
+ /**
+ * @Description 鑾峰彇鎶ユ浜哄垪琛�
+ * @Param [causeId]
+ * @return java.util.List<com.example.jz.modle.vo.CauseReportVo>
+ **/
+ List<CauseReportVo> getReporterList(Integer causeId);
+
+ /**
+ * @Description 妗堜欢缇ゅ叕鍛�
+ * @Param [groupId]
+ * @return java.util.List<com.example.jz.modle.vo.AnnouncementVo>
+ **/
+ List<AnnouncementVo> getGroupAnnouncement(Integer groupId);
+
+ /**
+ * @Description 鍒犻櫎妗堜欢
+ * @Param [id]
+ * @return void
+ **/
+ void deleteCause(Integer id);
}
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 1e0d780..a7d54ad 100644
--- a/src/main/java/com/example/jz/service/impl/CauseServiceImpl.java
+++ b/src/main/java/com/example/jz/service/impl/CauseServiceImpl.java
@@ -3,30 +3,26 @@
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.CauseDao;
-import com.example.jz.dao.GroupDao;
-import com.example.jz.dao.ReportDao;
-import com.example.jz.dao.UserDao;
+import com.example.jz.dao.*;
import com.example.jz.modle.PageParam;
import com.example.jz.modle.dto.CauseDto;
-import com.example.jz.modle.entity.Cause;
-import com.example.jz.modle.entity.Group;
-import com.example.jz.modle.entity.Report;
-import com.example.jz.modle.entity.User;
+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 org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
-import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
/**
- * 妗堜欢琛�(Cause)琛ㄦ湇鍔″疄鐜扮被
+ * 案件表(Cause)表服务实现类
*
* @author makejava
* @since 2022-07-13 11:52:58
@@ -45,14 +41,18 @@
@Resource
GroupDao groupDao;
+ @Resource
+ AnnouncementDao announcementDao;
+
@Override
+ @Transactional(rollbackFor = Exception.class)
public Integer addCause(CauseDto causeDto) {
- //鍒涘缓妗堜欢
+ //创建案件
Cause cause = new Cause();
BeanUtils.copyProperties(causeDto, cause);
cause.setCtime(new Date());
causeService.save(cause);
- //鍒涘缓缇ょ粍
+ //创建群组
Group group = new Group();
group.setCtime(new Date());
group.setGroupName(causeDto.getName());
@@ -87,6 +87,7 @@
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<>();
@@ -106,11 +107,44 @@
}
@Override
- public Integer updateCause(CauseDto causeDto,Integer id) {
+ public Integer updateCause(CauseDto causeDto, Integer id) {
Cause cause = new Cause();
- BeanUtils.copyProperties(causeDto,cause);
+ BeanUtils.copyProperties(causeDto, cause);
cause.setId(id);
return causeDao.updateById(cause);
}
-}
+ @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());
+ }
+
+ @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());
+ }
+
+ @Override
+ public void deleteCause(Integer id) {
+ causeDao.deleteById(id);
+ }
+}
\ No newline at end of file
--
Gitblit v1.8.0