From d6aabd981bf80cd57c09819f42b1c4e79f1904f9 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期三, 21 九月 2022 10:13:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/sanshuohuitang_dev' into sanshuohuitang_dev
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index 5745505..689a140 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -13,9 +13,7 @@
import com.panzhihua.common.model.dtos.community.dpc.PageDpcDTO;
import com.panzhihua.common.model.dtos.community.enterprise.*;
import com.panzhihua.common.model.dtos.community.reserve.*;
-import com.panzhihua.common.model.dtos.community.sanshuo.ComSanShuoIndustryCenterDTO;
-import com.panzhihua.common.model.dtos.community.sanshuo.ComSanshuoEventDTO;
-import com.panzhihua.common.model.dtos.community.sanshuo.ComSanshuoExpertDTO;
+import com.panzhihua.common.model.dtos.community.sanshuo.*;
import com.panzhihua.common.model.dtos.community.warehouse.ComActWarehouseApplyDTO;
import com.panzhihua.common.model.dtos.community.GetIdentityEidTokenDTO;
import com.panzhihua.common.model.dtos.community.cluster.PageClusterMemberDto;
@@ -10379,7 +10377,7 @@
* 删除业务中心
* */
@DeleteMapping("/sanshuo/industryCenter/remove")
- R removeIndustry(@RequestParam Long id);
+ R removeIndustry(@RequestParam("id") Long id);
/**
* 重置业务中心密码
@@ -10391,7 +10389,7 @@
* 业务中心详情
* */
@GetMapping("/sanshuo/industryCenter/detail")
- R industryCenterDetail(@RequestParam Long id);
+ R industryCenterDetail(@RequestParam("id") Long id);
/**
* 后台获取专家列表
@@ -10435,7 +10433,7 @@
* 获取专家详情
* */
@GetMapping("/sanshuo/expert/detail")
- R expertDetail(@RequestParam Long id);
+ R expertDetail(@RequestParam("id") Long id);
/**
* 后台事件列表
@@ -10461,13 +10459,13 @@
* 新增事件类型
* */
@PostMapping("/sanshuo/event")
- R addEvent(@RequestBody ComSanshuoEventDTO comSanshuoEventDTO);
+ R addEvent(@RequestBody ComMediateTypeDTO comSanshuoEventDTO);
/**
* 新增事件类型
* */
@PutMapping("/sanshuo/event")
- R updateEvent(@RequestBody ComSanshuoEventDTO comSanshuoEventDTO);
+ R updateEvent(@RequestBody ComMediateTypeDTO comSanshuoEventDTO);
/**
* 删除事件类型
@@ -10480,4 +10478,20 @@
* */
@GetMapping("/sanshuo/expert/expertShow")
R expertShow();
+
+
+ @GetMapping("/sanshuo/expert/expertRange")
+ R expertRange();
+
+ /**
+ * 大屏事件统计
+ * */
+ @PostMapping("/sanshuo/comEvent/indexData")
+ R sanshuoIndexDate(IndexDateDTO indexDateDTO);
+
+ /**
+ * 事件占比统计饼图
+ * */
+ @GetMapping("/indexData/event")
+ R eventIndexData(@RequestParam("type") Integer type);
}
--
Gitblit v1.7.1