查询小区bug修复

huanghongfa

2020-12-28 f6b00d828e35474c0b96cd824f9a6126c2789176

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java

@@ -1,10 +1,14 @@
package com.panzhihua.applets.api;

import com.alibaba.fastjson.JSONArray;
import com.panzhihua.common.model.vos.community.ComActActivityVO;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
import com.panzhihua.common.model.vos.community.ComActMicroWishVO;
import com.panzhihua.common.model.vos.community.ComMngStructHouseVO;
import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO;
import com.panzhihua.common.model.vos.user.UserPhoneVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.partybuilding.PartyBuildingService;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.exceptions.UnAuthenticationException;
@@ -19,7 +23,11 @@
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -35,6 +43,8 @@
    private UserService userService;
    @Resource
    private CommunityService communityService;
    @Resource
    private PartyBuildingService partyBuildingService;

    @ApiOperation(value = "当前登录用户信息", response = LoginUserInfoVO.class)
    @GetMapping("info")
@@ -60,7 +70,7 @@

    @ApiOperation(value = "用户实名认证")
    @PutMapping("putuserauthentication")
    public R putUserAuthentication(@RequestBody LoginUserInfoVO loginUserInfoVO) {
    public R putUserAuthentication(@RequestBody @Validated(AddGroup.class) LoginUserInfoVO loginUserInfoVO) {
        Long userId = this.getUserId();
        loginUserInfoVO.setUserId(userId);
        return userService.putUserAuthentication(loginUserInfoVO);
@@ -135,4 +145,71 @@
        comMngFamilyInfoVO.setUserId(this.getUserId());
        return userService.putFamily(comMngFamilyInfoVO);
    }

    @ApiOperation(value = "我的活动",response =ComActActivityVO.class )
    @GetMapping("listactivity")
    public R listActivity() {
        Long userId = this.getUserId();
        List<ComActActivityVO> comActActivityVOS=new ArrayList<>();
        R r=communityService.listActivity(userId);
        if (R.isOk(r)) {
            comActActivityVOS =(List<ComActActivityVO>) r.getData();
        }
        R r1=partyBuildingService.listActivity(userId);
        if (R.isOk(r1)) {
            List<ComActActivityVO> data = (List<ComActActivityVO>) r1.getData();
            comActActivityVOS.addAll(data);
        }
        if (!ObjectUtils.isEmpty(comActActivityVOS)) {
            String s = JSONArray.toJSONString(comActActivityVOS);
            List<ComActActivityVO>comActActivityVOS1=new ArrayList<>();
            comActActivityVOS1=JSONArray.parseArray(s,ComActActivityVO.class);
            List<ComActActivityVO> collect = comActActivityVOS1.stream().sorted(Comparator.comparing(ComActActivityVO::getBeginAt).reversed()).collect(Collectors.toList());
            comActActivityVOS=collect;
        }
        return R.ok(comActActivityVOS);
    }

    @ApiOperation(value = "分页查询我的随手拍",response = ComActEasyPhotoVO.class )
    @PostMapping("pageeasyphoto")
    public R pageEasyPhoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
        Long userId = this.getUserId();
        comActEasyPhotoVO.setUserId(userId);
        comActEasyPhotoVO.setCommunityId(null);
        return communityService.pageEasyPhoto(comActEasyPhotoVO);
    }

    @ApiOperation(value = "分页查询我的微心愿",response = ComActMicroWishVO.class )
    @PostMapping("pagemicrowish")
    public R pageMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO) {
        Long userId = this.getUserId();
        comActMicroWishVO.setUserId(userId);
        comActMicroWishVO.setCommunityId(null);
        return communityService.pageMicroWish(comActMicroWishVO);
    }

    @ApiOperation(value = "用户确认心愿" )
    @PutMapping("microwishconfirm")
    public R putMicroWishConfirm(@RequestBody ComActMicroWishVO comActMicroWishVO) {
        Long userId = this.getUserId();
        comActMicroWishVO.setUserId(userId);
        comActMicroWishVO.setCommunityId(null);
        Long id = comActMicroWishVO.getId();
        if (null==id||0==id) {
            return R.fail("心愿主键不能为空");
        }
        String evaluate = comActMicroWishVO.getEvaluate();
        if (ObjectUtils.isEmpty(evaluate)) {
            return R.fail("用户评价不能为空");
        }
        Integer score = comActMicroWishVO.getScore();
        if (null==score||0==score) {
            return R.fail("评分不能为空");
        }
        comActMicroWishVO.setEvaluateAt(new Date());
        comActMicroWishVO.setStatus(6);
        return communityService.putMicroWishConfirm(comActMicroWishVO);
    }


}