社区后台-社区活动模块接口完成-未测试

huanghongfa

2020-12-09 4231221cc96b5a7d192422aee8866e4d87bd3d72

社区后台-社区活动模块接口完成-未测试

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

@@ -53,9 +53,10 @@
    }

    @ApiOperation(value = "增加阅读记录")
    @GetMapping("adddynuser")
    public R addDynUser(@RequestParam("id") Long id) {
        if (ObjectUtils.isEmpty(id)) {
    @PostMapping("adddynuser")
    public R addDynUser(@RequestBody PartyBuildingComPbDynVO partyBuildingComPbDynVO) {
        Long id = partyBuildingComPbDynVO.getId();
        if (ObjectUtils.isEmpty(id)||0==id) {
            return R.fail("主键id不能为空");
        }
        Long userId = this.getUserId();

 springcloud_k8s_panzhihuazhihuishequ/common/pom.xml

@@ -96,6 +96,10 @@
            <groupId>jakarta.validation</groupId>
            <artifactId>jakarta.validation-api</artifactId>
        </dependency>
        <dependency>
            <groupId>org.hibernate.validator</groupId>
            <artifactId>hibernate-validator</artifactId>
        </dependency>
    </dependencies>



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

New file
@@ -0,0 +1,29 @@
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-08 16:48
 **/
@Data
@ApiModel("社区活动报名名单")
public class ActivitySignVO {

    @ApiModelProperty("活动主键")
    private Long activityId;
    @ApiModelProperty("人员主键")
    private Long id;
    @ApiModelProperty("名字")
    private String name;
    @ApiModelProperty("身份")
    private String identity;
    @ApiModelProperty("手机号")
    private String phone;
    @ApiModelProperty("报名时间")
    private String createAt;
}

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

File was deleted

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

@@ -3,11 +3,10 @@
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 org.hibernate.validator.constraints.Length;

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.Date;
import java.util.List;
@@ -33,12 +32,15 @@
    @NotNull
    private Long sponsorId;

    @ApiModelProperty("负责人名字")
    private String sponsorName;

    @ApiModelProperty("活动地址")
    @NotBlank
    private String activityAddr;

    @ApiModelProperty("活动状态")
    private boolean status;
    @ApiModelProperty("活动状态 1 待发布 2 未开始 3 报名中 4 进行中 5 已结束 6 已取消")
    private Integer status;

    @ApiModelProperty("发布时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@@ -100,4 +102,14 @@
    @ApiModelProperty(value = "社区id",hidden = true)
    private Long communityId;

    @ApiModelProperty(value = "当前页数",example="1")
    private Long pageNum;

    @ApiModelProperty(value = "每页记录数",example="10")
    private Long pageSize;

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

}

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

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

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 社区动态
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-08 17:25
 **/
@Data
@ApiModel("社区活动 》社区动态")
public class ComActDynVO {

    @ApiModelProperty("主键")
    private Long id;

    @ApiModelProperty("标题")
    private String title;

    @ApiModelProperty("阅读数")
    private Integer readNum;

    @ApiModelProperty("状态 0 待发布 1 已发布")
    private Integer status;

    @ApiModelProperty("是否置顶 0 否 1 是")
    private Integer isTopping;

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

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

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

    @ApiModelProperty(value = "社区id",hidden = true)
    private Long communityId;

    @ApiModelProperty("当前页数")
    private Long pageNum;

    @ApiModelProperty("每页记录数")
    private Long pageSize;

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

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

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

@@ -23,20 +23,26 @@
    @ApiModelProperty("发起人id")
    private Long sponsorId;

    @ApiModelProperty("发生地质")
    @ApiModelProperty("发起人名字")
    private Long sponsorName;

    @ApiModelProperty("发生地址")
    private String happenAddr;

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

    @ApiModelProperty("处理人id")
    private Long handlerId;

    @ApiModelProperty("创建开始时间")
    @ApiModelProperty("处理人名字")
    private Long handlerName;

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

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

@@ -51,4 +57,21 @@

    @ApiModelProperty("处理结果，图片路径列表，逗号分隔")
    private String handlePhotoList;

    @ApiModelProperty("当前页数")
    private Long pageNum;

    @ApiModelProperty("每页记录数")
    private Long pageSize;

    @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 createAt;

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

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishVO.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;
@@ -26,28 +27,42 @@
    @ApiModelProperty("发起人电话号码")
    private String sponsorPhone;

    @ApiModelProperty("发起人名字")
    private String sponsorName;

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

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

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

    @ApiModelProperty("形式")
    private String form;
    @ApiModelProperty("形式  1分配人员  2发起活动")
    private Integer form;

    @ApiModelProperty("责任人id")
    private Long responsibleId;

    @ApiModelProperty("创建开始时间")
    @ApiModelProperty("责任人名字")
    private String responsibleName;

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

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

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

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

    @ApiModelProperty("评分")
    private Integer score;
@@ -57,5 +72,41 @@

    @ApiModelProperty("图片路径列表，逗号分隔")
    private String photoPathList;

    @ApiModelProperty("当前页数")
    private Long pageNum;

    @ApiModelProperty("每页记录数")
    private Long pageSize;

    @ApiModelProperty(value = "社区id",hidden = true)
    private Long communityId;

    @ApiModelProperty("用户评价")
    private String evaluate;

    @ApiModelProperty("用户评价时间")
    private Date evaluateAt;

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

    @ApiModelProperty("完成情况图片列表，逗号分隔")
    private String finishPhotoPathList;

    @ApiModelProperty("完成情况描述")
    private String finish;

    @ApiModelProperty("驳回理由")
    private String rejectReason;

    @ApiModelProperty("反馈文字")
    private String feedback;

    @ApiModelProperty("反馈图片集合，逗号分隔")
    private String feedbackPhotoPathList;

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


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

File was deleted

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingComPbDynVO.java

@@ -17,7 +17,7 @@
@ApiModel("社区管理》党建》党员动态/政策文件")
public class PartyBuildingComPbDynVO {

    @ApiModelProperty("党建动态id")
    @ApiModelProperty("党建动态/政策文件id")
    private Long id;

    @ApiModelProperty("标题")

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

@@ -1,10 +1,12 @@
package com.panzhihua.common.service.community;

import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActActivityVO;
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;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -19,6 +21,142 @@
     * @param comActActivityVO 新增信息
     * @return 新增结果
     */
    @PostMapping("/activity")
    @PostMapping("/addactivity")
    R addActivity(@RequestBody ComActActivityVO comActActivityVO);

    /**
     * 编辑社区活动
     * @param comActActivityVO 编辑内容
     * @return 编辑结果
     */
    @PostMapping("/putactivity")
    R putActivity(@RequestBody ComActActivityVO comActActivityVO);

    /**
     * 删除社区活动
     * @param comActActivityVO 活动主键
     * @return 删除结果
     */
    @PostMapping("deleteactivity")
    R deleteActivity(@RequestBody ComActActivityVO comActActivityVO);

    /**
     * 分页查询社区活动
     * @param comActActivityVO 查询参数
     * @return 分页集合
     */
    @PostMapping("pageactivity")
    R pageActivity(@RequestBody ComActActivityVO comActActivityVO);

    /**
     * 发布活动
     * @param comActActivityVO 主键id 发布时间
     * @return 发布结果
     */
    @PostMapping("releaseactivity")
    R releaseActivity(@RequestBody ComActActivityVO comActActivityVO);

    /**
     * 取消活动
     * @param comActActivityVO 取消原因
     * @return 取消结果
     */
    @PostMapping("cancelactivity")
    R cancelActivity(@RequestBody ComActActivityVO comActActivityVO);

    /**
     * 活动详情
     * @param id 活动id
     * @return 详情
     */
    @PostMapping("inforactivity")
    R inforActivity(@RequestParam("id") Long id);

    /**
     * 活动报名名单
     * @param activitySignVO 查询参数
     * @return 报名人员集合
     */
    @PostMapping("listactivitysign")
    R listActivitySign(@RequestBody ActivitySignVO activitySignVO);

    /**
     * 新增社区动态
     * @param comActDynVO 新增信息
     * @return 新增结果
     */
    @PostMapping("adddynamic")
    R addDynamic(@RequestBody ComActDynVO comActDynVO);

    /**
     * 编辑社区动态
     * @param comActDynVO 编辑内容
     * @return 编辑结果
     */
    @PostMapping("putdynamic")
    R putDynamic(@RequestBody ComActDynVO comActDynVO);

    /**
     * 删除社区动态
     * @param comActDynVO 动态id
     * @return 删除结果
     */
    @PostMapping("deletedynamic")
    R deleteDynamic(@RequestBody ComActDynVO comActDynVO);

    /**
     * 分页查询社区动态
     * @param comActDynVO 查询参数
     * @return 动态集合
     */
    @PostMapping("pagedynamic")
    R pageDynamic(@RequestBody ComActDynVO comActDynVO);

    /**
     * 社区动态详情
     * @param id 动态id
     * @return 详情
     */
    @PostMapping("detaildynamic")
    R detailDynamic(@RequestParam("id") String id);

    /**
     * 分页查询随手拍
     * @param comActEasyPhotoVO 查询参数
     * @return 心愿列表
     */
    @PostMapping("pageeasyphoto")
    R pageEasyPhoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO);

    /**
     * 随手拍详情
     * @param id 随手拍主键
     * @return 详情内容
     */
    @PostMapping("detaileasyphoto")
    R detailEasyPhoto(@RequestParam("id")Long id);

    /**
     * 分页查询微心愿
     * @param comActMicroWishVO 查询参数
     * @return 分页集合
     */
    @PostMapping("pagemicrowish")
    R pageMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO);

    /**
     * 心愿详情
     * @param id 查询主键
     * @return 心愿内容
     */
    @PostMapping("detailmicrowish")
    R detailMicroWish(@RequestParam("id")Long id);

    /**
     * 审核、分配、反馈心愿
     * @param comActMicroWishVO 具体操作
     * @return 操作结果
     */
    @PostMapping("putlmicrowish")
    R putlMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO);
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java

@@ -103,5 +103,6 @@
     * @param communityId 社区id
     * @return 人员集合
     */
    @PostMapping("/user/listactivitymanager")
    R listActivityManager(@RequestParam("param") String param, @RequestParam("communityId")Long communityId);
}

 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/ComActActSignVO.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/ComActVO.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/partybuilding/PartyBuildingComPbDynVO.class

Binary files differ

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

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/service/user/UserService.class

Binary files differ

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

@@ -2,7 +2,7 @@

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActActivityVO;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.partybuilding.ActivityManagerVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.user.UserService;
@@ -11,9 +11,11 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.util.ObjectUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

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

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -22,7 +24,7 @@
 * @create: 2020-12-07 14:38
 **/
@Slf4j
@Api(tags = {"社区动态","随手拍","微心愿","社区活动"})
@Api(tags = {"社区动态/随手拍/微心愿/社区活动"})
@RestController
@RequestMapping("/communityactivityapi/")
public class CommunityActivityAPI extends BaseController {
@@ -52,4 +54,196 @@
        R r = communityService.addActivity(ComActActivityVO);
        return r;
    }

    @ApiOperation(value = "编辑社区活动")
    @PutMapping("activity")
    public R putActivity(@RequestBody ComActActivityVO ComActActivityVO) {
        Long id = ComActActivityVO.getId();
        if (ObjectUtils.isEmpty(id)) {
            return R.fail("活动id主键不能为空");
        }
        Long communityId = this.getCommunityId();
        ComActActivityVO.setCommunityId(communityId);
        R r = communityService.putActivity(ComActActivityVO);
        return r;
    }

    @ApiOperation(value = "删除社区活动")
    @DeleteMapping("activity")
    public R deleteActivity(@RequestBody ComActActivityVO ComActActivityVO) {
        Long id = ComActActivityVO.getId();
        if (ObjectUtils.isEmpty(id)) {
            return R.fail("活动id主键不能为空");
        }
        R r = communityService.deleteActivity(ComActActivityVO);
        return r;
    }

    @ApiOperation(value = "分页查询社区活动")
    @PostMapping("pageactivity")
    public R pageActivity(@RequestBody ComActActivityVO ComActActivityVO) {
        Long communityId = this.getCommunityId();
        ComActActivityVO.setCommunityId(communityId);
        R r = communityService.pageActivity(ComActActivityVO);
        return r;
    }

    @ApiOperation(value = "发布活动")
    @PostMapping("releaseactivity")
    public R releaseActivity(@RequestBody ComActActivityVO ComActActivityVO) {
        Long id = ComActActivityVO.getId();
        if (ObjectUtils.isEmpty(id)) {
            return R.fail("活动id主键不能为空");
        }
        ComActActivityVO.setPublishAt(new Date());
        ComActActivityVO.setStatus(2);
        R r = communityService.releaseActivity(ComActActivityVO);
        return r;
    }

    @ApiOperation(value = "取消活动")
    @PutMapping("cancelactivity")
    public R cancelActivity(@RequestBody @Validated ComActActivityVO ComActActivityVO) {
        Long id = ComActActivityVO.getId();
        if (ObjectUtils.isEmpty(id)) {
            return R.fail("活动id主键不能为空");
        }
        ComActActivityVO.setStatus(6);
        R r = communityService.cancelActivity(ComActActivityVO);
        return r;
    }

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

    @ApiOperation(value = "查询活动报名名单集合")
    @PostMapping("listactivitysign")
    public R listActivitySign(@RequestBody ActivitySignVO activitySignVO) {
        if (ObjectUtils.isEmpty(activitySignVO.getActivityId())) {
            return R.fail("活动id主键不能为空");
        }
        R r = communityService.listActivitySign(activitySignVO);
        return r;
    }

    @ApiOperation(value = "新增社区动态")
    @PostMapping("dynamic")
    public R addDynamic(@RequestBody ComActDynVO comActDynVO) {
        Long communityId = this.getCommunityId();
        comActDynVO.setCommunityId(communityId);
        R r = communityService.addDynamic(comActDynVO);
        //todo 五天自动取消置顶状态
        return r;
    }

    @ApiOperation(value = "编辑社区动态、取消置顶、设置置顶")
    @PutMapping("dynamic")
    public R putDynamic(@RequestBody ComActDynVO comActDynVO) {
        Long communityId = this.getCommunityId();
        Long id = comActDynVO.getId();
        if (ObjectUtils.isEmpty(id)) {
            return R.fail("动态主键不能为空");
        }
        comActDynVO.setCommunityId(communityId);
        R r = communityService.putDynamic(comActDynVO);
        //todo 五天自动取消置顶状态
        return r;
    }

    @ApiOperation(value = "删除社区动态")
    @DeleteMapping("dynamic")
    public R deleteDynamic(@RequestBody ComActDynVO comActDynVO) {
        Long id = comActDynVO.getId();
        if (ObjectUtils.isEmpty(id)) {
            return R.fail("动态主键不能为空");
        }
        R r = communityService.deleteDynamic(comActDynVO);
        //todo 五天自动取消置顶状态
        return r;
    }

    @ApiOperation(value = "分页查询社区动态")
    @PostMapping("pagedynamic")
    public R pageDynamic(@RequestBody ComActDynVO comActDynVO) {
        R r = communityService.pageDynamic(comActDynVO);
        return r;
    }

    @ApiOperation(value = "社区动态详情")
    @GetMapping("detaildynamic")
    public R detailDynamic(@RequestParam("id") String id) {
        R r = communityService.detailDynamic(id);
        return r;
    }


    @ApiOperation(value = "分页查询随手拍")
    @PostMapping("pageeasyphoto")
    public R pageEasyPhoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
        Long communityId = this.getCommunityId();
        comActEasyPhotoVO.setCommunityId(communityId);
        R r = communityService.pageEasyPhoto(comActEasyPhotoVO);
        return r;
    }

    @ApiOperation(value = "随手拍详情")
    @GetMapping("easyphoto")
    public R detailEasyPhoto(@RequestParam("id")Long id) {
        R r = communityService.detailEasyPhoto(id);
        return r;
    }

    @ApiOperation(value = "分页查询微心愿")
    @PostMapping("pagemicrowish")
    public R pageMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO) {
        Long communityId = this.getCommunityId();
        comActMicroWishVO.setCommunityId(communityId);
        R r = communityService.pageMicroWish(comActMicroWishVO);
        return r;
    }

    @ApiOperation(value = "心愿详情")
    @GetMapping("detailmicrowish")
    public R detailMicroWish(@RequestParam("id")Long id) {
        R r = communityService.detailMicroWish(id);
        return r;
    }

    @ApiOperation(value = "审核、分配、反馈心愿")
    @PutMapping("putlmicrowish")
    public R putlMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO) {
        Long id = comActMicroWishVO.getId();
        if (ObjectUtils.isEmpty(id)) {
            return R.fail("心愿主键不能为空");
        }
        R r = communityService.putlMicroWish(comActMicroWishVO);
        return r;
    }

    @ApiOperation(value = "微心愿人员下拉搜索")
    @GetMapping("listmanagers")
    public R listManagers(String param) {
        Long communityId = this.getCommunityId();
        if (ObjectUtils.isEmpty(param)) {
            param="";
        }
        R r = userService.listActivityManager(param,communityId);
        return r;
    }









}

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

@@ -1,23 +1,22 @@
package com.panzhihua.service_community.api;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActActPrizeVO;
import com.panzhihua.common.model.vos.community.ComActActivityVO;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.service_community.model.dos.ComActActPrizeDO;
import com.panzhihua.service_community.service.ComActActPrizeService;
import com.panzhihua.service_community.service.ComActActivityService;
import com.panzhihua.service_community.model.dos.ComActDynDO;
import com.panzhihua.service_community.service.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

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

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -33,39 +32,314 @@
    private ComActActivityService comActActivityService;
    @Resource
    private ComActActPrizeService comActActPrizeService;
    @Resource
    private ComActDynService comActDynService;
    @Resource
    private ComActMicroWishService comActMicroWishService;
    @Resource
    private ComActEasyPhotoService comActEasyPhotoService;

    /**
     * 新增社区活动
     *
     * @param comActActivityVO 新增信息
     * @return 新增结果
     */
    @PostMapping("/activity")
    @PostMapping("addactivity")
    @Transactional(rollbackFor = Exception.class)
    public R addActivity(@RequestBody ComActActivityVO comActActivityVO){
    public R addActivity(@RequestBody ComActActivityVO comActActivityVO) {
        R r = comActActivityService.addActivity(comActActivityVO);
        boolean ok = r.isOk();
        if (ok) {
            Long activityId = (Long)r.getData();
            Long activityId = (Long) r.getData();
            Integer hasPrize = comActActivityVO.getHasPrize();
            if (hasPrize.intValue()>0) {
            if (hasPrize.intValue() > 0) {
                List<ComActActPrizeVO> comActActPrizeVOList = comActActivityVO.getComActActPrizeVOList();
                if (!ObjectUtils.isEmpty(comActActPrizeVOList)) {
                    List<ComActActPrizeDO> comActActPrizeDOS=new ArrayList<>();
                    List<ComActActPrizeDO> comActActPrizeDOS = new ArrayList<>();
                    comActActPrizeVOList.forEach(comActActPrizeVO -> {
                        ComActActPrizeDO comActActPrizeDO=new ComActActPrizeDO();
                        BeanUtils.copyProperties(comActActPrizeVO,comActActPrizeDO);
                        ComActActPrizeDO comActActPrizeDO = new ComActActPrizeDO();
                        BeanUtils.copyProperties(comActActPrizeVO, comActActPrizeDO);
                        comActActPrizeDO.setActivityId(activityId);
                        comActActPrizeDOS.add(comActActPrizeDO);
                    });
                    boolean saveBatch = comActActPrizeService.saveBatch(comActActPrizeDOS);
                    if (!saveBatch) {
                       throw new RuntimeException("奖品保存失败");
                        return R.fail("保存奖品失败");
                    }
                }

            }
        }
       return R.fail();
        return R.fail();
    }

    /**
     * 编辑社区活动
     *
     * @param comActActivityVO 编辑内容
     * @return 编辑结果
     */
    @PostMapping("putactivity")
    @Transactional(rollbackFor = Exception.class)
    public R putActivity(@RequestBody ComActActivityVO comActActivityVO) {
        R r = comActActivityService.putActivity(comActActivityVO);
        List<ComActActPrizeVO> comActActPrizeVOList = comActActivityVO.getComActActPrizeVOList();
        boolean ok = r.isOk();
        if (ok) {
            if (!ObjectUtils.isEmpty(comActActPrizeVOList)) {
                Long actActivityVOId = comActActivityVO.getId();
                comActActPrizeService.remove(new QueryWrapper<ComActActPrizeDO>().lambda().eq(ComActActPrizeDO::getActivityId, actActivityVOId));
                if (!ObjectUtils.isEmpty(comActActPrizeVOList)) {
                    List<ComActActPrizeDO> comActActPrizeDOS = new ArrayList<>();
                    comActActPrizeVOList.forEach(comActActPrizeVO -> {
                        ComActActPrizeDO comActActPrizeDO = new ComActActPrizeDO();
                        BeanUtils.copyProperties(comActActPrizeVO, comActActPrizeDO);
                        comActActPrizeDO.setActivityId(actActivityVOId);
                        comActActPrizeDOS.add(comActActPrizeDO);
                    });
                    boolean saveBatch = comActActPrizeService.saveBatch(comActActPrizeDOS);
                    if (!saveBatch) {
                        return R.fail("保存奖品失败");
                    }
                }
            }
        }
        return r;
    }

    /**
     * 删除社区活动
     *
     * @param comActActivityVO 活动主键
     * @return 删除结果
     */
    @PostMapping("deleteactivity")
    public R deleteActivity(@RequestBody ComActActivityVO comActActivityVO) {
        boolean remove = comActActivityService.removeById(comActActivityVO.getId());
        if (remove) {
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 分页查询社区活动
     *
     * @param comActActivityVO 查询参数
     * @return 分页集合
     */
    @PostMapping("pageActivity")
    public R pageActivity(@RequestBody ComActActivityVO comActActivityVO) {
        return comActActivityService.pageActivity(comActActivityVO);
    }

    /**
     * 发布活动
     * @param comActActivityVO 主键id 发布时间
     * @return 发布结果
     */
    @PostMapping("releaseactivity")
    public R releaseActivity(@RequestBody ComActActivityVO comActActivityVO){
        return comActActivityService.releaseActivity(comActActivityVO);
    }

    /**
     * 取消活动
     * @param comActActivityVO 取消原因
     * @return 取消结果
     */
    @PostMapping("cancelactivity")
    public R cancelActivity(@RequestBody ComActActivityVO comActActivityVO){
        return comActActivityService.cancelActivity(comActActivityVO);
    }

    /**
     * 活动详情
     * @param id 活动id
     * @return 详情
     */
    @PostMapping("inforactivity")
    public R inforActivity(@RequestParam("id") Long id){
        ComActActivityVO comActActivityVO = comActActivityService.inforActivity(id);
        if (ObjectUtils.isEmpty(comActActivityVO)) {
            return R.fail("活动不存在");
        }
        List<ComActActPrizeDO> comActActPrizeDOS = comActActPrizeService.list(new QueryWrapper<ComActActPrizeDO>().lambda().eq(ComActActPrizeDO::getActivityId, id));
        if (!ObjectUtils.isEmpty(comActActPrizeDOS)) {
            List<ComActActPrizeVO> comActActPrizeVOS=new ArrayList<>();
            comActActPrizeDOS.forEach(comActActPrizeDO -> {
                ComActActPrizeVO comActActPrizeVO=new ComActActPrizeVO();
                BeanUtils.copyProperties(comActActPrizeDO,comActActPrizeVO);
                comActActPrizeVOS.add(comActActPrizeVO);
            });
            comActActivityVO.setComActActPrizeVOList(comActActPrizeVOS);
        }
        return R.ok(comActActivityVO);
    }

    /**
     * 活动报名名单
     * @param activitySignVO 查询参数
     * @return 报名人员集合
     */
    @PostMapping("listactivitysign")
    public R listActivitySign(@RequestBody ActivitySignVO activitySignVO){
        return comActActivityService.listActivitySign(activitySignVO);
    }

    /**
     * 新增社区动态
     * @param comActDynVO 新增信息
     * @return 新增结果
     */
    @PostMapping("adddynamic")
    public R addDynamic(@RequestBody ComActDynVO comActDynVO){
        ComActDynDO comActDynDO=new ComActDynDO();
        BeanUtils.copyProperties(comActDynVO,comActDynDO);
        boolean save = comActDynService.save(comActDynDO);
        if (save) {
//            最多只能设置三条置顶状态，后边设置会取消先前设置的置顶
            Integer isTopping = comActDynVO.getIsTopping();
            boolean b = isTopping.intValue() == 1;
            if (b) {
                List<ComActDynDO> list = comActDynService.list(new QueryWrapper<ComActDynDO>().lambda().eq(ComActDynDO::getIsTopping, 1).eq(ComActDynDO::getCommunityId,comActDynVO.getCommunityId()));
                if (!ObjectUtils.isEmpty(list)) {
                    int size = list.size();
                    if (size==4) {
                        List<ComActDynDO> collect = list.stream().sorted(Comparator.comparing(ComActDynDO::getCreateAt)).collect(Collectors.toList());
                        ComActDynDO comActDynDO1 = collect.get(0);
                        comActDynDO1.setIsTopping(0);
                        boolean update = comActDynService.updateById(comActDynDO1);
                        if (!update) {
                            return R.fail("修改置顶状态失败");
                        }
                    }
                }
            }
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 编辑社区动态
     * @param comActDynVO 编辑内容
     * @return 编辑结果
     */
    @PostMapping("putdynamic")
    public R putDynamic(@RequestBody ComActDynVO comActDynVO){
        ComActDynDO comActDynDO=new ComActDynDO();
        BeanUtils.copyProperties(comActDynVO,comActDynDO);
        boolean update = comActDynService.updateById(comActDynDO);
        if (update) {
//            最多只能设置三条置顶状态，后边设置会取消先前设置的置顶
            Integer isTopping = comActDynVO.getIsTopping();
            boolean b = isTopping.intValue() == 1;
            if (b) {
                List<ComActDynDO> list = comActDynService.list(new QueryWrapper<ComActDynDO>().lambda().eq(ComActDynDO::getIsTopping, 1).eq(ComActDynDO::getCommunityId,comActDynVO.getCommunityId()));
                if (!ObjectUtils.isEmpty(list)) {
                    int size = list.size();
                    if (size==4) {
                        List<ComActDynDO> collect = list.stream().sorted(Comparator.comparing(ComActDynDO::getCreateAt)).collect(Collectors.toList());
                        ComActDynDO comActDynDO1 = collect.get(0);
                        comActDynDO1.setIsTopping(0);
                        boolean updateById = comActDynService.updateById(comActDynDO1);
                        if (!updateById) {
                            return R.fail("修改置顶状态失败");
                        }
                    }
                }
            }
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 删除社区动态
     * @param comActDynVO 动态id
     * @return 删除结果
     */
    @PostMapping("deletedynamic")
    public R deleteDynamic(@RequestBody ComActDynVO comActDynVO){
        boolean b = comActDynService.removeById(comActDynVO.getId());
        if (b) {
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 分页查询社区动态
     * @param comActDynVO 查询参数
     * @return 动态集合
     */
    @PostMapping("pagedynamic")
    public R pageDynamic(@RequestBody ComActDynVO comActDynVO){
        return comActDynService.pageDynamic(comActDynVO);
    }

    /**
     * 社区动态详情
     * @param id 动态id
     * @return 详情
     */
    @PostMapping("detaildynamic")
    public R detailDynamic(@RequestParam("id") String id){
        return comActDynService.detailDynamic(id);
    }


    /**
     * 分页查询随手拍
     * @param comActEasyPhotoVO 查询参数
     * @return 心愿列表
     */
    @PostMapping("pageeasyphoto")
    public R pageEasyPhoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO){
        return comActEasyPhotoService.pageEasyPhoto(comActEasyPhotoVO);
    }

    /**
     * 随手拍详情
     * @param id 随手拍主键
     * @return 详情内容
     */
    @PostMapping("detaileasyphoto")
    public R detailEasyPhoto(@RequestParam("id")Long id){
        return comActEasyPhotoService.detailEasyPhoto(id);
    }

    /**
     * 分页查询微心愿
     * @param comActMicroWishVO 查询参数
     * @return 分页集合
     */
    @PostMapping("pagemicrowish")
    public R pageMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO){
        return comActMicroWishService.pageMicroWish(comActMicroWishVO);
    }

    /**
     * 心愿详情
     * @param id 查询主键
     * @return 心愿内容
     */
    @PostMapping("detailmicrowish")
    public R detailMicroWish(@RequestParam("id")Long id){
        return comActMicroWishService.detailMicroWish(id);
    }

    /**
     * 审核、分配、反馈心愿
     * @param comActMicroWishVO 具体操作
     * @return 操作结果
     */
    @PostMapping("putlmicrowish")
    public R putlMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO){
        R r = comActMicroWishService.putlMicroWish(comActMicroWishVO);
        return r;
    }

}

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

@@ -1,8 +1,12 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.common.model.vos.community.ActivitySignVO;
import com.panzhihua.service_community.model.dos.ComActActSignDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;

import java.util.List;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -12,4 +16,39 @@
 **/
@Mapper
public interface ComActActSignDAO extends BaseMapper<ComActActSignDO> {
    @Select("<script> " +
            "SELECT\n" +
            "a.id,\n" +
            "u.NAME,\n" +
            "CASE\n" +
            "\n" +
            "WHEN u.is_partymember = 1 THEN\n" +
            "'党员' \n" +
            "WHEN u.is_volunteer = 1 THEN\n" +
            "'支援者' ELSE '居民' \n" +
            "END identity,\n" +
            "u.phone,\n" +
            "a.create_at \n" +
            "FROM\n" +
            "com_act_act_sign a\n" +
            "JOIN sys_user u ON a.user_id = u.user_id \n" +
            "WHERE\n" +
            "a.activity_id = #{activityId} \n" +
            "<if test='phone != null and phone.trim() != &quot;&quot;'>" +
            "AND u.phone = #{phone} \n" +
            " </if> " +
            "<if test='name != null and name.trim() != &quot;&quot;'>" +
            "AND u.`name` = #{name} \n" +
            " </if> " +
            "<if test='identity != null and identity.trim() != &quot;&quot; and identity=党员'>" +
            "AND is_partymember = 1 \n" +
            " </if> " +
            "<if test='identity != null and identity.trim() != &quot;&quot; and identity=志愿者'>" +
            "AND is_partymember = 2 and is_volunteer=1  \n" +
            " </if> " +
            "<if test='identity != null and identity.trim() != &quot;&quot; and identity=居民'>" +
            "AND is_partymember = 2 and is_volunteer=2  \n" +
            " </if> " +
            "</script>")
    List<ActivitySignVO> listActivitySign(ActivitySignVO activitySignVO);
}

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

@@ -1,8 +1,14 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.community.ComActActivityVO;
import com.panzhihua.common.model.vos.partybuilding.PageActivityMembersVO;
import com.panzhihua.service_community.model.dos.ComActActivityDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -12,4 +18,44 @@
 **/
@Mapper
public interface ComActActivityDAO extends BaseMapper<ComActActivityDO> {
    //    @Select("<script> " +
//            " <where>" +
//            "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
//            " </if> " +
//            "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
//            " </if> " +
//            "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
//            " </if> " +
//            " </where>" +
//            "</script>")
    @Select("<script> " +
            "SELECT \n" +
            "a.id,\n" +
            "a.activity_name,\n" +
            "u.`name` sponsorName,\n" +
            "a.activity_addr,\n" +
            "a.`status`,\n" +
            "a.publish_at,\n" +
            "a.begin_at,\n" +
            "a.end_at,\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>" +
            "<if test='comActActivityVO.activityName != null and comActActivityVO.activityName.trim() != &quot;&quot;'>" +
            " and a.activity_name = #{comActActivityVO.activityName} \n" +
            " </if> " +
            "<if test='comActActivityVO.status != null and comActActivityVO.status !=0'>" +
            "AND a.`status` = #{comActActivityVO.status} \n" +
            " </if> " +
            "<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>" +
            "</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")
    ComActActivityVO inforActivity(Long id);
}

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

@@ -1,8 +1,14 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.community.ComActActivityVO;
import com.panzhihua.common.model.vos.community.ComActDynVO;
import com.panzhihua.service_community.model.dos.ComActDynDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -12,4 +18,33 @@
 **/
@Mapper
public interface ComActDynDAO extends BaseMapper<ComActDynDO> {
    @Select("<script> " +
            "SELECT \n" +
            "d.id,\n" +
            "d.title,\n" +
            "COUNT(u.id)readNum,\n" +
            "d.`status`,\n" +
            "d.is_topping,\n" +
            "d.publish_at,\n" +
            "d.create_at\n" +
            "FROM\n" +
            "com_act_dyn d\n" +
            "LEFT JOIN com_act_dyn_user u ON d.id = u.dyn_id \n" +
            "WHERE\n" +
            "d.community_id=#{comActDynVO.communityId}\n" +
            "<if test='comActDynVO.title != null and comActDynVO.title.trim() != &quot;&quot;'>" +
            "d.title = #{comActDynVO.title} \n" +
            " </if> " +
            "<if test='comActDynVO.isTopping != null '>" +
            "AND d.is_topping = #{comActDynVO.isTopping} \n" +
            " </if> " +
            "<if test='comActDynVO.status != null '>" +
            "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'" +
            " </if> " +
            "</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

@@ -1,8 +1,13 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
import com.panzhihua.service_community.model.dos.ComActEasyPhotoDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -12,4 +17,54 @@
 **/
@Mapper
public interface ComActEasyPhotoDAO extends BaseMapper<ComActEasyPhotoDO> {
    @Select("<script> " +
            "SELECT\n" +
            "p.id,\n" +
            "u.`name` sponsor_name,\n" +
            "u.phone sponsor_phone,\n" +
            "p.happen_addr,\n" +
            "su.`name` handler_name,\n" +
            "p.`status`,\n" +
            "p.create_at,\n" +
            "p.examine_at \n" +
            "FROM\n" +
            "com_act_easy_photo p\n" +
            "JOIN sys_user u ON p.sponsor_id = u.user_id \n" +
            "<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" +
            "<if test='comActEasyPhotoVO.handlerName != null and comActEasyPhotoVO.handlerName.trim() != &quot;&quot;'>" +
            "AND su.`name` = #{comActEasyPhotoVO.handlerName} \n" +
            " </if> " +
            " where p.community_id=#{comActEasyPhotoVO.communityId} " +
            "<if test='comActEasyPhotoVO.happenAddr != null and comActEasyPhotoVO.happenAddr.trim() != &quot;&quot;'>" +
            "AND p.happen_addr = #{comActEasyPhotoVO.happenAddr} \n" +
            " </if> " +
            "<if test='comActEasyPhotoVO.status != null '>" +
            "AND p.`status` = #{comActEasyPhotoVO.status} \n" +
            " </if> " +
            "<if test='comActEasyPhotoVO.createBegin != null and comActEasyPhotoVO.createBegin.trim() != &quot;&quot;'>" +
            "AND p.create_at BETWEEN #{comActEasyPhotoVO.createBegin} \n" +
            "AND #{comActEasyPhotoVO.createEnd}" +
            " </if> " +
            "</script>")
    IPage<ComActEasyPhotoVO> pageEasyPhoto(Page page, @Param("comActEasyPhotoVO") ComActEasyPhotoVO comActEasyPhotoVO);
    @Select("SELECT \n" +
            "p.id,\n" +
            "p.create_at,\n" +
            "u.`name`,\n" +
            "u.phone,\n" +
            "p.detail,\n" +
            "p.happen_addr,\n" +
            "su.`name`,\n" +
            "p.handle_result,\n" +
            "p.photo_path_list,\n" +
            "p.handle_photo_list\n" +
            "FROM\n" +
            "com_act_easy_photo p\n" +
            "JOIN sys_user u on p.sponsor_id=u.user_id\n" +
            "LEFT JOIN sys_user su on p.handler_id=su.user_id\n" +
            "WHERE p.id=#{id}")
    ComActEasyPhotoVO detailEasyPhoto(Long id);
}

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

@@ -1,8 +1,13 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.community.ComActMicroWishVO;
import com.panzhihua.service_community.model.dos.ComActMicroWishDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -12,4 +17,69 @@
 **/
@Mapper
public interface ComActMicroWishDAO extends BaseMapper<ComActMicroWishDO> {

    @Select("<script> " +
            "SELECT\n" +
            "w.id,\n" +
            "u.NAME sponsor_name,\n" +
            "w.sponsor_phone,\n" +
            "w.wish_name,\n" +
            "w.`status`,\n" +
            "w.`detail`,\n" +
            "w.start_num,\n" +
            "w.form,\n" +
            "su.`name` responsible_name,\n" +
            "w.score,\n" +
            "w.create_at \n" +
            "FROM\n" +
            "com_act_micro_wish w\n" +
            "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" +
            " </if> " +
            "LEFT JOIN sys_user su ON w.responsible_id = su.user_id \n" +
            "<if test='comActMicroWishVO.responsibleName != null and comActMicroWishVO.responsibleName.trim() != &quot;&quot;'>" +
            "AND su.`name` = #{comActMicroWishVO.responsibleName} \n" +
            " </if> " +
            "WHERE\n" +
            "w.community_id=#{comActMicroWishVO.communityId} \n" +
            "<if test='comActMicroWishVO.sponsorPhone != null and comActMicroWishVO.sponsorPhone.trim() != &quot;&quot;'>" +
            "AND w.sponsor_phone = #{comActMicroWishVO.sponsorPhone} \n" +
            " </if> " +
            "<if test='comActMicroWishVO.status != null '>" +
            "AND w.`status` = #{comActMicroWishVO.status} \n" +
            " </if> " +
            "<if test='comActMicroWishVO.createBegin != null and comActMicroWishVO.createBegin.trim() != &quot;&quot;'>" +
            "AND w.create_at BETWEEN #{comActMicroWishVO.createBegin} \n" +
            "AND #{comActMicroWishVO.createEnd}" +
            " </if> " +
            "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" +
            "w.create_at,\n" +
            "w.sponsor_phone,\n" +
            "w.`status`,\n" +
            "w.wish_name,\n" +
            "w.detail,\n" +
            "w.photo_path_list,\n" +
            "su.`name` responsible_name,\n" +
            "w.form,\n" +
            "w.examine_at,\n" +
            "w.finish,\n" +
            "w.finish_photo_path_list,\n" +
            "w.finish_at,\n" +
            "w.score,\n" +
            "w.evaluate_at,\n" +
            "w.evaluate \n" +
            "FROM\n" +
            "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" +
            "WHERE\n" +
            "w.id =#{id}")
    ComActMicroWishVO detailMicroWish(Long id);
}

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

@@ -6,6 +6,7 @@
import lombok.Data;

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

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -34,4 +35,8 @@
     * 用户id， 和用户信息表的相关id关联
     */
    private Long userId;
    /**
     * 报名时间
     */
    private Date create_at;
}

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

@@ -45,7 +45,7 @@
    /**
     * 活动状态
     */
    private boolean status;
    private Integer status;

    /**
     * 发布时间
@@ -118,4 +118,8 @@
     * 创建时间
     */
    private Date createAt;
    /**
     * 取消原因
     */
    private String cancelReason;
}

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

@@ -38,12 +38,12 @@
    /**
     * 状态
     */
    private boolean status;
    private Integer status;

    /**
     * 是否置顶
     */
    private String isTopping;
    private Integer isTopping;

    /**
     * 发布时间
@@ -59,4 +59,8 @@
     * 修改时间
     */
    private Date updateAt;
    /**
     * 社区id
     */
    private Long communityId;
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDynUserDO.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-09 10:23
 **/
@Data
@TableName(value = "com_act_dyn_user")
public class ComActDynUserDO implements Serializable {
    private static final long serialVersionUID = 1L;

    /**
     * id
     */
    private Long id;

    /**
     * 社区动态id
     */
    private Long dynId;

    /**
     * user表id
     */
    private Long userId;

    /**
     * 阅读时间
     */
    private Date createAt;
}

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

@@ -46,14 +46,14 @@
    private Long handlerId;

    /**
     * 创建开始时间
     * 创建时间
     */
    private Date createBegin;
    private Date createAt;

    /**
     * 创建结束时间
     * 审核时间
     */
    private Date createEnd;
    private Date examineAt;

    /**
     * 详情
@@ -74,4 +74,8 @@
     * 处理结果，图片路径列表，逗号分隔
     */
    private String handlePhotoList;
    /**
     * 社区id
     */
    private Long community_id;
}

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

@@ -42,8 +42,9 @@

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

    /**
     * 集星数
@@ -51,9 +52,9 @@
    private Integer startNum;

    /**
     * 形式
     * 形式  1分配人员  2发起活动
     */
    private String form;
    private Integer form;

    /**
     * 责任人id
@@ -61,14 +62,14 @@
    private Long responsibleId;

    /**
     * 创建开始时间
     * 创建时间
     */
    private Date createBegin;
    private Date createAt;

    /**
     * 创建结束时间
     * 审核时间
     */
    private Date createEnd;
    private Date examineAt;

    /**
     * 评分
@@ -84,5 +85,48 @@
     * 图片路径列表，逗号分隔
     */
    private String photoPathList;
    /**
     * 社区id
     */
    private Long communityId;

    /**
     * 用户评价
     */
    private String evaluate;

    /**
     * 用户评价时间
     */
    private Date evaluateAt;

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

    /**
     * 完成情况图片列表，逗号分隔
     */
    private String finishPhotoPathList;

    /**
     * 完成情况描述
     */
    private String finish;
    /**
     * 驳回理由
     */
    private String rejectReason;

    /**
     * 反馈文字
     */
    private String feedback;

    /**
     * 反馈图片集合，逗号分隔
     */
    private String feedbackPhotoPathList;

}

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

@@ -1,7 +1,11 @@
package com.panzhihua.service_community.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActActPrizeVO;
import com.panzhihua.service_community.model.dos.ComActActPrizeDO;

import java.util.List;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -10,4 +14,5 @@
 * @create: 2020-12-07 16:31
 **/
public interface ComActActPrizeService extends IService<ComActActPrizeDO> {

}

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

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.extension.service.IService;
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.service_community.model.dos.ComActActivityDO;

@@ -12,6 +13,47 @@
 * @create: 2020-12-07 14:35
 **/
public interface ComActActivityService extends IService<ComActActivityDO> {

    /**
     * 新增社区活动
     * @param comActActivityVO 新增信息
     * @return 新增结果
     */
    R addActivity(ComActActivityVO comActActivityVO);
    /**
     * 编辑社区活动
     * @param comActActivityVO 编辑内容
     * @return 编辑结果
     */
    R putActivity(ComActActivityVO comActActivityVO);
    /**
     * 分页查询社区活动
     *
     * @param comActActivityVO 查询参数
     * @return 分页集合
     */
    R pageActivity(ComActActivityVO comActActivityVO);
    /**
     * 发布活动
     * @param comActActivityVO 主键id 发布时间
     * @return 发布结果
     */
    R releaseActivity(ComActActivityVO comActActivityVO);
    /**
     * 取消活动
     * @param comActActivityVO 取消原因
     * @return 取消结果
     */
    R cancelActivity(ComActActivityVO comActActivityVO);
    /**
     * 活动详情
     * @param id 活动id
     * @return 详情
     */
    ComActActivityVO inforActivity(Long id);
    /**
     * 活动报名名单
     * @param activitySignVO 查询参数
     * @return 报名人员集合
     */
    R listActivitySign(ActivitySignVO activitySignVO);
}

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

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

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.service_community.model.dos.ComActDynDO;

/**
@@ -10,4 +12,16 @@
 * @create: 2020-12-07 14:28
 **/
public interface ComActDynService extends IService<ComActDynDO> {
    /**
     * 分页查询社区动态
     * @param comActDynVO 查询参数
     * @return 动态集合
     */
    R pageDynamic(ComActDynVO comActDynVO);
    /**
     * 社区动态详情
     * @param id 动态id
     * @return 详情
     */
    R detailDynamic(String id);
}

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

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

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
import com.panzhihua.service_community.model.dos.ComActEasyPhotoDO;

/**
@@ -10,4 +12,16 @@
 * @create: 2020-12-07 14:31
 **/
public interface ComActEasyPhotoService extends IService<ComActEasyPhotoDO> {
    /**
     * 分页查询随手拍
     * @param comActEasyPhotoVO 查询参数
     * @return 心愿列表
     */
    R pageEasyPhoto(ComActEasyPhotoVO comActEasyPhotoVO);
    /**
     * 随手拍详情
     * @param id 随手拍主键
     * @return 详情内容
     */
    R detailEasyPhoto(Long id);
}

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

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

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActMicroWishVO;
import com.panzhihua.service_community.model.dos.ComActMicroWishDO;

/**
@@ -10,4 +12,22 @@
 * @create: 2020-12-07 14:33
 **/
public interface ComActMicroWishService extends IService<ComActMicroWishDO> {
    /**
     * 分页查询微心愿
     * @param comActMicroWishVO 查询参数
     * @return 心愿列表
     */
    R pageMicroWish(ComActMicroWishVO comActMicroWishVO);
    /**
     * 心愿详情
     * @param id 查询主键
     * @return 心愿内容
     */
    R detailMicroWish(Long id);
    /**
     * 审核、分配、反馈心愿
     * @param comActMicroWishVO 具体操作
     * @return 操作结果
     */
    R putlMicroWish(ComActMicroWishVO comActMicroWishVO);
}

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

@@ -1,22 +1,24 @@
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.ComActActPrizeVO;
import com.panzhihua.common.model.vos.community.ActivitySignVO;
import com.panzhihua.common.model.vos.community.ComActActivityVO;
import com.panzhihua.service_community.dao.ComActActPrizeDAO;
import com.panzhihua.service_community.dao.ComActActSignDAO;
import com.panzhihua.service_community.dao.ComActActivityDAO;
import com.panzhihua.service_community.model.dos.ComActActPrizeDO;
import com.panzhihua.service_community.model.dos.ComActActSignDO;
import com.panzhihua.service_community.model.dos.ComActActivityDO;
import com.panzhihua.service_community.service.ComActActivityService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;

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

/**
@@ -28,12 +30,22 @@
@Service
public class ComActActivityServiceImpl extends ServiceImpl<ComActActivityDAO, ComActActivityDO> implements ComActActivityService {
    @Resource
    private ComActActPrizeDAO comActActPrizeDAO;

    private ComActActivityDAO comActActivityDAO;
    @Resource
    private ComActActSignDAO comActActSignDAO;
    /**
     * 新增社区活动
     * @param comActActivityVO 新增信息
     * @return 新增结果
     */
    @Override
    public R addActivity(ComActActivityVO comActActivityVO) {
        ComActActivityDO comActActivityDO=new ComActActivityDO();
        BeanUtils.copyProperties(comActActivityVO,comActActivityDO);
        Integer status = comActActivityVO.getStatus();
        if (status.intValue()!=1) {
            comActActivityDO.setPublishAt(new Date());//发布时间
        }
        boolean save = this.save(comActActivityDO);
        if(!save){
            return R.fail();
@@ -42,4 +54,106 @@
        Long activityId = one.getId();
        return R.ok(activityId);
    }

    /**
     * 编辑社区活动
     *
     * @param comActActivityVO 编辑内容
     * @return 编辑结果
     */
    @Override
    public R putActivity(ComActActivityVO comActActivityVO) {
        ComActActivityDO comActActivityDO=new ComActActivityDO();
        BeanUtils.copyProperties(comActActivityVO,comActActivityDO);
        boolean b = this.updateById(comActActivityDO);
        if (b) {
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 分页查询社区活动
     *
     * @param comActActivityVO 查询参数
     * @return 分页集合
     */
    @Override
    public R pageActivity(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.pageActivity(page, comActActivityVO);
        return R.ok(iPage);
    }

    /**
     * 发布活动
     *
     * @param comActActivityVO 主键id 发布时间
     * @return 发布结果
     */
    @Override
    public R releaseActivity(ComActActivityVO comActActivityVO) {
        ComActActivityDO comActActivityDO=new ComActActivityDO();
        comActActivityDO.setId(comActActivityVO.getId());
        comActActivityDO.setPublishAt(comActActivityVO.getPublishAt());
        comActActivityDO.setStatus(comActActivityVO.getStatus());
        int update = comActActivityDAO.updateById(comActActivityDO);
        if (update>0) {
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 取消活动
     *
     * @param comActActivityVO 取消原因
     * @return 取消结果
     */
    @Override
    public R cancelActivity(ComActActivityVO comActActivityVO) {
        ComActActivityDO comActActivityDO=new ComActActivityDO();
        comActActivityDO.setId(comActActivityVO.getId());
        comActActivityDO.setStatus(comActActivityVO.getStatus());
        comActActivityDO.setCancelReason(comActActivityVO.getCancelRenson());
        int update = comActActivityDAO.updateById(comActActivityDO);
        if (update>0) {
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 活动详情
     *
     * @param id 活动id
     * @return 详情
     */
    @Override
    public ComActActivityVO inforActivity(Long id) {
        ComActActivityVO comActActivityVO=comActActivityDAO.inforActivity(id);
        return comActActivityVO;
    }

    /**
     * 活动报名名单
     *
     * @param activitySignVO 查询参数
     * @return 报名人员集合
     */
    @Override
    public R listActivitySign(ActivitySignVO activitySignVO) {
        List<ActivitySignVO> activitySignVOS = comActActSignDAO.listActivitySign(activitySignVO);
        return R.ok(activitySignVOS);
    }
}

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

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

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.ComActDynVO;
import com.panzhihua.service_community.dao.ComActDynDAO;
import com.panzhihua.service_community.model.dos.ComActDynDO;
import com.panzhihua.service_community.service.ComActDynService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;

import javax.annotation.Resource;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -14,4 +23,45 @@
 **/
@Service
public class ComActDynServiceImpl extends ServiceImpl<ComActDynDAO, ComActDynDO> implements ComActDynService {
    @Resource
    private ComActDynDAO comActDynDAO;
    /**
     * 分页查询社区动态
     *
     * @param comActDynVO 查询参数
     * @return 动态集合
     */
    @Override
    public R pageDynamic(ComActDynVO comActDynVO) {
        Page page = new Page<>();
        Long pageNum = comActDynVO.getPageNum();
        Long pageSize = comActDynVO.getPageSize();
        if (ObjectUtils.isEmpty(pageNum)||0==pageNum) {
            pageNum = 1l;
        }
        if (ObjectUtils.isEmpty(pageSize)||0==pageSize) {
            pageSize = 10l;
        }
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        IPage<ComActDynVO> iPage = comActDynDAO.pageDynamic(page, comActDynVO);
        return R.ok(iPage);
    }

    /**
     * 社区动态详情
     *
     * @param id 动态id
     * @return 详情
     */
    @Override
    public R detailDynamic(String id) {
        ComActDynDO comActDynDO = this.getById(id);
        if (ObjectUtils.isEmpty(comActDynDO)) {
            return R.fail("社区动态不存在");
        }
        ComActDynVO comActDynVO=new ComActDynVO();
        BeanUtils.copyProperties(comActDynDO,comActDynVO);
        return R.ok(comActDynVO);
    }
}

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

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

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.model.dos.ComActEasyPhotoDO;
import com.panzhihua.service_community.service.ComActEasyPhotoService;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;

import javax.annotation.Resource;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -14,4 +22,43 @@
 **/
@Service
public class ComActEasyPhotoServiceImpl extends ServiceImpl<ComActEasyPhotoDAO, ComActEasyPhotoDO> implements ComActEasyPhotoService {
    @Resource
    private ComActEasyPhotoDAO comActEasyPhotoDAO;
    /**
     * 分页查询随手拍
     *
     * @param comActEasyPhotoVO 查询参数
     * @return 心愿列表
     */
    @Override
    public R pageEasyPhoto(ComActEasyPhotoVO comActEasyPhotoVO) {
        Page page = new Page<>();
        Long pageNum = comActEasyPhotoVO.getPageNum();
        Long pageSize = comActEasyPhotoVO.getPageSize();
        if (ObjectUtils.isEmpty(pageNum)||0==pageNum) {
            pageNum = 1l;
        }
        if (ObjectUtils.isEmpty(pageSize)||0==pageSize) {
            pageSize = 10l;
        }
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        IPage<ComActEasyPhotoVO> iPage = comActEasyPhotoDAO.pageEasyPhoto(page, comActEasyPhotoVO);
        return R.ok(iPage);
    }

    /**
     * 随手拍详情
     *
     * @param id 随手拍主键
     * @return 详情内容
     */
    @Override
    public R detailEasyPhoto(Long id) {
        ComActEasyPhotoVO comActEasyPhotoVO=comActEasyPhotoDAO.detailEasyPhoto(id);
        if (ObjectUtils.isEmpty(comActEasyPhotoVO)) {
            return R.fail();
        }
        return R.ok(comActEasyPhotoVO);
    }
}

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

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

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.model.dos.ComActMicroWishDO;
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;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -14,4 +23,103 @@
 **/
@Service
public class ComActMicroWishServiceImpl extends ServiceImpl<ComActMicroWishDAO, ComActMicroWishDO> implements ComActMicroWishService {
    @Resource
    private ComActMicroWishDAO comActMicroWishDAO;

    /**
     * 分页查询微心愿
     *
     * @param comActMicroWishVO 查询参数
     * @return 心愿列表
     */
    @Override
    public R pageMicroWish(ComActMicroWishVO comActMicroWishVO) {
        Page page = new Page<>();
        Long pageNum = comActMicroWishVO.getPageNum();
        Long pageSize = comActMicroWishVO.getPageSize();
        if (ObjectUtils.isEmpty(pageNum) || 0 == pageNum) {
            pageNum = 1l;
        }
        if (ObjectUtils.isEmpty(pageSize) || 0 == pageSize) {
            pageSize = 10l;
        }
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        IPage<ComActMicroWishVO> iPage = comActMicroWishDAO.pageMicroWish(page, comActMicroWishVO);
        return R.ok(iPage);
    }

    /**
     * 心愿详情
     *
     * @param id 查询主键
     * @return 心愿内容
     */
    @Override
    public R detailMicroWish(Long id) {
        ComActMicroWishVO comActMicroWishVO = comActMicroWishDAO.detailMicroWish(id);
        if (ObjectUtils.isEmpty(comActMicroWishVO)) {
            return R.fail();
        }
        return R.ok(comActMicroWishVO);
    }

    /**
     * 审核、分配、反馈心愿
     *
     * @param comActMicroWishVO 具体操作
     * @return 操作结果
     */
    @Override
    public R putlMicroWish(ComActMicroWishVO comActMicroWishVO) {
        Long id = comActMicroWishVO.getId();
        Integer type = comActMicroWishVO.getType();
        if (ObjectUtils.isEmpty(type)||type>5||type<1) {
            return R.fail("操作类型不对");
        }
        String rejectReason = comActMicroWishVO.getRejectReason();
        Long responsibleId = comActMicroWishVO.getResponsibleId();
        String feedback = comActMicroWishVO.getFeedback();
        String feedbackPhotoPathList = comActMicroWishVO.getFeedbackPhotoPathList();
        ComActMicroWishDO comActMicroWishDO=new ComActMicroWishDO();
        comActMicroWishDO.setId(id);
//        1 审核通过 2驳回 3分配人员 4发起活动 5反馈
        switch (type){
            case 1:
                comActMicroWishDO.setEvaluateAt(new Date());
                comActMicroWishDO.setStatus(2);//待分配
                break;
            case 2:
                comActMicroWishDO.setEvaluateAt(new Date());
                comActMicroWishDO.setRejectReason(rejectReason);
                comActMicroWishDO.setStatus(4);//驳回
                break;
            case 3:
                comActMicroWishDO.setEvaluateAt(new Date());
                comActMicroWishDO.setResponsibleId(responsibleId);
                comActMicroWishDO.setStatus(3);//进行中
                comActMicroWishDO.setForm(1);
                break;
            case 4:
                comActMicroWishDO.setEvaluateAt(new Date());
                comActMicroWishDO.setResponsibleId(responsibleId);
                comActMicroWishDO.setStatus(3);//进行中
                comActMicroWishDO.setForm(2);
//                todo 给负责人增加一个待办事件
                break;
            case 5:
                comActMicroWishDO.setEvaluateAt(new Date());
                comActMicroWishDO.setStatus(5);//待确认
                comActMicroWishDO.setFeedback(feedback);
                comActMicroWishDO.setFeedbackPhotoPathList(feedbackPhotoPathList);
                break;
            default:
                break;
        }
        int update = comActMicroWishDAO.updateById(comActMicroWishDO);
        if (update>0) {
            return R.ok();
        }
        return R.fail();
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/application.yml

@@ -1,5 +1,5 @@
server:
  port: 8199
  port: 8291
spring:
  application:
    name: community