小程序,社区活动,微心愿,随手拍完成未测试

huanghongfa

2020-12-10 f76377ffd111434d90c5aaf5507cd33a982d4aa6

小程序,社区活动,微心愿,随手拍完成未测试

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

New file
@@ -0,0 +1,47 @@
package com.panzhihua.applets.api;

import com.panzhihua.common.constants.FtpConstants;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.utlis.SFTPUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;

import javax.servlet.http.HttpServletRequest;
import java.io.InputStream;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 公共接口
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-10 15:41
 **/
@Slf4j
@RestController
@RequestMapping("/common/")
@Api(tags = {"公共接口"})
public class CommonApi {

    @ApiOperation(value = "上传照片")
    @PostMapping(value = "uploadimage",consumes = "multipart/*",headers = "content-type=multipart/form-date")
    public R uploadImage(@RequestParam MultipartFile file, HttpServletRequest request) {
        String name = file.getOriginalFilename();
        try {
            SFTPUtil sftp = new SFTPUtil();
            sftp.login();
            InputStream is = file.getInputStream();
            sftp.uploadMore(FtpConstants.FTPFILEPATH_IDCARD, name, is);
            sftp.logout();
            return R.ok(FtpConstants.HTTP_URL+"/idcard/" + name);
        } catch (Exception e) {
            log.error("上传照片失败【{}】", e.getMessage());
            return R.fail();
        }

    }
}

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

New file
@@ -0,0 +1,78 @@
package com.panzhihua.applets.api;

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ActivitySignVO;
import com.panzhihua.common.model.vos.community.ComActActivityVO;
import com.panzhihua.common.model.vos.community.ComActDynVO;
import com.panzhihua.common.model.vos.community.SignactivityVO;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 社区服务
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-10 10:04
 **/
@RestController
@RequestMapping("/community/")
@Api(tags = {"社区服务"})
public class CommunityApi extends BaseController {
    @Resource
    private CommunityService communityService;

    @ApiOperation(value = "分页获取社区动态",response = ComActDynVO.class)
    @PostMapping("pagedynamic")
    public R pageDynamic(@RequestBody ComActDynVO comActDynVO){
        Long communityId = this.getCommunityId();
        comActDynVO.setCommunityId(communityId);
        return communityService.pageDynamic(comActDynVO);
    }

    @ApiOperation(value = "社区动态详情",response = ComActDynVO.class)
    @GetMapping("detaildynamic")
    @ApiImplicitParam(name ="id",value = "社区动态主键",required = true)
    public R detailDynamic(@RequestParam("id") Long id){//todo 增加微信分享接口
        return communityService.detailDynamic(id);
    }

    @ApiOperation(value = "分页查询社区活动",response = ComActActivityVO.class)
    @PostMapping("pageactivity")
    public R pageActivity(@RequestBody ComActActivityVO comActActivityVO){
        return communityService.pageActivity(comActActivityVO);
    }

    @ApiOperation(value = "社区活动/志愿者活动详情",response = ComActActivityVO.class)
    @GetMapping("detailactivity")
    @ApiImplicitParam(name ="id",value = "社区活动主键",required = true)
    public R detailActivity(@RequestParam("id") Long id){
        Long userId = this.getUserId();
        return communityService.detailActivity(id,userId);
    }

    @ApiOperation(value = "报名/取消报名社区活动")
    @PutMapping("signactivity")
    public R signActivity(@RequestBody SignactivityVO signactivityVO){
        Long userId = this.getUserId();
        signactivityVO.setUserId(userId);
        return communityService.signActivity(signactivityVO);
    }

    @ApiOperation(value = "活动人员列表",response = ActivitySignVO.class)
    @ApiImplicitParam(name ="id",value = "社区活动主键",required = true)
    @PostMapping("listactivitysign")
    public R listActivitySign(@RequestParam("id") Long id){
        ActivitySignVO activitySignVO=new ActivitySignVO();
        activitySignVO.setActivityId(id);
        return communityService.listActivitySign(activitySignVO);
    }



}

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

File was deleted

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

New file
@@ -0,0 +1,120 @@
package com.panzhihua.applets.api;

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
import com.panzhihua.common.model.vos.community.ComActMicroWishVO;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 首页
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-10 14:39
 **/
@RestController
@RequestMapping("/index/")
@Api(tags = {"首页"})
public class IndexApi extends BaseController {
    @Resource
    private CommunityService communityService;

    @ApiOperation("分页展示社区随手拍")
    @PostMapping("pageeasyphoto")
    public R pageEasyPhoto (){
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        Long communityId = loginUserInfo.getCommunityId();
        Long userId = loginUserInfo.getUserId();
        ComActEasyPhotoVO comActEasyPhotoVO=new ComActEasyPhotoVO();
        comActEasyPhotoVO.setCommunityId(communityId);
        comActEasyPhotoVO.setSponsorId(userId);
        comActEasyPhotoVO.setStatus(4);
        return communityService.pageEasyPhoto(comActEasyPhotoVO);
    }

    @ApiOperation("上传随手拍")
    @PostMapping("easyphoto")
    public R addEasyPhoto (@RequestBody ComActEasyPhotoVO comActEasyPhotoVO){
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        Long communityId = loginUserInfo.getCommunityId();
        Long userId = loginUserInfo.getUserId();
        comActEasyPhotoVO.setCommunityId(communityId);
        comActEasyPhotoVO.setSponsorId(userId);
        comActEasyPhotoVO.setStatus(1);
        return communityService.addEasyPhoto(comActEasyPhotoVO);
    }

    @ApiOperation("随手拍详情")
    @GetMapping("detaileasyphoto")
    @ApiImplicitParam(name = "id",value = "随手拍主键")
    public R detailEasyPhoto (@RequestParam("id") Long id){
        Long userId = this.getUserId();
        return communityService.detailEasyPhoto(id,userId);
    }

    @ApiOperation("点赞/取消点赞随手拍")
    @PutMapping("easyphoto")
    public R putEasyPhoto (@RequestBody ComActEasyPhotoVO comActEasyPhotoVO){
        Long id = comActEasyPhotoVO.getId();
        if (ObjectUtils.isEmpty(id)) {
            return R.fail("随手拍主键不能为空");
        }
        Long userId = this.getUserId();
        comActEasyPhotoVO.setSponsorId(userId);
        return communityService.putEasyPhoto(comActEasyPhotoVO);
    }


    @ApiOperation("分页展示社区微心愿")
    @PostMapping("pagemicrowish")
    public R pageMicroWish (){
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        Long communityId = loginUserInfo.getCommunityId();
        Long userId = loginUserInfo.getUserId();
        ComActMicroWishVO comActMicroWishVO=new ComActMicroWishVO();
        comActMicroWishVO.setCommunityId(communityId);
        comActMicroWishVO.setIsApplets(1);
        comActMicroWishVO.setResponsibleId(userId);//责任人暂时放登录用户id
        return communityService.pageMicroWish(comActMicroWishVO);
    }

    @ApiOperation("发布微心愿")
    @PostMapping("microwish")
    public R addMicroWish (@RequestBody ComActMicroWishVO comActMicroWishVO){
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        Long communityId = loginUserInfo.getCommunityId();
        Long userId = loginUserInfo.getUserId();
        comActMicroWishVO.setCommunityId(communityId);
        comActMicroWishVO.setSponsorId(userId);
        return communityService.addMicroWish(comActMicroWishVO);
    }

    @ApiOperation("心愿详情")
    @GetMapping("microwish")
    @ApiImplicitParam(name = "id",value = "微心愿主键")
    public R detailMicroWish (@RequestParam("id")Long id){
        Long userId = this.getUserId();
        return communityService.detailMicroWish(id,userId);
    }

    @ApiOperation("点赞/取消点赞微心愿")
    @PutMapping("microwish")
    public R putMicroWish (@RequestBody ComActMicroWishVO comActMicroWishVO){
        Long id = comActMicroWishVO.getId();
        if (ObjectUtils.isEmpty(id)) {
            return R.fail("微心愿主键不能为空");
        }
        Long userId = this.getUserId();
        comActMicroWishVO.setSponsorId(userId);//发起人字段暂时存放userId
        return communityService.putMicroWish(comActMicroWishVO);
    }

}

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

File was deleted

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

@@ -1,5 +1,7 @@
package com.panzhihua.applets.api;

import com.panzhihua.common.model.vos.community.ComActActivityVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.exceptions.UnAuthenticationException;
@@ -9,6 +11,7 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

@@ -22,10 +25,12 @@
 **/
@RestController
@RequestMapping("/user/")
@Api(tags = {"用户模块"})
@Api(tags = {"我的模块"})
public class UserApi extends BaseController {
    @Resource
    private UserService userService;
    @Resource
    private CommunityService communityService;

    @ApiOperation(value = "当前登录用户信息",response = LoginUserInfoVO.class)
    @GetMapping("info")
@@ -38,4 +43,14 @@
        R<LoginUserInfoVO> r = userService.getUserInfoByUserId(userId + "");
        return r;
    }

    @ApiOperation(value = "分页展示我的活动",response = ComActActivityVO.class)
    @GetMapping("pagemyactivity")
    public R pageMyActivity(@RequestBody ComActActivityVO comActActivityVO){
        Long userId = this.getUserId();
//        todo 我的活动包括普通社区活动、志愿者活动、党建活动
        comActActivityVO.setSponsorId(userId);//登录人id 暂时存入负责人字段
        R r = communityService.pageMyActivity(comActActivityVO);
        return r;
    }
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java

@@ -20,7 +20,7 @@
    @ApiModelProperty("user_id")
    private Long userId;

    @ApiModelProperty("会话密钥")
    @ApiModelProperty("微信会话密钥")
    private String sessionKey;

    @ApiModelProperty("用户在开放平台的唯一标识符")
@@ -78,11 +78,11 @@
    private String job;


    @ApiModelProperty("是否志愿者 1 是 2 否")
    @ApiModelProperty("是否志愿者 0否 1 是")
    private Integer isVolunteer;


    @ApiModelProperty("是否党员 1 是 2 否")
    @ApiModelProperty("是否党员 0 否 1 是")
    private Integer isPartymember;



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

@@ -26,4 +26,6 @@
    private String phone;
    @ApiModelProperty("报名时间")
    private String createAt;
    @ApiModelProperty("人员头像")
    private String imageUrl;
}

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

@@ -72,11 +72,17 @@
    @ApiModelProperty("志愿者人数上限")
    private Integer volunteerMax;

    @ApiModelProperty("当前志愿者数量")
    private Integer volunteerNow;

    @ApiModelProperty("参与者人数下线")
    private Integer participantMin;

    @ApiModelProperty("参与者人数上限")
    private Integer participantMax;

    @ApiModelProperty("当前参与者数量")
    private Integer participantNow;

    @ApiModelProperty("活动封面")
    @NotNull
@@ -109,7 +115,16 @@
    private Long pageSize;

    @ApiModelProperty(value = "取消原因")
    @Length(max = 200,message = "取消原因限制200字以内")
    private String cancelRenson;

    @ApiModelProperty(value = "是否已经报名 1 已报名 0 未报名")
    private Integer isSign;

    @ApiModelProperty(value = "当前登录者id",hidden = true)
    private Integer userId;

    @ApiModelProperty("活动参加人员集合")
    private List<ActivitySignVO>activitySignVOList;


}

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

@@ -33,7 +33,7 @@
    private Integer isTopping;

    @ApiModelProperty("发布时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date publishAt;

    @ApiModelProperty("创建时间")
@@ -60,4 +60,7 @@
    @ApiModelProperty("发布搜索结束时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date publishAtEnd;

    @ApiModelProperty("动态内容富文本")
    private String content;
}

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

@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.models.auth.In;
import lombok.Data;

import java.util.Date;
@@ -29,8 +30,11 @@
    @ApiModelProperty("发生地址")
    private String happenAddr;

    @ApiModelProperty("发起人头像")
    private String imageUrl;

    @ApiModelProperty("状态 1待审核   2进行中 3已驳回 4已完成")
    private boolean status;
    private Integer status;

    @ApiModelProperty("处理人id")
    private Long handlerId;
@@ -69,9 +73,18 @@
    private Date examineAt;

    @ApiModelProperty("创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date createAt;

    @ApiModelProperty("社区id")
    private Long communityId;

    @ApiModelProperty("点赞数量")
    private Integer giveThumbsUpNum;

    @ApiModelProperty("是否匿名发布")
    private Integer isHide;

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

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

@@ -30,6 +30,9 @@
    @ApiModelProperty("发起人名字")
    private String sponsorName;

    @ApiModelProperty("发起人头像")
    private String imageUrl;

    @ApiModelProperty("微心愿名称")
    private String wishName;

@@ -60,9 +63,13 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;

    @ApiModelProperty("审核/分配 时间")
    @ApiModelProperty("审核 时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date examineAt;

    @ApiModelProperty("分配 时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date distributionAt;

    @ApiModelProperty("评分")
    private Integer score;
@@ -88,8 +95,8 @@
    @ApiModelProperty("用户评价时间")
    private Date evaluateAt;

    @ApiModelProperty("心愿完成时间")
    private Date finishAt;
    @ApiModelProperty("反馈时间")
    private Date feedbackAt;

    @ApiModelProperty("完成情况图片列表，逗号分隔")
    private String finishPhotoPathList;
@@ -108,5 +115,11 @@

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

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

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


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

New file
@@ -0,0 +1,27 @@
package com.panzhihua.common.model.vos.community;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 报名活动
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-10 13:59
 **/
@Data
@ApiModel("报名活动")
public class SignactivityVO {

    @ApiModelProperty(value = "类型 1 报名 2 取消报名",example = "1",required = true)
    private Integer type;
    @ApiModelProperty(value = "是否志愿者 0 否 1 是",example = "1",required = true)
    private Integer isVolunteer;
    @ApiModelProperty(value = "活动主键",required = true)
    private Long activityId;
    @ApiModelProperty(value = "当前登录用户id",hidden = true)
    private Long userId;


}

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

@@ -3,7 +3,6 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.*;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
@@ -67,10 +66,11 @@
    /**
     * 活动详情
     * @param id 活动id
     * @param userId 当前登录者id
     * @return 详情
     */
    @PostMapping("inforactivity")
    R inforActivity(@RequestParam("id") Long id);
    @PostMapping("detailactivity")
    R detailActivity(@RequestParam("id") Long id, @RequestParam("userId")Long userId);

    /**
     * 活动报名名单
@@ -118,7 +118,7 @@
     * @return 详情
     */
    @PostMapping("detaildynamic")
    R detailDynamic(@RequestParam("id") String id);
    R detailDynamic(@RequestParam("id") Long id);

    /**
     * 分页查询随手拍
@@ -131,10 +131,11 @@
    /**
     * 随手拍详情
     * @param id 随手拍主键
     * @param userId 登录用户id
     * @return 详情内容
     */
    @PostMapping("detaileasyphoto")
    R detailEasyPhoto(@RequestParam("id")Long id);
    R detailEasyPhoto(@RequestParam("id") Long id, @RequestParam("userId")Long userId);

    /**
     * 分页查询微心愿
@@ -147,10 +148,11 @@
    /**
     * 心愿详情
     * @param id 查询主键
     * @param userId 登录用户id
     * @return 心愿内容
     */
    @PostMapping("detailmicrowish")
    R detailMicroWish(@RequestParam("id")Long id);
    R detailMicroWish(@RequestParam("id") Long id, @RequestParam("userId")Long userId);

    /**
     * 审核、分配、反馈心愿
@@ -159,4 +161,52 @@
     */
    @PostMapping("putlmicrowish")
    R putlMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO);

    /**
     * 分页展示我的所有活动 时间倒序排列
     * @param comActActivityVO 分页参数
     * @return 分页集合
     */
    @PostMapping("pagemyactivity")
    R pageMyActivity(@RequestBody ComActActivityVO comActActivityVO);

    /**
     * 报名/取消报名社区活动
     * @param signactivityVO 报名参数
     * @return 报名 取消报名 结果
     */
    @PostMapping("signactivity")
    R signActivity(@RequestBody SignactivityVO signactivityVO);

    /**
     * 上传随手拍
     * @param comActEasyPhotoVO 上传数据
     * @return 上传结果
     */
    @PostMapping("addeasyphoto")
    R addEasyPhoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO);

    /**
     * 发布微心愿
     * @param comActMicroWishVO 发布内容
     * @return 发布结果
     */
    @PostMapping("addmicrowish")
    R addMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO);

    /**
     * 点赞/取消点赞随手拍
     * @param comActEasyPhotoVO 操作参数
     * @return 操作结果
     */
    @PostMapping("puteasyphoto")
    R putEasyPhoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO);

    /**
     * 点赞/取消点赞微心愿
     * @param comActMicroWishVO 操作参数
     * @return 操作结果
     */
    @PostMapping("putmicrowish")
    R putMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO);
}

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/LoginUserInfoVO.class

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

 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/model/vos/community/SignactivityVO.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

@@ -114,12 +114,13 @@
    }

    @ApiOperation(value = "活动详情")
    @GetMapping("inforactivity")
    public R inforActivity(@RequestParam("id") Long id) {
    @GetMapping("detailactivity")
    public R detailActivity(@RequestParam("id") Long id) {
        Long userId = this.getUserId();
        if (ObjectUtils.isEmpty(id)) {
            return R.fail("活动id主键不能为空");
        }
        R r = communityService.inforActivity(id);
        R r = communityService.detailActivity(id, userId);
        return r;
    }

@@ -178,7 +179,8 @@

    @ApiOperation(value = "社区动态详情")
    @GetMapping("detaildynamic")
    public R detailDynamic(@RequestParam("id") String id) {
    @ApiImplicitParam(name ="id",value = "社区动态主键",required = true)
    public R detailDynamic(@RequestParam("id") Long id) {
        R r = communityService.detailDynamic(id);
        return r;
    }
@@ -196,7 +198,8 @@
    @ApiOperation(value = "随手拍详情")
    @GetMapping("easyphoto")
    public R detailEasyPhoto(@RequestParam("id")Long id) {
        R r = communityService.detailEasyPhoto(id);
        Long userId = this.getUserId();
        R r = communityService.detailEasyPhoto(id, userId);
        return r;
    }

@@ -212,7 +215,8 @@
    @ApiOperation(value = "心愿详情")
    @GetMapping("detailmicrowish")
    public R detailMicroWish(@RequestParam("id")Long id) {
        R r = communityService.detailMicroWish(id);
        Long userId = this.getUserId();
        R r = communityService.detailMicroWish(id,userId);
        return r;
    }


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

@@ -5,9 +5,11 @@
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.service_community.model.dos.ComActActPrizeDO;
import com.panzhihua.service_community.model.dos.ComActDynDO;
import com.panzhihua.service_community.model.dos.ComActMicroWishDO;
import com.panzhihua.service_community.service.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.data.domain.Page;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
@@ -131,7 +133,29 @@
     */
    @PostMapping("pageActivity")
    public R pageActivity(@RequestBody ComActActivityVO comActActivityVO) {
        return comActActivityService.pageActivity(comActActivityVO);
        R r = comActActivityService.pageActivity(comActActivityVO);
        if (r.isOk()) {
            Page<ComActActivityVO> page = (Page<ComActActivityVO>)r.getData();
            List<ComActActivityVO> content = page.getContent();
            if (!ObjectUtils.isEmpty(content)) {
                List<ComActActPrizeVO> comActActPrizeVOList=new ArrayList<>();
                content.forEach(comActActivityVO1 -> {
                    Long id = comActActivityVO1.getId();
                    List<ComActActPrizeDO> list = comActActPrizeService.list(new QueryWrapper<ComActActPrizeDO>().lambda().eq(ComActActPrizeDO::getActivityId, id));
                    if (!ObjectUtils.isEmpty(list)) {
                        list.forEach(comActActPrizeDO -> {
                            ComActActPrizeVO comActActPrizeVO=new ComActActPrizeVO();
                            BeanUtils.copyProperties(comActActPrizeDO,comActActPrizeVO);
                            comActActPrizeVOList.add(comActActPrizeVO);
                        });
                    }
                    comActActivityVO1.setComActActPrizeVOList(comActActPrizeVOList);
                    comActActPrizeVOList.clear();
                });
            }

        }
        return r;
    }

    /**
@@ -159,9 +183,9 @@
     * @param id 活动id
     * @return 详情
     */
    @PostMapping("inforactivity")
    public R inforActivity(@RequestParam("id") Long id){
        ComActActivityVO comActActivityVO = comActActivityService.inforActivity(id);
    @PostMapping("detailactivity")
    public R detailActivity(@RequestParam("id") Long id,@RequestParam("userId")Long userId){
        ComActActivityVO comActActivityVO = comActActivityService.inforActivity(id,userId);
        if (ObjectUtils.isEmpty(comActActivityVO)) {
            return R.fail("活动不存在");
        }
@@ -174,6 +198,13 @@
                comActActPrizeVOS.add(comActActPrizeVO);
            });
            comActActivityVO.setComActActPrizeVOList(comActActPrizeVOS);
        }
        ActivitySignVO activitySignVO=new ActivitySignVO();
        activitySignVO.setActivityId(id);
        R r = comActActivityService.listActivitySign(activitySignVO);
        if (r.isOk()) {
            List<ActivitySignVO> activitySignVOS=(List<ActivitySignVO>)r.getData();
            comActActivityVO.setActivitySignVOList(activitySignVOS);
        }
        return R.ok(comActActivityVO);
    }
@@ -286,7 +317,7 @@
     * @return 详情
     */
    @PostMapping("detaildynamic")
    public R detailDynamic(@RequestParam("id") String id){
    public R detailDynamic(@RequestParam("id") Long id){
        return comActDynService.detailDynamic(id);
    }

@@ -304,11 +335,12 @@
    /**
     * 随手拍详情
     * @param id 随手拍主键
     * @param userId 登录用户
     * @return 详情内容
     */
    @PostMapping("detaileasyphoto")
    public R detailEasyPhoto(@RequestParam("id")Long id){
        return comActEasyPhotoService.detailEasyPhoto(id);
    public R detailEasyPhoto(@RequestParam("id")Long id,@RequestParam("userId")Long userId){
        return comActEasyPhotoService.detailEasyPhoto(id,userId);
    }

    /**
@@ -324,11 +356,12 @@
    /**
     * 心愿详情
     * @param id 查询主键
     * @param userId 登录用户id
     * @return 心愿内容
     */
    @PostMapping("detailmicrowish")
    public R detailMicroWish(@RequestParam("id")Long id){
        return comActMicroWishService.detailMicroWish(id);
    public R detailMicroWish(@RequestParam("id")Long id,@RequestParam("userId")Long userId){
        return comActMicroWishService.detailMicroWish(id,userId);
    }

    /**
@@ -338,8 +371,73 @@
     */
    @PostMapping("putlmicrowish")
    public R putlMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO){
        R r = comActMicroWishService.putlMicroWish(comActMicroWishVO);
        return r;
        return comActMicroWishService.putlMicroWish(comActMicroWishVO);
    }

    /**
     * 分页展示我的所有活动 时间倒序排列
     * @param comActActivityVO 分页参数
     * @return 分页集合
     */
    @PostMapping("pagemyactivity")
    public R pageMyActivity(@RequestBody ComActActivityVO comActActivityVO){
        return comActActivityService.pageMyActivity(comActActivityVO);
    }

    /**
     * 报名/取消报名社区活动
     * @param signactivityVO 报名参数
     * @return 报名 取消报名 结果
     */
    @PostMapping("signactivity")
    public R signActivity(@RequestBody SignactivityVO signactivityVO){
        return comActActivityService.signActivity(signactivityVO);
    }

    /**
     * 上传随手拍
     * @param comActEasyPhotoVO 上传数据
     * @return 上传结果
     */
    @PostMapping("addeasyphoto")
    public R addEasyPhoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO){
        return comActEasyPhotoService.addEasyPhoto(comActEasyPhotoVO);
    }

    /**
     * 发布微心愿
     * @param comActMicroWishVO 发布内容
     * @return 发布结果
     */
    @PostMapping("addmicrowish")
    public R addMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO){
        ComActMicroWishDO comActMicroWishDO=new ComActMicroWishDO();
        BeanUtils.copyProperties(comActMicroWishVO,comActMicroWishDO);
        boolean save = comActMicroWishService.save(comActMicroWishDO);
        if (save) {
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 点赞/取消点赞随手拍
     * @param comActEasyPhotoVO 操作参数
     * @return 操作结果
     */
    @PostMapping("puteasyphoto")
    public R putEasyPhoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO){
        return comActEasyPhotoService.putEasyPhoto(comActEasyPhotoVO);
    }

    /**
     * 点赞/取消点赞微心愿
     * @param comActMicroWishVO 操作参数
     * @return 操作结果
     */
    @PostMapping("putmicrowish")
    R putMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO){
        return comActMicroWishService.comActMicroWishVO(comActMicroWishVO);
    }

}

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

@@ -49,6 +49,7 @@
            "<if test='identity != null and identity.trim() != &quot;&quot; and identity=居民'>" +
            "AND is_partymember = 2 and is_volunteer=2  \n" +
            " </if> " +
            " order by a.create_at desc "+
            "</script>")
    List<ActivitySignVO> listActivitySign(ActivitySignVO activitySignVO);
}

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

@@ -38,12 +38,17 @@
            "a.publish_at,\n" +
            "a.begin_at,\n" +
            "a.end_at,\n" +
            "a.volunteer_max,\n" +
            "count(if(s.is_volunteer=1,s.id,null))volunteer_now,\n"+
            "count(if(s.is_volunteer=0,s.id,null))participant_now,\n"+
            "a.participant_max,\n" +
            "a.sign_up_begin,\n" +
            "a.sign_up_end\n" +
            "FROM\n" +
            "com_act_activity a \n" +
            "join sys_user u on a.sponsor_id=u.user_id\n" +
            " <where>" +
            "left join com_act_act_sign s on a.id=s.activity_id \n"+
            " where a.community_id=#{comActActivityVO.communityId}" +
            "<if test='comActActivityVO.activityName != null and comActActivityVO.activityName.trim() != &quot;&quot;'>" +
            " and a.activity_name = #{comActActivityVO.activityName} \n" +
            " </if> " +
@@ -53,9 +58,32 @@
            "<if test='comActActivityVO.beginAt != null and comActActivityVO.beginAt.trim() != &quot;&quot;'>" +
            "AND a.begin_at <![CDATA[ >= ]]> #{comActActivityVO.beginAt} AND a.end_at <![CDATA[ <= ]]> #{comActActivityVO.endAt} \n" +
            " </if> " +
            " </where>" +
            " group by a.id "+
            "</script>")
    IPage<ComActActivityVO> pageActivity( Page page, @Param("comActActivityVO") ComActActivityVO comActActivityVO);
    @Select("SELECT u.name sponsorName,a.* FROM com_act_activity a join sys_user u on a.sponsor_id=u.user_id")

    @Select("SELECT \n" +
            "u.name sponsorName,\n" +
            "count(if(s.is_volunteer=1,s.id,null))volunteer_now,\n"+
            "count(if(s.is_volunteer=0,s.id,null))participant_now,\n"+
            "a.* \n" +
            "FROM \n" +
            "com_act_activity a \n" +
            "join sys_user u on a.sponsor_id=u.user_id \n"+
            "left join com_act_act_sign s on a.id=s.activity_id \n"+
            "where a.id=#{id} \n"+
            " group by a.id "
    )
    ComActActivityVO inforActivity(Long id);

    @Select("SELECT\n" +
            "a.* \n" +
            "FROM\n" +
            "com_act_act_sign s\n" +
            "JOIN com_act_activity a ON s.activity_id = a.id \n" +
            "WHERE\n" +
            "s.user_id = #{comActActivityVO.sponsorId} \n" +
            "ORDER BY\n" +
            "s.create_at DESC")
    IPage<ComActActivityVO> pageMyActivity(Page page, @Param("comActActivityVO") ComActActivityVO comActActivityVO);
}

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

@@ -42,9 +42,11 @@
            "AND d.`status` = #{comActDynVO.status} \n" +
            " </if> " +
            "<if test='comActDynVO.publishAtBegin != null and comActDynVO.publishAtBegin.trim() != &quot;&quot;'>" +
            "AND d.publish_at BETWEEN '2020-02-03' \n" +
            "AND '2020-12-13'" +
            "AND d.publish_at BETWEEN #{comActDynVO.publishAtBegin} \n" +
            "AND #{comActDynVO.publishAtEnd}" +
            " </if> " +
            " group by d.id  "+
            " order by d.is_topping , 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/ComActDynUserDAO.java

New file
@@ -0,0 +1,15 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.service_community.model.dos.ComActDynUserDO;
import org.apache.ibatis.annotations.Mapper;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 社区动态阅读记录
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-10 10:32
 **/
@Mapper
public interface ComActDynUserDAO extends BaseMapper<ComActDynUserDO> {
}

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

@@ -22,6 +22,8 @@
            "p.id,\n" +
            "u.`name` sponsor_name,\n" +
            "u.phone sponsor_phone,\n" +
            "count(pu.id)giveThumbsUpNum,\n" +
            "u.image_url,\n" +
            "p.happen_addr,\n" +
            "su.`name` handler_name,\n" +
            "p.`status`,\n" +
@@ -30,6 +32,7 @@
            "FROM\n" +
            "com_act_easy_photo p\n" +
            "JOIN sys_user u ON p.sponsor_id = u.user_id \n" +
            "left join  com_act_easy_photo_user pu ON p.id = pu.easy_photo_id \n" +
            "<if test='comActEasyPhotoVO.sponsorName != null and comActEasyPhotoVO.sponsorName.trim() != &quot;&quot;'>" +
            "AND u.`name` = #{comActEasyPhotoVO.sponsorName} \n" +
            " </if> " +
@@ -48,12 +51,17 @@
            "AND p.create_at BETWEEN #{comActEasyPhotoVO.createBegin} \n" +
            "AND #{comActEasyPhotoVO.createEnd}" +
            " </if> " +
            "<if test='comActEasyPhotoVO.sponsorId != null and comActEasyPhotoVO.sponsorId != 0'>" +
            "AND p.sponsor_id =#{comActEasyPhotoVO.sponsorId} \n" +
            " </if> " +
            " group by p.id "+
            "</script>")
    IPage<ComActEasyPhotoVO> pageEasyPhoto(Page page, @Param("comActEasyPhotoVO") ComActEasyPhotoVO comActEasyPhotoVO);
    @Select("SELECT \n" +
            "p.id,\n" +
            "p.create_at,\n" +
            "u.`name`,\n" +
            "u.`image_url`,\n" +
            "u.phone,\n" +
            "p.detail,\n" +
            "p.happen_addr,\n" +

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

New file
@@ -0,0 +1,15 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.service_community.model.dos.ComActEasyPhotoUserDO;
import org.apache.ibatis.annotations.Mapper;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 随手拍点赞
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-10 15:14
 **/
@Mapper
public interface ComActEasyPhotoUserDAO extends BaseMapper<ComActEasyPhotoUserDO> {
}

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

@@ -21,10 +21,12 @@
    @Select("<script> " +
            "SELECT\n" +
            "w.id,\n" +
            "u.NAME sponsor_name,\n" +
            "u.name sponsor_name,\n" +
            "u.image_url ,\n" +
            "w.sponsor_phone,\n" +
            "w.wish_name,\n" +
            "w.`status`,\n" +
            "count(wu.id)start_num,\n" +
            "w.`detail`,\n" +
            "w.start_num,\n" +
            "w.form,\n" +
@@ -33,6 +35,7 @@
            "w.create_at \n" +
            "FROM\n" +
            "com_act_micro_wish w\n" +
            "left join com_act_micro_wish_user wu on w.id=wu.micro_wish_id "+
            "JOIN sys_user u ON w.sponsor_id = u.user_id \n" +
            "<if test='comActMicroWishVO.sponsorName != null and comActMicroWishVO.sponsorName.trim() != &quot;&quot;'>" +
            "AND u.name = #{comActMicroWishVO.sponsorName} \n" +
@@ -53,17 +56,23 @@
            "AND w.create_at BETWEEN #{comActMicroWishVO.createBegin} \n" +
            "AND #{comActMicroWishVO.createEnd}" +
            " </if> " +
            "<if test='comActMicroWishVO.isApplets != null and comActMicroWishVO.isApplets != 0'>" +
            "AND w.status  in (3,6) \n" +
            " </if> " +
            " group by w.id  \n"+
            "ORDER BY w.`status`, w.create_at "+
            "</script>")
    IPage<ComActMicroWishVO> pageMicroWish(Page page, @Param("comActMicroWishVO") ComActMicroWishVO comActMicroWishVO);
    @Select("SELECT\n" +
            "w.id,\n" +
            "w.start_num,\n" +
            "u.NAME sponsor_name,\n" +
            "u.name sponsor_name,\n" +
            "w.create_at,\n" +
            "u.image_url,\n" +
            "w.sponsor_phone,\n" +
            "w.`status`,\n" +
            "w.wish_name,\n" +
            "count(wu.id)startNum,\n" +
            "w.detail,\n" +
            "w.photo_path_list,\n" +
            "su.`name` responsible_name,\n" +
@@ -79,7 +88,10 @@
            "com_act_micro_wish w\n" +
            "JOIN sys_user u ON w.sponsor_id = u.user_id\n" +
            "LEFT JOIN sys_user su ON w.responsible_id = su.user_id \n" +
            "LEFT JOIN com_act_micro_wish_user wu ON w.id = wu.micro_wish_id \n" +
            "WHERE\n" +
            "w.id =#{id}")
            "w.id =#{id}"+
            " group by w.id "
    )
    ComActMicroWishVO detailMicroWish(Long id);
}

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

New file
@@ -0,0 +1,15 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.service_community.model.dos.ComActMicroWishUserDO;
import org.apache.ibatis.annotations.Mapper;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 微心愿点赞
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-10 16:19
 **/
@Mapper
public interface ComActMicroWishUserDAO extends BaseMapper<ComActMicroWishUserDO> {
}

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

@@ -38,5 +38,10 @@
    /**
     * 报名时间
     */
    private Date create_at;
    private Date createAt;
    /**
     * 是否是志愿者
     * 0 不是 1 是
     */
    private Integer isVolunteer;
}

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

@@ -122,4 +122,8 @@
     * 取消原因
     */
    private String cancelReason;
    /**
     * 社区id
     */
    private Long communityId;
}

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

@@ -29,12 +29,6 @@
     * 标题
     */
    private String title;

    /**
     * 阅读数
     */
    private Integer readNum;

    /**
     * 状态
     */
@@ -63,4 +57,8 @@
     * 社区id
     */
    private Long communityId;
    /**
     * 动态内容富文本
     */
    private String content;
}

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

@@ -31,14 +31,14 @@
    private Long sponsorId;

    /**
     * 发生地质
     * 发生地址
     */
    private String happenAddr;

    /**
     * 状态
     * 状态 1待审核   2进行中 3已驳回 4已完成
     */
    private boolean status;
    private Integer status;

    /**
     * 处理人id
@@ -78,4 +78,8 @@
     * 社区id
     */
    private Long community_id;
    /**
     * 是否匿名发布
     */
    private Integer isHide;
}

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

New file
@@ -0,0 +1,39 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 随手拍点赞
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-10 15:12
 **/
@Data
@TableName(value = "com_act_easy_photo_user")
public class ComActEasyPhotoUserDO implements Serializable {
    private static final long serialVersionUID = 1L;

    /**
     * id
     */
    private Long id;

    /**
     * 随手拍主键id
     */
    private Long easyPhotoId;

    /**
     * 用户id
     */
    private Long userId;

    /**
     * 点赞时间
     */
    private Date createAt;
}

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

@@ -47,11 +47,6 @@
    private Integer status;

    /**
     * 集星数
     */
    private Integer startNum;

    /**
     * 形式  1分配人员  2发起活动
     */
    private Integer form;
@@ -70,6 +65,10 @@
     * 审核时间
     */
    private Date examineAt;
    /**
     * 分配时间
     */
    private Date distributionAt;

    /**
     * 评分
@@ -101,9 +100,9 @@
    private Date evaluateAt;

    /**
     * 心愿完成时间
     * 反馈时间
     */
    private Date finishAt;
    private Date feedbackAt;

    /**
     * 完成情况图片列表，逗号分隔

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

New file
@@ -0,0 +1,39 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 微心愿点赞
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-10 16:18
 **/
@Data
@TableName(value = "com_act_micro_wish_user")
public class ComActMicroWishUserDO implements Serializable {
    private static final long serialVersionUID = 1L;

    /**
     * id
     */
    private Long id;

    /**
     * 微心愿id
     */
    private Long microWishId;

    /**
     * 用户id
     */
    private Long userId;

    /**
     * 点赞时间
     */
    private Date createAt;
}

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

@@ -4,6 +4,8 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ActivitySignVO;
import com.panzhihua.common.model.vos.community.ComActActivityVO;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
import com.panzhihua.common.model.vos.community.SignactivityVO;
import com.panzhihua.service_community.model.dos.ComActActivityDO;

/**
@@ -47,13 +49,27 @@
    /**
     * 活动详情
     * @param id 活动id
     * @param userId 当前登录者id
     * @return 详情
     */
    ComActActivityVO inforActivity(Long id);
    ComActActivityVO inforActivity(Long id, Long userId);
    /**
     * 活动报名名单
     * @param activitySignVO 查询参数
     * @return 报名人员集合
     */
    R listActivitySign(ActivitySignVO activitySignVO);
    /**
     * 分页展示我的所有活动 时间倒序排列
     * @param comActActivityVO 分页参数
     * @return 分页集合
     */
    R pageMyActivity(ComActActivityVO comActActivityVO);
    /**
     * 报名/取消报名社区活动
     * @param signactivityVO 报名参数
     * @return 报名 取消报名 结果
     */
    R signActivity(SignactivityVO signactivityVO);

}

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

@@ -23,5 +23,5 @@
     * @param id 动态id
     * @return 详情
     */
    R detailDynamic(String id);
    R detailDynamic(Long id);
}

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

@@ -21,7 +21,20 @@
    /**
     * 随手拍详情
     * @param id 随手拍主键
     * @param userId 登录用户id
     * @return 详情内容
     */
    R detailEasyPhoto(Long id);
    R detailEasyPhoto(Long id, Long userId);
    /**
     * 上传随手拍
     * @param comActEasyPhotoVO 上传数据
     * @return 上传结果
     */
    R addEasyPhoto(ComActEasyPhotoVO comActEasyPhotoVO);
    /**
     * 点赞/取消点赞随手拍
     * @param comActEasyPhotoVO 操作参数
     * @return 操作结果
     */
    R putEasyPhoto(ComActEasyPhotoVO comActEasyPhotoVO);
}

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

@@ -21,13 +21,20 @@
    /**
     * 心愿详情
     * @param id 查询主键
     * @param userId 登录用户id
     * @return 心愿内容
     */
    R detailMicroWish(Long id);
    R detailMicroWish(Long id, Long userId);
    /**
     * 审核、分配、反馈心愿
     * @param comActMicroWishVO 具体操作
     * @return 操作结果
     */
    R putlMicroWish(ComActMicroWishVO comActMicroWishVO);
    /**
     * 点赞/取消点赞微心愿
     * @param comActMicroWishVO 操作参数
     * @return 操作结果
     */
    R comActMicroWishVO(ComActMicroWishVO comActMicroWishVO);
}

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

@@ -7,6 +7,8 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ActivitySignVO;
import com.panzhihua.common.model.vos.community.ComActActivityVO;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
import com.panzhihua.common.model.vos.community.SignactivityVO;
import com.panzhihua.service_community.dao.ComActActSignDAO;
import com.panzhihua.service_community.dao.ComActActivityDAO;
import com.panzhihua.service_community.model.dos.ComActActSignDO;
@@ -17,7 +19,6 @@
import org.springframework.util.ObjectUtils;

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

@@ -137,11 +138,20 @@
     * 活动详情
     *
     * @param id 活动id
     * @param userId
     * @return 详情
     */
    @Override
    public ComActActivityVO inforActivity(Long id) {
    public ComActActivityVO inforActivity(Long id, Long userId) {
        ComActActivityVO comActActivityVO=comActActivityDAO.inforActivity(id);
        if (!ObjectUtils.isEmpty(comActActivityVO)) {
            ComActActSignDO comActActSignDO = comActActSignDAO.selectOne(new QueryWrapper<ComActActSignDO>().lambda().eq(ComActActSignDO::getActivityId, id).eq(ComActActSignDO::getUserId, userId));
            if (!ObjectUtils.isEmpty(comActActSignDO)) {
                comActActivityVO.setIsSign(1);
            }else {

            }
        }
        return comActActivityVO;
    }

@@ -156,4 +166,57 @@
        List<ActivitySignVO> activitySignVOS = comActActSignDAO.listActivitySign(activitySignVO);
        return R.ok(activitySignVOS);
    }

    /**
     * 分页展示我的所有活动 时间倒序排列
     *
     * @param comActActivityVO 分页参数
     * @return 分页集合
     */
    @Override
    public R pageMyActivity(ComActActivityVO comActActivityVO) {
        Page page = new Page<>();
        Long pageNum = comActActivityVO.getPageNum();
        Long pageSize = comActActivityVO.getPageSize();
        if (ObjectUtils.isEmpty(pageNum)||0==pageNum) {
            pageNum = 1l;
        }
        if (ObjectUtils.isEmpty(pageSize)||0==pageSize) {
            pageSize = 10l;
        }
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        IPage<ComActActivityVO> iPage = comActActivityDAO.pageMyActivity(page, comActActivityVO);
        return R.ok(iPage);
    }

    /**
     * 报名/取消报名社区活动
     *
     * @param signactivityVO 报名参数
     * @return 报名 取消报名 结果
     */
    @Override
    public R signActivity(SignactivityVO signactivityVO) {
        Long activityId = signactivityVO.getActivityId();
        Integer type = signactivityVO.getType();
        Long userId = signactivityVO.getUserId();
        Integer isVolunteer = signactivityVO.getIsVolunteer();
        int num=0;
        if (1==type) {
            ComActActSignDO comActActSignDO=new ComActActSignDO();
            comActActSignDO.setActivityId(activityId);
            comActActSignDO.setUserId(userId);
            comActActSignDO.setIsVolunteer(isVolunteer);
            num = comActActSignDAO.insert(comActActSignDO);
        } else {
            num = comActActSignDAO.delete(new QueryWrapper<ComActActSignDO>().lambda().eq(ComActActSignDO::getUserId, userId).eq(ComActActSignDO::getActivityId, activityId).eq(ComActActSignDO::getIsVolunteer, isVolunteer));
        }
        if (num>0) {
            return R.ok();
        }
        return R.fail();
    }


}

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

@@ -1,5 +1,6 @@
package com.panzhihua.service_community.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -7,7 +8,9 @@
import com.panzhihua.common.model.vos.community.ComActActivityVO;
import com.panzhihua.common.model.vos.community.ComActDynVO;
import com.panzhihua.service_community.dao.ComActDynDAO;
import com.panzhihua.service_community.dao.ComActDynUserDAO;
import com.panzhihua.service_community.model.dos.ComActDynDO;
import com.panzhihua.service_community.model.dos.ComActDynUserDO;
import com.panzhihua.service_community.service.ComActDynService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -25,6 +28,8 @@
public class ComActDynServiceImpl extends ServiceImpl<ComActDynDAO, ComActDynDO> implements ComActDynService {
    @Resource
    private ComActDynDAO comActDynDAO;
    @Resource
    private ComActDynUserDAO comActDynUserDAO;
    /**
     * 分页查询社区动态
     *
@@ -55,13 +60,15 @@
     * @return 详情
     */
    @Override
    public R detailDynamic(String id) {
    public R detailDynamic(Long id) {
        ComActDynDO comActDynDO = this.getById(id);
        if (ObjectUtils.isEmpty(comActDynDO)) {
            return R.fail("社区动态不存在");
        }
        Integer count = comActDynUserDAO.selectCount(new QueryWrapper<ComActDynUserDO>().lambda().eq(ComActDynUserDO::getDynId, id));
        ComActDynVO comActDynVO=new ComActDynVO();
        BeanUtils.copyProperties(comActDynDO,comActDynVO);
        comActDynVO.setReadNum(count);
        return R.ok(comActDynVO);
    }
}

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

@@ -1,18 +1,22 @@
package com.panzhihua.service_community.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
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.dao.ComActEasyPhotoDAO;
import com.panzhihua.service_community.dao.ComActEasyPhotoUserDAO;
import com.panzhihua.service_community.model.dos.ComActEasyPhotoDO;
import com.panzhihua.service_community.model.dos.ComActEasyPhotoUserDO;
import com.panzhihua.service_community.service.ComActEasyPhotoService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;

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

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -24,6 +28,8 @@
public class ComActEasyPhotoServiceImpl extends ServiceImpl<ComActEasyPhotoDAO, ComActEasyPhotoDO> implements ComActEasyPhotoService {
    @Resource
    private ComActEasyPhotoDAO comActEasyPhotoDAO;
    @Resource
    private ComActEasyPhotoUserDAO comActEasyPhotoUserDAO;
    /**
     * 分页查询随手拍
     *
@@ -44,6 +50,20 @@
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        IPage<ComActEasyPhotoVO> iPage = comActEasyPhotoDAO.pageEasyPhoto(page, comActEasyPhotoVO);
        List<ComActEasyPhotoVO> records = iPage.getRecords();
        if (!ObjectUtils.isEmpty(records)) {
            records.forEach(comActEasyPhotoVO1 -> {
                Long id = comActEasyPhotoVO1.getId();
                Long sponsorId = comActEasyPhotoVO1.getSponsorId();
                ComActEasyPhotoUserDO comActEasyPhotoUserDO = comActEasyPhotoUserDAO.selectOne(new QueryWrapper<ComActEasyPhotoUserDO>().lambda().eq(ComActEasyPhotoUserDO::getEasyPhotoId, id).eq(ComActEasyPhotoUserDO::getUserId, sponsorId));
                if (ObjectUtils.isEmpty(comActEasyPhotoUserDO)) {
                    comActEasyPhotoVO1.setHaveGiveThumbsUp(0);
                }else {
                    comActEasyPhotoVO1.setHaveGiveThumbsUp(1);
                }
            });
            iPage.setRecords(records);
        }
        return R.ok(iPage);
    }

@@ -51,14 +71,74 @@
     * 随手拍详情
     *
     * @param id 随手拍主键
     * @param userId
     * @return 详情内容
     */
    @Override
    public R detailEasyPhoto(Long id) {
    public R detailEasyPhoto(Long id, Long userId) {
        ComActEasyPhotoVO comActEasyPhotoVO=comActEasyPhotoDAO.detailEasyPhoto(id);
        if (ObjectUtils.isEmpty(comActEasyPhotoVO)) {
            return R.fail();
        }
        ComActEasyPhotoUserDO comActEasyPhotoUserDO = comActEasyPhotoUserDAO.selectOne(new QueryWrapper<ComActEasyPhotoUserDO>().lambda().eq(ComActEasyPhotoUserDO::getEasyPhotoId, id).eq(ComActEasyPhotoUserDO::getUserId, userId));
        if (ObjectUtils.isEmpty(comActEasyPhotoUserDO)) {
            comActEasyPhotoVO.setHaveGiveThumbsUp(0);
        } else {
            comActEasyPhotoVO.setHaveGiveThumbsUp(1);
        }
        return R.ok(comActEasyPhotoVO);
    }

    /**
     * 上传随手拍
     *
     * @param comActEasyPhotoVO 上传数据
     * @return 上传结果
     */
    @Override
    public R addEasyPhoto(ComActEasyPhotoVO comActEasyPhotoVO) {
        ComActEasyPhotoDO comActEasyPhotoDO=new ComActEasyPhotoDO();
        BeanUtils.copyProperties(comActEasyPhotoVO,comActEasyPhotoDO);
        int insert = comActEasyPhotoDAO.insert(comActEasyPhotoDO);
        if (insert>0) {
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 点赞/取消点赞随手拍
     *
     * @param comActEasyPhotoVO 操作参数
     * @return 操作结果
     */
    @Override
    public R putEasyPhoto(ComActEasyPhotoVO comActEasyPhotoVO) {
        Integer haveGiveThumbsUp = comActEasyPhotoVO.getHaveGiveThumbsUp();
        Long userId = comActEasyPhotoVO.getSponsorId();
        Long easyPhotoId = comActEasyPhotoVO.getId();
        ComActEasyPhotoUserDO comActEasyPhotoUserDO = comActEasyPhotoUserDAO.selectOne(new QueryWrapper<ComActEasyPhotoUserDO>().lambda().eq(ComActEasyPhotoUserDO::getUserId, userId).eq(ComActEasyPhotoUserDO::getEasyPhotoId, easyPhotoId));
        boolean empty = ObjectUtils.isEmpty(comActEasyPhotoUserDO);
        int num=0;
        if (haveGiveThumbsUp.intValue()==1) {
            if(empty){
                ComActEasyPhotoUserDO comActEasyPhotoUserDO1=new ComActEasyPhotoUserDO();
                comActEasyPhotoUserDO1.setEasyPhotoId(easyPhotoId);
                comActEasyPhotoUserDO1.setUserId(userId);
                num=comActEasyPhotoUserDAO.insert(comActEasyPhotoUserDO1);
            }else{
                return R.ok();
            }
        }else{
            if(empty){
                return R.ok();
            }else{
                num=comActEasyPhotoUserDAO.deleteById(comActEasyPhotoUserDO.getId());
            }
        }
        if (num>0) {
            return R.ok();
        }
        return R.fail();
    }
}

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

@@ -1,19 +1,22 @@
package com.panzhihua.service_community.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActActivityVO;
import com.panzhihua.common.model.vos.community.ComActMicroWishVO;
import com.panzhihua.service_community.dao.ComActMicroWishDAO;
import com.panzhihua.service_community.dao.ComActMicroWishUserDAO;
import com.panzhihua.service_community.model.dos.ComActMicroWishDO;
import com.panzhihua.service_community.model.dos.ComActMicroWishUserDO;
import com.panzhihua.service_community.service.ComActMicroWishService;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;

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

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -25,6 +28,8 @@
public class ComActMicroWishServiceImpl extends ServiceImpl<ComActMicroWishDAO, ComActMicroWishDO> implements ComActMicroWishService {
    @Resource
    private ComActMicroWishDAO comActMicroWishDAO;
    @Resource
    private ComActMicroWishUserDAO comActMicroWishUserDAO;

    /**
     * 分页查询微心愿
@@ -34,6 +39,7 @@
     */
    @Override
    public R pageMicroWish(ComActMicroWishVO comActMicroWishVO) {
        Long userId = comActMicroWishVO.getResponsibleId();
        Page page = new Page<>();
        Long pageNum = comActMicroWishVO.getPageNum();
        Long pageSize = comActMicroWishVO.getPageSize();
@@ -46,6 +52,19 @@
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        IPage<ComActMicroWishVO> iPage = comActMicroWishDAO.pageMicroWish(page, comActMicroWishVO);
        List<ComActMicroWishVO> records = iPage.getRecords();
        if (!ObjectUtils.isEmpty(records)) {
            records.forEach(comActMicroWishVO1 -> {
                Long id = comActMicroWishVO1.getId();
                ComActMicroWishUserDO comActMicroWishUserDO = comActMicroWishUserDAO.selectOne(new QueryWrapper<ComActMicroWishUserDO>().lambda().eq(ComActMicroWishUserDO::getMicroWishId, id).eq(ComActMicroWishUserDO::getUserId, userId));
                if (ObjectUtils.isEmpty(comActMicroWishUserDO)) {
                    comActMicroWishVO1.setHaveGiveThumbsUp(0);
                } else {
                    comActMicroWishVO1.setHaveGiveThumbsUp(1);
                }
            });
            iPage.setRecords(records);
        }
        return R.ok(iPage);
    }

@@ -53,13 +72,20 @@
     * 心愿详情
     *
     * @param id 查询主键
     * @param userId 登录用户id
     * @return 心愿内容
     */
    @Override
    public R detailMicroWish(Long id) {
    public R detailMicroWish(Long id, Long userId) {
        ComActMicroWishVO comActMicroWishVO = comActMicroWishDAO.detailMicroWish(id);
        if (ObjectUtils.isEmpty(comActMicroWishVO)) {
            return R.fail();
        }
        ComActMicroWishUserDO comActMicroWishUserDO = comActMicroWishUserDAO.selectOne(new QueryWrapper<ComActMicroWishUserDO>().lambda().eq(ComActMicroWishUserDO::getUserId, userId).eq(ComActMicroWishUserDO::getMicroWishId, id));
        if (ObjectUtils.isEmpty(comActMicroWishUserDO)) {
            comActMicroWishVO.setHaveGiveThumbsUp(0);
        }else {
            comActMicroWishVO.setHaveGiveThumbsUp(1);
        }
        return R.ok(comActMicroWishVO);
    }
@@ -86,29 +112,29 @@
//        1 审核通过 2驳回 3分配人员 4发起活动 5反馈
        switch (type){
            case 1:
                comActMicroWishDO.setEvaluateAt(new Date());
                comActMicroWishDO.setExamineAt(new Date());
                comActMicroWishDO.setStatus(2);//待分配
                break;
            case 2:
                comActMicroWishDO.setEvaluateAt(new Date());
                comActMicroWishDO.setExamineAt(new Date());
                comActMicroWishDO.setRejectReason(rejectReason);
                comActMicroWishDO.setStatus(4);//驳回
                break;
            case 3:
                comActMicroWishDO.setEvaluateAt(new Date());
                comActMicroWishDO.setDistributionAt(new Date());
                comActMicroWishDO.setResponsibleId(responsibleId);
                comActMicroWishDO.setStatus(3);//进行中
                comActMicroWishDO.setForm(1);
                break;
            case 4:
                comActMicroWishDO.setEvaluateAt(new Date());
                comActMicroWishDO.setDistributionAt(new Date());
                comActMicroWishDO.setResponsibleId(responsibleId);
                comActMicroWishDO.setStatus(3);//进行中
                comActMicroWishDO.setForm(2);
//                todo 给负责人增加一个待办事件
                break;
            case 5:
                comActMicroWishDO.setEvaluateAt(new Date());
                comActMicroWishDO.setFeedbackAt(new Date());
                comActMicroWishDO.setStatus(5);//待确认
                comActMicroWishDO.setFeedback(feedback);
                comActMicroWishDO.setFeedbackPhotoPathList(feedbackPhotoPathList);
@@ -122,4 +148,42 @@
        }
        return R.fail();
    }

    /**
     * 点赞/取消点赞微心愿
     *
     * @param comActMicroWishVO 操作参数
     * @return 操作结果
     */
    @Override
    public R comActMicroWishVO(ComActMicroWishVO comActMicroWishVO) {
        Integer haveGiveThumbsUp = comActMicroWishVO.getHaveGiveThumbsUp();
        Long userId = comActMicroWishVO.getSponsorId();
        Long microWishId = comActMicroWishVO.getId();
        ComActMicroWishUserDO comActMicroWishUserDO = comActMicroWishUserDAO.selectOne(new QueryWrapper<ComActMicroWishUserDO>().lambda().eq(ComActMicroWishUserDO::getMicroWishId, microWishId).eq(ComActMicroWishUserDO::getUserId, userId));
        boolean empty = ObjectUtils.isEmpty(comActMicroWishUserDO);
        int num=0;
        if (haveGiveThumbsUp.intValue()==1) {
            if (empty) {
                ComActMicroWishUserDO comActMicroWishUserDO1=new ComActMicroWishUserDO();
                comActMicroWishUserDO1.setMicroWishId(microWishId);
                comActMicroWishUserDO1.setUserId(userId);
                num=comActMicroWishUserDAO.insert(comActMicroWishUserDO1);
            }else{
                return R.ok();
            }
        }else {
            if (empty) {
                return R.ok();
            } else {
                num= comActMicroWishUserDAO.deleteById(comActMicroWishUserDO.getId());
            }
        }
        if (num>0) {
            return R.ok();
        }
        return R.fail();
    }


}