From 1aa40090d6b2339990b2fcac6aac75b96c7bc6db Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 14 七月 2021 17:19:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 54 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 42 insertions(+), 12 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 c0686fd..279d16f 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
@@ -5,10 +5,7 @@
import com.panzhihua.common.model.dtos.advertisement.ComOpsAdvDTO;
import com.panzhihua.common.model.dtos.advertisement.PageComOpsAdvDTO;
import com.panzhihua.common.model.dtos.community.*;
-import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDetailDTO;
-import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenStatisticAgeGenderDTO;
-import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenStatisticPartyActivityDTO;
-import com.panzhihua.common.model.dtos.community.bigscreen.PageBigScreenStatisticPartyOrg;
+import com.panzhihua.common.model.dtos.community.bigscreen.*;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityListDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityPeopleListDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenDiscussListDTO;
@@ -27,10 +24,7 @@
import com.panzhihua.common.model.dtos.shop.*;
import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
import com.panzhihua.common.model.dtos.vaccines.*;
-import com.panzhihua.common.model.vos.BcDictionaryItemVO;
-import com.panzhihua.common.model.vos.BcDictionaryVO;
-import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
+import com.panzhihua.common.model.vos.*;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticAgeGender;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyActivity;
@@ -126,13 +120,22 @@
R detailActivity(@RequestParam("id") Long id, @RequestParam("userId") Long userId);
/**
- * 活动报名名单
+ * 分页活动报名名单
*
* @param activitySignVO 查询参数
* @return 报名人员集合
*/
@PostMapping("listactivitysign")
R listActivitySign(@RequestBody ActivitySignVO activitySignVO);
+
+ /**
+ * 活动报名名单
+ *
+ * @param activitySignVO 查询参数
+ * @return 报名人员集合
+ */
+ @PostMapping("listactivitysigns")
+ R listActivitySigns(@RequestBody ActivitySignVO activitySignVO);
/**
* 新增社区动态
@@ -1431,6 +1434,15 @@
*/
@PostMapping("/common/data/car/import")
R listSaveMngCarExcelVO(@RequestBody List<ComMngCarExcelVO> list, @RequestParam("communityId") Long communityId);
+
+ /**
+ * 车辆导出
+ *
+ * @param exportComMngCarExcelDTO
+ * @return
+ */
+ @PostMapping("/common/data/car/export")
+ R exportRealCar(ExportComMngCarExcelDTO exportComMngCarExcelDTO);
/**
* 社区后台实有单位管理列表
@@ -2933,6 +2945,24 @@
R listSaveBuildingExcelVO(@RequestBody List<ComMngBuildingExcelVO> newVoList, @RequestParam("communityId") Long communityId);
/**
+ * 插入字典
+ * @param dictionaryVO 字典数据
+ * @return R 是否保存成功
+ * @author manailin
+ * @date 2021/6/10 17:00
+ */
+ @PostMapping("/dictionary/insertDiction")
+ R insertDiction(@RequestBody DictionaryVO dictionaryVO);
+ /**
+ * 插入字典项
+ * @param dictionaryVO 字典数据
+ * @return R 是否保存成功
+ * @author manailin
+ * @date 2021/6/10 17:00
+ */
+ @PostMapping("/dictionary/insertDictionItem")
+ R insertDictionItem(@RequestBody BcDictionaryVO dictionaryVO);
+ /**
* 根据字典key查询字典项
*
* @param key
@@ -3118,11 +3148,11 @@
/**
* 事件大屏统计接口
*
- * @param communityId 社区id
+ * @param screenEventDTO 请求参数
* @return 统计结果
*/
- @GetMapping("/screen/getScreenEvent")
- R getScreenEvent(@RequestParam("communityId") Long communityId);
+ @PostMapping("/screen/getScreenEvent")
+ R getScreenEvent(@RequestBody BigScreenEventDTO screenEventDTO);
/**
* 民生大屏统计接口
--
Gitblit v1.7.1