From 3ca7f722f25c1908bc4588c75dbde1f56a8d9877 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期五, 26 三月 2021 10:08:46 +0800
Subject: [PATCH] Merge branch 'master' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java | 38 +++++++++++++++++++++++++++++++++++---
1 files changed, 35 insertions(+), 3 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 0cdc853..35c9046 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
@@ -2,10 +2,11 @@
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.community.ComMngCarAppletDTO;
import com.panzhihua.common.model.dtos.community.PageVolunteerDTO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.*;
-import com.panzhihua.common.model.vos.partybuilding.PartyBuildingActivityVO;
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.user.UserService;
@@ -20,6 +21,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.Date;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -36,6 +38,12 @@
private CommunityService communityService;
@Resource
private UserService userService;
+
+ @ApiOperation(value = "分页查询小区",response =ComMngStructAreaVO.class )
+ @PostMapping("pagearea")
+ public R pageArea(@RequestBody ComMngStructAreaVO comMngStructAreaVO){
+ return communityService.pageArea(comMngStructAreaVO);
+ }
@ApiOperation(value = "分页获取社区动态",response = ComActDynVO.class)
@PostMapping("pagedynamic")
@@ -94,6 +102,7 @@
public R signActivity(@RequestBody @Validated(AddGroup.class) SignactivityVO signactivityVO){
Long userId = this.getUserId();
Long activityId = signactivityVO.getActivityId();
+ Integer isVolunteer = signactivityVO.getIsVolunteer();
signactivityVO.setUserId(userId);
R r = communityService.signActivity(signactivityVO);
if (R.isOk(r)&&signactivityVO.getType().intValue()==1) {
@@ -105,9 +114,11 @@
sysUserNoticeVO.setTitle("报名成功");
sysUserNoticeVO.setBusinessType(1);
sysUserNoticeVO.setBusinessTitle(comActActivityVO.getActivityName());
- sysUserNoticeVO.setBusinessContent(String.format("活动将于%s开始，请按时参加",comActActivityVO.getBeginAt()));
+ Date beginAt = comActActivityVO.getBeginAt();
+ sysUserNoticeVO.setBusinessContent(String.format("活动将于%tF %tT 开始，请按时参加", beginAt,beginAt));
sysUserNoticeVO.setBusinessId(activityId);
sysUserNoticeVO.setStatus(0);
+ sysUserNoticeVO.setActivityType(isVolunteer.intValue()==1?1:2);
sysUserNoticeVO.setBusinessStatus(2);
R r1 = userService.addNotice(sysUserNoticeVO);
if (R.isOk(r1)) {
@@ -150,7 +161,7 @@
return communityService.addVolunteer(comMngVolunteerMngVO);
}
- @ApiOperation(value = "分页查询志愿者团队")
+ @ApiOperation(value = "分页查询志愿者团队",response = ComMngVolunteerMngVO.class)
@PostMapping("pagevolunteer")
public R pageVolunteer(@RequestBody @Validated(PageGroup.class) PageVolunteerDTO pageVolunteerDTO){
Long communityId = this.getCommunityId();
@@ -168,5 +179,26 @@
}
+ @ApiOperation(value = "车辆登记")
+ @PostMapping("car/register")
+ public R addComMngCar(@RequestBody ComMngCarAppletDTO comMngCarAppletDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ Long communityId = loginUserInfo.getCommunityId();
+ if (null!=communityId && 0!=communityId) {
+ comMngCarAppletDTO.setCommunityId(communityId);
+ comMngCarAppletDTO.setAreaId(loginUserInfo.getAreaId());
+ comMngCarAppletDTO.setUserName(loginUserInfo.getName());
+ comMngCarAppletDTO.setUserId(loginUserInfo.getUserId());
+ comMngCarAppletDTO.setMobile(loginUserInfo.getPhone());
+ comMngCarAppletDTO.setSource(1);
+ }
+ return communityService.addComMngCarApplet(comMngCarAppletDTO);
+ }
+
+ @ApiOperation(value = "登记车辆列表",response = ComMngCarVO.class)
+ @GetMapping("car/list")
+ public R comMngCarList() {
+ return communityService.userComMngCarList(this.getUserId());
+ }
}
--
Gitblit v1.7.1