From 671664062f2bc040e1451bb09e63d850d7a0b3f5 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期一, 10 十月 2022 10:32:29 +0800
Subject: [PATCH] update
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 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 9f81c6e..1df0b10 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
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.sanshuo.ComEventArchiveVO;
@@ -130,7 +131,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));
}
/**
@@ -153,7 +154,7 @@
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);
+ return comEventService.pageByComEvent(comEvent, pagination,this.getLoginUserInfo());
}
@@ -173,7 +174,7 @@
public R remove(@PathVariable Long id) {
ComEvent comEvent = new ComEvent();
comEvent.setId(id);
- comEvent.setEventProcessStatus(8);
+ comEvent.setEventProcessStatus(9);
return comEventService.updateComEvent(comEvent);
}
@@ -227,7 +228,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,7 +248,7 @@
public R rejectRequest(@RequestParam("id") Long id) {
ComEvent comEvent = new ComEvent();
comEvent.setId(id);
- comEvent.setEventProcessStatus(SanShuoEventStatusEnum.REJECT.getCode());
+ comEvent.setEventProcessStatus(SanShuoEventStatusEnum.VALID.getCode());
return comEventService.updateComEvent(comEvent);
}
@@ -280,7 +281,7 @@
@ApiOperation("专家调解处理")
@PutMapping("/conciliation/Request")
public R conciliationRequest(@RequestBody ComEventConciliationVO comEventConciliationVO) {
- return comEventService.conciliationEvent(comEventConciliationVO);
+ return comEventService.conciliationEvent(comEventConciliationVO, getLoginUserInfo());
}
/**
@@ -313,4 +314,22 @@
public R calculate() {
return comEventService.calculate();
}
+
+ /**
+ * 大屏事件统计
+ *
+ * @param indexDataDTO 查询参数
+ */
+ @PostMapping("/indexData")
+ public R indexData(@RequestBody IndexDateDTO indexDataDTO) {
+ return comEventService.indexData(indexDataDTO);
+ }
+
+ /**
+ * 大屏事件统计（事件和专家各级别占比）
+ */
+ @GetMapping("/indexData/event")
+ public R eventIndexData(@RequestParam Integer type) {
+ return comEventService.eventIndexData(type);
+ }
}
--
Gitblit v1.7.1