From 66e4211cbfa154a87390b25c93b32d722e0d690c Mon Sep 17 00:00:00 2001
From: xiang <5914123@qq.com>
Date: 星期四, 14 九月 2023 15:22:37 +0800
Subject: [PATCH] Merge branch 'haucheng_panzhihua' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
index f28bf2a..addf559 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
@@ -75,10 +75,10 @@
@ApiOperation(value = "分页获取社区动态", response = ComActDynVO.class)
@PostMapping("pagedynamic")
public R pageDynamic(@RequestBody ComActDynVO comActDynVO) {
- LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
- if (loginUserInfo != null) {
- comActDynVO.setCommunityId(loginUserInfo.getCommunityId());
- }
+// LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+// if (loginUserInfo != null) {
+// comActDynVO.setCommunityId(loginUserInfo.getCommunityId()+"");
+// }
comActDynVO.setIsTopping(null);
comActDynVO.setStatus(1);
Integer category = comActDynVO.getCategory();
@@ -87,6 +87,19 @@
}
return communityService.pageDynamic(comActDynVO);
}
+
+ @ApiOperation(value = "分页查项目活动")
+ @PostMapping("projectPageActivity")
+ public R projectPageActivity(@RequestBody ComActActivityVO comActActivityVO) {
+ Long projectId = comActActivityVO.getProjectId();
+ if (isNull(projectId)) {
+ Long communityId = this.getCommunityId();
+ comActActivityVO.setCommunityId(communityId);
+ }
+ // return communityService.pageActivity(ComActActivityVO);
+ return communityService.pageActivityCommunityBack(comActActivityVO);
+ }
+
@ApiOperation(value = "社区动态详情", response = ComActDynVO.class)
@GetMapping("detaildynamic")
@@ -168,7 +181,7 @@
if (StrUtil.isNotBlank(evaluateContent)) {
String result = checkService.checkMessageBy(evaluateContent, openid, appId);
if (StrUtil.isNotBlank(result)) {
- return R.fail(Constants.NOTICE_FAIL, "填写内容存在 " + result + " 违规信息");
+ return R.fail(501, "填写内容存在 " + result + " 违规信息");
}
}
@@ -176,7 +189,7 @@
String photo = comActActEvaluateVO.getPhoto();
if (StrUtil.isNotBlank(photo)) {
if (!checkService.checkImageBy(photo, appId)) {
- return R.fail(Constants.NOTICE_FAIL, "上传图片存在违规信息");
+ return R.fail(501, "上传图片存在违规信息");
}
}
return communityService.activityEvaluate(comActActEvaluateVO);
@@ -464,4 +477,10 @@
public R detailCommunity(@RequestParam("id") Long id) {
return communityService.detailCommunity(id);
}
+
+ @ApiOperation(value = "获取问题清单，需求清单，报道服务活动数量",response = DataCount.class)
+ @GetMapping("/dataCount")
+ public R dataCount(){
+ return communityService.dataCount();
+ }
}
--
Gitblit v1.7.1