Merge branch 'shuangzheng2' into huacheng_test

101captain

2022-08-01 bf46bac3cda70dc8dc7ed95e0461f1a72fba2eeb

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

@@ -4,22 +4,22 @@
import com.panzhihua.common.constants.NeighborCircleConstants;
import javax.annotation.Resource;

import com.panzhihua.common.model.vos.neighbor.*;
import io.swagger.annotations.ApiModelProperty;
import org.springframework.web.bind.annotation.*;

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.neighbor.*;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleAppVO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleDetailAppVO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleTopicAppVO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCommentReplyAppVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.StringUtils;

import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;

import static java.util.Objects.isNull;

/**
 * @auther lyq
@@ -42,6 +42,7 @@
    public R pageNeighborByApp(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
        if (loginUserInfo != null) {
            neighborCircleAppDTO.setPhone(loginUserInfo.getPhone());
            neighborCircleAppDTO.setUserId(loginUserInfo.getUserId());
        }
        return communityService.pageNeighborByApp(neighborCircleAppDTO);
@@ -221,5 +222,49 @@
        circleTopicAppDTO.setCommunityId(loginUserInfo.getCommunityId());
        return communityService.deleteNeighborByApp(circleTopicAppDTO);
    }

    /**
     * 分页查询邻里圈列表
     *
     * @param neighborCircleAppDTO
     *            请求参数
     * @return 邻里圈列表
     */
    @ApiOperation(value = "新版接单问题",response =ComActNeighborCircleAppVO.class )
    @PostMapping("selectSolve")
    public R selectSolve(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO) {
        neighborCircleAppDTO.setUserId(this.getUserId());
        return communityService.selectSolve(neighborCircleAppDTO);
    }


    /**
     * 修改数据
     * @param editNeighborCircleAdminVO
     * @return
     */
    @ApiOperation(value = "接单 反馈",response =ComActNeighborCircleAppVO.class )
    @PostMapping("update")
    public R order(@RequestBody EditNeighborCircleAdminVO editNeighborCircleAdminVO){
        return this.communityService.order(editNeighborCircleAdminVO);
    }

    @ApiOperation(value = "服务统计",response = ServiceStaticsVO.class)
    @PostMapping("/serviceStatic")
    public R serviceStatic(@RequestBody ServiceStaticDTO serviceStaticDTO){
        return this.communityService.serviceStatic(serviceStaticDTO);
    }

    /**
     * 求助我的问题数量统计
     * @param type
     * @param phone
     * @return
     */
    @ApiOperation(value = "求助我的问题数量统计")
    @GetMapping("/selectCount")
    public R selectCount(@RequestParam("type")Integer type,@RequestParam(value = "phone",required = false)String phone){
        return this.communityService.selectCount(type,phone);
    }
}