From f3e7ecf643ec517ad93b80a50e63eaab90b6461b Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期二, 07 二月 2023 15:51:22 +0800
Subject: [PATCH] 三说会堂事件搜索修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java | 81 ++++++++++++++++++++++++++++++++--------
1 files changed, 64 insertions(+), 17 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java
index af1a971..e7fdfca 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java
@@ -4,22 +4,24 @@
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.enums.SanShuoEventStatusEnum;
import com.panzhihua.common.model.dtos.community.sanshuo.IndexDateDTO;
-import com.panzhihua.common.model.dtos.user.IndexDataDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.sanshuo.ComEventArchiveVO;
import com.panzhihua.common.model.vos.sanshuo.ComEventConciliationVO;
import com.panzhihua.common.model.vos.sanshuo.ComEventVO;
import com.panzhihua.common.model.vos.sanshuo.ComSanRequestVO;
+import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.CopyUtil;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.entity.ComEvent;
+import com.panzhihua.service_community.service.ComSanShuoExpertService;
import com.panzhihua.service_community.service.IComEventService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
@@ -28,6 +30,9 @@
import javax.validation.Valid;
import java.util.HashMap;
import java.util.List;
+
+import static java.util.Objects.isNull;
+import static java.util.Objects.nonNull;
/**
* ClassName ComEventController
@@ -44,6 +49,10 @@
@Resource
private IComEventService comEventService;
+ @Resource
+ private UserService userService;
+ @Resource
+ private ComSanShuoExpertService comSanShuoExpertService;
/**
@@ -65,6 +74,9 @@
comEvent.setRequestUserId(loginUser.getUserId());
comEvent.setRequestUserName(loginUser.getName());
comEvent.setRequestUserTel(loginUser.getPhone());
+ if (isNull(comEventVO.getAppId())){
+ comEvent.setAppId(loginUser.getAppId());
+ }
return comEventService.insertComEvent(comEvent);
}
@@ -132,7 +144,7 @@
@PostMapping("/list")
public R<List<ComEventVO>> listByComEvent(@RequestBody ComEventVO comEventVO) {
ComEvent comEvent = CopyUtil.copyProperties(comEventVO, ComEvent.class);
- return R.ok(CopyUtil.beanCopyList(comEventService.listByComEvent(comEvent), ComEventVO.class));
+ return R.ok(CopyUtil.beanCopyList(comEventService.listByComEvent(comEvent,this.getLoginUserInfo()), ComEventVO.class));
}
/**
@@ -154,8 +166,14 @@
@PostMapping("/page")
public R page(@RequestBody ComEventVO comEventVO, Long pageNo, Long pageSize) {
Page pagination = new Page(pageNo, pageSize);
- ComEvent comEvent = CopyUtil.copyProperties(comEventVO, ComEvent.class);
- return comEventService.pageByComEvent(comEvent, pagination);
+ ComEvent comEvent=new ComEvent();
+ BeanUtils.copyProperties(comEventVO, comEvent);
+ LoginUserInfoVO loginUserInfo = getLoginUserInfo();
+ if (isNull(comEventVO.getAppId())){
+ String appId = userService.detailUser(loginUserInfo.getUserId()).getData().getAppId();
+ comEvent.setAppId(appId);
+ }
+ return comEventService.pageByComEvent(comEvent, pagination,this.getLoginUserInfo());
}
@@ -175,7 +193,7 @@
public R remove(@PathVariable Long id) {
ComEvent comEvent = new ComEvent();
comEvent.setId(id);
- comEvent.setEventProcessStatus(8);
+ comEvent.setEventProcessStatus(9);
return comEventService.updateComEvent(comEvent);
}
@@ -229,7 +247,7 @@
@ApiImplicitParam(name = "specterId", value = "专家ID", required = true, dataType = "Long"),
})
@PutMapping("/accept/Request")
- public R acceptRequest(@RequestParam("id") Long id,@RequestParam("specterId") Long specterId) {
+ public R acceptRequest(@RequestParam("id") Long id, @RequestParam("specterId") Long specterId) {
return comEventService.acceptRequest(id, specterId);
}
@@ -247,10 +265,12 @@
})
@PutMapping("/reject/Request")
public R rejectRequest(@RequestParam("id") Long id) {
- ComEvent comEvent = new ComEvent();
- comEvent.setId(id);
- comEvent.setEventProcessStatus(SanShuoEventStatusEnum.REJECT.getCode());
- return comEventService.updateComEvent(comEvent);
+ ComEvent comEvent = comEventService.getById(id);
+ comEvent.setEventProcessStatus(SanShuoEventStatusEnum.VALID.getCode());
+ comEvent.setSpecialistName("待分配");
+ comEvent.setSpecialistId(null);
+ comEventService.updateEventStransferRecord(id);
+ return R.ok(comEventService.updateById(comEvent));
}
/**
@@ -282,7 +302,7 @@
@ApiOperation("专家调解处理")
@PutMapping("/conciliation/Request")
public R conciliationRequest(@RequestBody ComEventConciliationVO comEventConciliationVO) {
- return comEventService.conciliationEvent(comEventConciliationVO);
+ return comEventService.conciliationEvent(comEventConciliationVO, getLoginUserInfo());
}
/**
@@ -312,24 +332,51 @@
*/
@ApiOperation("事件各种状态(处理状态1待处理2待验证3专家已受理4专家未受理，拒绝5调解中6已结案归档7调解取消8 已删除)数据统计")
@GetMapping("/status/calculate")
- public R calculate() {
- return comEventService.calculate();
+ public R calculate(@RequestParam(value = "level",required = false)Integer level,@RequestParam(value = "id",required = false)Long id) {
+ return comEventService.calculate(getLoginUserInfo(),level,id);
}
/**
* 大屏事件统计
+ *
* @param indexDataDTO 查询参数
- * */
+ */
@PostMapping("/indexData")
- public R indexData(@RequestBody IndexDateDTO indexDataDTO ){
+ public R indexData(@RequestBody IndexDateDTO indexDataDTO) {
return comEventService.indexData(indexDataDTO);
}
/**
* 大屏事件统计（事件和专家各级别占比）
- * */
+ */
@GetMapping("/indexData/event")
- public R eventIndexData(@RequestParam Integer type){
+ public R eventIndexData(@RequestParam Integer type) {
return comEventService.eventIndexData(type);
}
+
+
+ /**
+ *可选街道列表
+ * */
+ @GetMapping("/streetList")
+ public R getStreetId(){
+ return comEventService.listStreetScreen();
+ }
+
+ /**
+ *可选社区列表
+ * */
+ @GetMapping("/communityList")
+ public R getCommunityList(){
+ return comEventService.listCommunityScreen();
+ }
+
+ /**
+ * 获取事件范围筛选列表
+ * */
+ @GetMapping("/rangeList")
+ public R rangeList(){
+ return comSanShuoExpertService.rangeList();
+ }
+
}
--
Gitblit v1.7.1