社区动态-随手拍-微心愿接口测试ok

huanghongfa

2020-12-14 c851ab47375be570d160a229f5c8e1ce65084a65

社区动态-随手拍-微心愿接口测试ok

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

@@ -34,6 +34,8 @@
    public R pageDynamic(@RequestBody ComActDynVO comActDynVO){
        Long communityId = this.getCommunityId();
        comActDynVO.setCommunityId(communityId);
        comActDynVO.setIsTopping(null);
        comActDynVO.setStatus(null);
        return communityService.pageDynamic(comActDynVO);
    }


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

@@ -92,6 +92,11 @@
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        Long communityId = loginUserInfo.getCommunityId();
        Long userId = loginUserInfo.getUserId();
        String phone = loginUserInfo.getPhone();
        if (ObjectUtils.isEmpty(phone)) {
            return R.fail("只有认证后的用户才能发布微心愿");
        }
        comActMicroWishVO.setSponsorPhone(phone);
        comActMicroWishVO.setCommunityId(communityId);
        comActMicroWishVO.setSponsorId(userId);
        return communityService.addMicroWish(comActMicroWishVO);

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java

@@ -87,4 +87,10 @@

    @ApiModelProperty("是否点赞 0 否 1 是")
    private Integer haveGiveThumbsUp;

    @ApiModelProperty(value = "是否需要反馈 1 是 0 不是",example = "0")
    private Integer isNeedFeedBack;

    @ApiModelProperty("操作类型 1审核通过 2驳回 3反馈")
    private Integer type;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishVO.java

@@ -40,7 +40,7 @@
    private Integer status;

    @ApiModelProperty("集星数")
    private Integer startNum;
    private Integer starNum;

    @ApiModelProperty("形式  1分配人员  2发起活动")
    private Integer form;
@@ -113,13 +113,14 @@
    @ApiModelProperty("反馈图片集合，逗号分隔")
    private String feedbackPhotoPathList;

    @ApiModelProperty("操作类型 1 审核通过 2驳回 3分配人员 4发起活动 5反馈")
    @ApiModelProperty(value = "操作类型 1 审核通过 2驳回 3分配人员 4发起活动 5反馈",example = "1")
    private Integer type;

    @ApiModelProperty(value = "小程序请求 1 是 0 不是",hidden = true)
    private Integer isApplets;

    @ApiModelProperty(value = "是否点赞 1 是 0 不是")
    @ApiModelProperty(value = "是否点赞 1 是 0 不是",example = "1")
    private Integer haveGiveThumbsUp;

}


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -218,4 +218,12 @@
     */
    @PostMapping("adddynamicuser")
    R addDynamicUser(@RequestParam("id") Long id, @RequestParam("userId")Long userId);

    /**
     * 审核、反馈随手拍
     * @param comActEasyPhotoVO 操作参数
     * @return 操作结果
     */
    @PostMapping("puteasyphotostatus")
    R putEasypHotoStatus(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO);
}

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/community/ComActMicroWishVO.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/service/community/CommunityService.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityAPI.java

@@ -238,7 +238,7 @@
    }

    @ApiOperation(value = "审核、分配、反馈心愿")
    @PutMapping("putlmicrowish")
    @PutMapping("putmicrowish")
    public R putlMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO) {
        Long id = comActMicroWishVO.getId();
        if (ObjectUtils.isEmpty(id)) {
@@ -260,7 +260,20 @@
        return r;
    }


    @ApiOperation(value = "审核、反馈随手拍")
    @PutMapping("puteasyphoto")
    public R putEasypHotoStatus(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
        Integer type = comActEasyPhotoVO.getType();
        if (null==type||type>3||type<1) {
            return R.fail("操作类型错误");
        }
        Long id = comActEasyPhotoVO.getId();
        if (ObjectUtils.isEmpty(id)) {
            return R.fail("随手拍主键不能为空");
        }
        R r = communityService.putEasypHotoStatus(comActEasyPhotoVO);
        return r;
    }




 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java

@@ -440,8 +440,29 @@
     * @return 操作结果
     */
    @PostMapping("putmicrowish")
    R putMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO){
    public R putMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO){
        return comActMicroWishService.comActMicroWishVO(comActMicroWishVO);
    }

    /**
     * 新增社区动态浏览记录
     * @param id 动态主键
     * @param userId 登录用户id
     * @return 新增结果
     */
    @PostMapping("adddynamicuser")
    public R addDynamicUser(@RequestParam("id") Long id, @RequestParam("userId")Long userId){
        return comActDynService.addDynamicUser(id,userId);
    }

    /**
     * 审核反馈随手拍
     * @param comActEasyPhotoVO 操作参数
     * @return 操作结果
     */
    @PostMapping("puteasyphotostatus")
    public R putEasypHotoStatus(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO){
        return comActEasyPhotoService.putEasypHotoStatus(comActEasyPhotoVO);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDynDAO.java

@@ -46,7 +46,7 @@
            "AND #{comActDynVO.publishAtEnd}" +
            " </if> " +
            " group by d.id  "+
            " order by d.is_topping , d.create_at desc "+
            " order by d.is_topping desc, d.create_at desc "+
            "</script>")
    IPage<ComActDynVO> pageDynamic(Page page, @Param("comActDynVO") ComActDynVO comActDynVO);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java

@@ -27,6 +27,7 @@
            "p.happen_addr,\n" +
            "su.`name` handler_name,\n" +
            "p.`status`,\n" +
            "p.`detail`,\n" +
            "p.create_at,\n" +
            "p.examine_at \n" +
            "FROM\n" +
@@ -36,7 +37,7 @@
            "<if test='comActEasyPhotoVO.sponsorName != null and comActEasyPhotoVO.sponsorName.trim() != &quot;&quot;'>" +
            "AND u.`name` = #{comActEasyPhotoVO.sponsorName} \n" +
            " </if> " +
            "JOIN sys_user su ON p.handler_id = su.user_id \n" +
            "left JOIN sys_user su ON p.handler_id = su.user_id \n" +
            "<if test='comActEasyPhotoVO.handlerName != null and comActEasyPhotoVO.handlerName.trim() != &quot;&quot;'>" +
            "AND su.`name` = #{comActEasyPhotoVO.handlerName} \n" +
            " </if> " +
@@ -44,7 +45,7 @@
            "<if test='comActEasyPhotoVO.happenAddr != null and comActEasyPhotoVO.happenAddr.trim() != &quot;&quot;'>" +
            "AND p.happen_addr = #{comActEasyPhotoVO.happenAddr} \n" +
            " </if> " +
            "<if test='comActEasyPhotoVO.status != null '>" +
            "<if test='comActEasyPhotoVO.status != null and comActEasyPhotoVO.status!=0' >" +
            "AND p.`status` = #{comActEasyPhotoVO.status} \n" +
            " </if> " +
            "<if test='comActEasyPhotoVO.createBegin != null '>" +
@@ -64,6 +65,8 @@
            "u.`image_url`,\n" +
            "u.phone,\n" +
            "p.detail,\n" +
            "p.status,\n" +
            "p.is_hide,\n" +
            "p.happen_addr,\n" +
            "su.`name`,\n" +
            "p.handle_result,\n" +

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java

@@ -26,7 +26,7 @@
            "w.sponsor_phone,\n" +
            "w.wish_name,\n" +
            "w.`status`,\n" +
            "count(wu.id)start_num,\n" +
            "count(wu.id)star_num,\n" +
            "w.`detail`,\n" +
            "w.form,\n" +
            "su.`name` responsible_name,\n" +
@@ -48,7 +48,7 @@
            "<if test='comActMicroWishVO.sponsorPhone != null and comActMicroWishVO.sponsorPhone.trim() != &quot;&quot;'>" +
            "AND w.sponsor_phone = #{comActMicroWishVO.sponsorPhone} \n" +
            " </if> " +
            "<if test='comActMicroWishVO.status != null '>" +
            "<if test='comActMicroWishVO.status != null and comActMicroWishVO.status!=0 '>" +
            "AND w.`status` = #{comActMicroWishVO.status} \n" +
            " </if> " +
            "<if test='comActMicroWishVO.createBegin != null '>" +

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoDO.java

@@ -1,6 +1,7 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.*;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;
@@ -76,9 +77,15 @@
    /**
     * 社区id
     */
    private Long community_id;
    private Long communityId;
    /**
     * 是否匿名发布
     */
    private Integer isHide;

    /**
     * 随手拍是否需要反馈
     * 0 不需要 1 需要
     */
    private Integer isNeedFeedBack;
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActDynService.java

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActDynVO;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
import com.panzhihua.service_community.model.dos.ComActDynDO;

/**
@@ -24,4 +25,12 @@
     * @return 详情
     */
    R detailDynamic(Long id);
    /**
     * 新增社区动态浏览记录
     * @param id 动态主键
     * @param userId 登录用户id
     * @return 新增结果
     */
    R addDynamicUser(Long id, Long userId);

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActEasyPhotoService.java

@@ -37,4 +37,10 @@
     * @return 操作结果
     */
    R putEasyPhoto(ComActEasyPhotoVO comActEasyPhotoVO);
    /**
     * 审核反馈随手拍
     * @param comActEasyPhotoVO 操作参数
     * @return 操作结果
     */
    R putEasypHotoStatus(ComActEasyPhotoVO comActEasyPhotoVO);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.java

@@ -17,6 +17,7 @@
import org.springframework.util.ObjectUtils;

import javax.annotation.Resource;
import java.util.Date;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -71,4 +72,30 @@
        comActDynVO.setReadNum(count);
        return R.ok(comActDynVO);
    }

    /**
     * 新增社区动态浏览记录
     *
     * @param id     动态主键
     * @param userId 登录用户id
     * @return 新增结果
     */
    @Override
    public R addDynamicUser(Long id, Long userId) {
        ComActDynUserDO comActDynUserDO = comActDynUserDAO.selectOne(new QueryWrapper<ComActDynUserDO>().lambda().eq(ComActDynUserDO::getDynId, id).eq(ComActDynUserDO::getUserId, userId));
        if (ObjectUtils.isEmpty(comActDynUserDO)) {
            comActDynUserDO=new ComActDynUserDO();
            comActDynUserDO.setCreateAt(new Date());
            comActDynUserDO.setDynId(id);
            comActDynUserDO.setUserId(userId);
            int insert = comActDynUserDAO.insert(comActDynUserDO);
            if (insert>0) {
                return R.ok();
            }
            return R.fail();
        }else{
            return R.ok();
        }

    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java

@@ -141,4 +141,42 @@
        }
        return R.fail();
    }

    /**
     * 审核反馈随手拍
     *
     * @param comActEasyPhotoVO 操作参数
     * @return 操作结果
     */
    @Override
    public R putEasypHotoStatus(ComActEasyPhotoVO comActEasyPhotoVO) {
        Integer type = comActEasyPhotoVO.getType();
//        操作类型 1审核通过 2驳回  3反馈
        ComActEasyPhotoDO cmActEasyPhotoDO=new ComActEasyPhotoDO();
        cmActEasyPhotoDO.setId(comActEasyPhotoVO.getId());
        int isNeedFeedBack = comActEasyPhotoVO.getIsNeedFeedBack().intValue();
        switch (type){
            case 1:
                if (isNeedFeedBack==1) {
                    cmActEasyPhotoDO.setStatus(2);//进行中
                }else{
                    cmActEasyPhotoDO.setStatus(4);//已完成
                }
                break;
            case 2:
                cmActEasyPhotoDO.setStatus(3);//已驳回
                break;
            case 3:
                cmActEasyPhotoDO.setHandleResult(comActEasyPhotoVO.getHandleResult());
                cmActEasyPhotoDO.setHandlePhotoList(comActEasyPhotoVO.getHandlePhotoList());
                cmActEasyPhotoDO.setStatus(4);//已完成
                break;
            default:break;
        }
        int update = comActEasyPhotoDAO.updateById(cmActEasyPhotoDO);
        if (update>0) {
            return R.ok();
        }
        return R.fail();
    }
}