随手拍改版接口开发

huanghongfa

2021-08-20 d5c417181f625a0c219efa15483990c3cf01b5fd

随手拍改版接口开发

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

@@ -13,6 +13,7 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.advertisement.ComOpsAdvVO;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoClassifyVO;
import com.panzhihua.common.model.vos.user.NoticeUnReadVO;
import com.panzhihua.common.model.vos.user.SysUserAgreementVO;
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
@@ -358,4 +359,10 @@
    public R readUserReward(){
        return communityService.readUserReward(this.getUserId(),this.getCommunityId());
    }

    @ApiOperation(value = "随手拍分类列表", response = ComActEasyPhotoClassifyVO.class)
    @GetMapping("easyphoto/classify/list")
    public R easyPhotoClassifyList() {
        return communityService.listPhotoClassify();
    }
}

 springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/EasyPhotoClassifyApi.java

New file
@@ -0,0 +1,51 @@
package com.panzhihua.applets_backstage.api;

import com.panzhihua.common.model.dtos.community.easyPhoto.AddEasyPhotoClassifyDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

@Slf4j
@Api(tags = {"随手拍分类"})
@RestController
@RequestMapping("/classify")
public class EasyPhotoClassifyApi {

    @Resource
    private CommunityService communityService;

    @ApiOperation(value = "随手拍分类-新增")
    @PostMapping("/add")
    public R addPhotoClassify(@RequestBody AddEasyPhotoClassifyDTO addPhotoClassify) {
        return communityService.addPhotoClassify(addPhotoClassify);
    }

    @ApiOperation(value = "随手拍分类-编辑")
    @PostMapping("/edit")
    public R editPhotoClassify(@RequestBody AddEasyPhotoClassifyDTO addPhotoClassify) {
        return communityService.editPhotoClassify(addPhotoClassify);
    }

    @ApiOperation(value = "随手拍分类-分页")
    @PostMapping("/page")
    public R pagePhotoClassify(@RequestBody AddEasyPhotoClassifyDTO addPhotoClassify) {
        return communityService.pagePhotoClassify(addPhotoClassify);
    }

    @ApiOperation(value = "随手拍分类-详情")
    @GetMapping("/detail")
    public R detailPhotoClassify(@RequestParam("id") Long id) {
        return communityService.detailPhotoClassify(id);
    }

    @ApiOperation(value = "随手拍分类-删除")
    @GetMapping("/delete")
    public R deletePhotoClassify(@RequestParam("id") Long id) {
        return communityService.deletePhotoClassify(id);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/easyPhoto/AddEasyPhotoClassifyDTO.java

New file
@@ -0,0 +1,29 @@
package com.panzhihua.common.model.dtos.community.easyPhoto;

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

@Data
@ApiModel("添加随手拍活动请求参数")
public class AddEasyPhotoClassifyDTO {

    @ApiModelProperty("随手拍分类id")
    private Long id;

    @ApiModelProperty("随手拍分类名称")
    private String name;

    @ApiModelProperty("权重")
    private Integer weight;

    @ApiModelProperty("备注")
    private String remark;

    @ApiModelProperty(value = "分页每页数量",example = "10")
    private Long pageSize = 10L;

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

}

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

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

    @ApiModelProperty("操作类型 1审核通过 2驳回 3反馈 4.完成随手拍")
    @ApiModelProperty("操作类型 1处理随手拍 2驳回 3反馈 4.完成随手拍")
    private Integer type;

    @ApiModelProperty(value = "登录用户id",hidden = true)
@@ -143,7 +143,7 @@
    @ApiModelProperty(value = "发生地址经纬度信息，逗号分割(长的在前面，短的在后面)")
    private String lngLat;

    @ApiModelProperty(value = "随手拍标签（1.优质 2.精良 3.普通 4.一般）")
    @ApiModelProperty(value = "随手拍标签（1.优质 2.精良 3.普通 4.一般 5.无）")
    private Integer activityType;

    @ApiModelProperty(value = "参加活动奖励金额")
@@ -173,9 +173,31 @@
    @ApiModelProperty(value = "是否上报城管 0未上报 1已上报 2已退回")
    private Integer isReportUrban;

    @ApiModelProperty(value = "城管移交说明（备注）")
    private String transferReason;

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

    @ApiModelProperty(value = "城管安排状态 0未安排 1已安排 2已处理")
    private Integer urbanStatus;

    @ApiModelProperty(value = "社区名字")
    private String communityName;

    @ApiModelProperty(value = "随手拍分类id")
    private Long classifyId;

    @ApiModelProperty(value = "随手拍分类名称")
    private String classifyName;

    /**
     * 是否上报城管 0未上报 1已上报 2已退回
     */
    public interface isReportUrban{
        int no = 0;
        int yes = 1;
        int ret = 2;
    }
}

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

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

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

@Data
@ApiModel("随手拍分类返回参数")
public class ComActEasyPhotoClassifyVO {

    @ApiModelProperty("随手拍分类id")
    private Long id;

    @ApiModelProperty("随手拍分类名称")
    private String name;

    @ApiModelProperty("权重")
    private Integer weight;

    @ApiModelProperty("备注")
    private String remark;

}

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

@@ -10,10 +10,7 @@
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityPeopleListDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenDiscussListDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenMicroListDTO;
import com.panzhihua.common.model.dtos.community.easyPhoto.AddEasyPhotoActivityDTO;
import com.panzhihua.common.model.dtos.community.easyPhoto.EditEasyPhotoActivityDTO;
import com.panzhihua.common.model.dtos.community.easyPhoto.PageEasyPhotoActivityDTO;
import com.panzhihua.common.model.dtos.community.easyPhoto.PageEasyPhotoActivityUserDTO;
import com.panzhihua.common.model.dtos.community.easyPhoto.*;
import com.panzhihua.common.model.dtos.community.integral.ComActIntegralCommunityRankDTO;
import com.panzhihua.common.model.dtos.community.integral.admin.AddComActIntegralUserDTO;
import com.panzhihua.common.model.dtos.community.integral.admin.EditComActIntegralRuleDTO;
@@ -4217,6 +4214,9 @@
    @PostMapping("timedTaskActivityNotice")
    R timedTaskActivityNotice();

    /**
     * 定时任务检测待发布，调研中的问卷调查状态
     */
    @PostMapping("timedTaskQuestionnaire")
    R timedTaskQuestionnaire();

@@ -4266,4 +4266,59 @@
     */
    @GetMapping("/questnaire/statisticsSummary/header")
    R statisticsSummaryHeader(@RequestParam("questId") Long questId);

    /**
     * 运营后台-新增随手拍分类
     * @param addPhotoClassify  请求参数
     * @return  新增结果
     */
    @PostMapping("/classify/admin/add")
    R addPhotoClassify(@RequestBody AddEasyPhotoClassifyDTO addPhotoClassify);

    /**
     * 运营后台-编辑随手拍分类
     * @param addPhotoClassify  请求参数
     * @return  编辑结果
     */
    @PostMapping("/classify/admin/edit")
    R editPhotoClassify(@RequestBody AddEasyPhotoClassifyDTO addPhotoClassify);

    /**
     * 运营后台-分页查询随手拍分类
     * @param addPhotoClassify  请求参数
     * @return  随手拍分类列表
     */
    @PostMapping("/classify/admin/page")
    R pagePhotoClassify(@RequestBody AddEasyPhotoClassifyDTO addPhotoClassify);

    /**
     * 运营后台-随手拍分类详情
     * @param id    随手拍分类id
     * @return  随手拍分类
     */
    @GetMapping("/classify/admin/detail")
    R detailPhotoClassify(@RequestParam("id") Long id);

    /**
     * 运营后台-随手拍分类删除
     * @param id    随手拍分类id
     * @return  删除结果
     */
    @GetMapping("/classify/admin/delete")
    R deletePhotoClassify(@RequestParam("id") Long id);

    /**
     * 运营后台-查询随手拍分类列表
     * @return  随手拍分类列表
     */
    @GetMapping("/classify/admin/list")
    R listPhotoClassify();

    /**
     * 社区后台-切换随手拍公示状态
     * @param comActEasyPhotoVO 请求参数
     * @return  切换结果
     */
    @PostMapping("/easyphoto/switch/publicity")
    R easyPhotoSwitchPublicity(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO);
}

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

@@ -8,6 +8,7 @@
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoClassifyVO;
import com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoStatisticsVO;
import com.panzhihua.common.model.vos.partybuilding.ActivityManagerVO;
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
@@ -529,4 +530,15 @@
        return communityService.grantReward(grantRewardDTO);
    }

    @ApiOperation(value = "随手拍分类列表", response = ComActEasyPhotoClassifyVO.class)
    @GetMapping("easyphoto/classify/list")
    public R easyPhotoClassifyList() {
        return communityService.listPhotoClassify();
    }

    @ApiOperation(value = "随手拍切换公示状态", response = ComActEasyPhotoClassifyVO.class)
    @PostMapping("easyphoto/switch/publicity")
    public R easyPhotoSwitchPublicity(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
        return communityService.easyPhotoSwitchPublicity(comActEasyPhotoVO);
    }
}

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

@@ -1551,6 +1551,12 @@
        return comActQuestnaireService.usersAnsweQuestnaire(usersAnswerQuestnaireVO);
    }

    /**
     * 小程序-用户弹窗添加不在提醒接口
     * @param questId   问卷id
     * @param userId    用户id
     * @return  添加结果
     */
    @GetMapping("questnaire/add/noNotice")
    public R addNoNotice(@RequestParam("questId") Long questId,@RequestParam("userId") Long userId){
        return comActQuestnaireService.addNoNotice(questId,userId);
@@ -1839,29 +1845,61 @@
        return comActActivityService.timedTaskActivityNotice();
    }


    /**
     * 问卷调查统计汇总
     * @param summaryDTO   请求参数
     * @return  统计汇总
     */
    @PostMapping("questnaire/statisticsSummary")
    public R statisticsSummary(@RequestBody StatisticsSummaryDTO summaryDTO) {
        return comActQuestnaireService.statisticsSummary(summaryDTO);
    }

    /**
     * 问卷调查统计汇总导出数据查询
     * @param questId   调查问卷id
     * @return  调查统计汇总导出数据
     */
    @GetMapping("questnaire/statisticsSummary/export")
    public R statisticsSummaryExport(@RequestParam("questId") Long questId) {
        return comActQuestnaireService.statisticsSummaryExport(questId);
    }

    /**
     * 问卷调查统计汇总表头统计
     * @param questId   调查问卷id
     * @return  问卷调查统计汇总表头统计数据
     */
    @GetMapping("questnaire/statisticsSummary/header")
    public R statisticsSummaryHeader(@RequestParam("questId") Long questId) {
        return comActQuestnaireService.statisticsSummaryHeader(questId);
    }

    /**
     * 定时任务检测待发布，调研中的问卷调查状态
     */
    @PostMapping("timedTaskQuestionnaire")
    public R timedTaskQuestionnaire(){
        return comActQuestnaireService.timedTaskQuestionnaire();
    }

    /**
     * 小程序-新增问卷调查浏览数量
     * @param questId   问卷调查id
     * @return  增加结果
     */
    @GetMapping("questnaire/add/view")
    public R addQuestnaireView(@RequestParam("questId") Long questId) {
        return comActQuestnaireService.addQuestnaireView(questId);
    }

    /**
     * 社区后台-切换随手拍公示状态
     * @param comActEasyPhotoVO 请求参数
     * @return  切换结果
     */
    @PostMapping("easyphoto/switch/publicity")
    public R easyPhotoSwitchPublicity(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
        return comActEasyPhotoService.easyPhotoSwitchPublicity(comActEasyPhotoVO);
    }
}

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

New file
@@ -0,0 +1,77 @@
package com.panzhihua.service_community.api;

import com.panzhihua.common.model.dtos.community.easyPhoto.AddEasyPhotoClassifyDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.service.ComActEasyPhotoClassifyService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

@Slf4j
@RestController
@RequestMapping("/classify")
public class EasyPhotoClassifyApi {

    @Resource
    private ComActEasyPhotoClassifyService comActEasyPhotoClassifyService;

    /**
     * 运营后台-新增随手拍分类
     * @param addPhotoClassify  请求参数
     * @return  新增结果
     */
    @PostMapping("/admin/add")
    public R addPhotoClassify(@RequestBody AddEasyPhotoClassifyDTO addPhotoClassify) {
        return comActEasyPhotoClassifyService.addPhotoClassify(addPhotoClassify);
    }

    /**
     * 运营后台-编辑随手拍分类
     * @param addPhotoClassify  请求参数
     * @return  编辑结果
     */
    @PostMapping("/admin/edit")
    public R editPhotoClassify(@RequestBody AddEasyPhotoClassifyDTO addPhotoClassify) {
        return comActEasyPhotoClassifyService.editPhotoClassify(addPhotoClassify);
    }

    /**
     * 运营后台-随手拍分类详情
     * @param id    随手拍分类id
     * @return  随手拍分类
     */
    @GetMapping("/admin/detail")
    public R detailPhotoClassify(@RequestParam("id") Long id) {
        return comActEasyPhotoClassifyService.detailPhotoClassify(id);
    }

    /**
     * 运营后台-分页查询随手拍分类
     * @param addPhotoClassify  请求参数
     * @return  随手拍分类列表
     */
    @PostMapping("/admin/page")
    public R pagePhotoClassify(@RequestBody AddEasyPhotoClassifyDTO addPhotoClassify) {
        return comActEasyPhotoClassifyService.pagePhotoClassify(addPhotoClassify);
    }

    /**
     * 运营后台-查询随手拍分类列表
     * @return  随手拍分类列表
     */
    @GetMapping("/admin/list")
    public R listPhotoClassify() {
        return comActEasyPhotoClassifyService.listPhotoClassify();
    }

    /**
     * 运营后台-随手拍分类删除
     * @param id    随手拍分类id
     * @return  删除结果
     */
    @GetMapping("/admin/delete")
    public R deletePhotoClassify(@RequestParam("id") Long id) {
        return comActEasyPhotoClassifyService.deletePhotoClassify(id);
    }
}

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

New file
@@ -0,0 +1,35 @@
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.dtos.community.easyPhoto.AddEasyPhotoClassifyDTO;
import com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoClassifyVO;
import com.panzhihua.service_community.model.dos.ComActEasyPhotoClassifyDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * @auther lyq
 * @create 2021-08-19 15:50:58
 * @describe 随手拍分类表mapper类
 */
@Mapper
public interface ComActEasyPhotoClassifyMapper extends BaseMapper<ComActEasyPhotoClassifyDO> {

    /**
     * 运营后台-分页查询随手拍分类
     * @param photoClassifyDTO  请求参数
     * @return  随手拍分类列表
     */
    IPage<ComActEasyPhotoClassifyVO> getPhotoClassifyPage(Page page, @Param("photoClassifyDTO") AddEasyPhotoClassifyDTO photoClassifyDTO);

    /**
     * 运营后台-查询随手拍分类列表
     * @return  随手拍分类列表
     */
    List<ComActEasyPhotoClassifyVO> getPhotoClassifyList();

}

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

@@ -201,6 +201,7 @@
            "p.handle_photo_list " +
            "c.name communityName " +
            "p.transfer_time" +
            "p.is_report_urban" +
            "p.transfer_reason" +
            "p.urban_status" +
            "FROM " +
@@ -252,6 +253,8 @@
            "p.feedback_at, " +
            "p.activity_type, " +
            "p.activity_amount, " +
            "p.classify_id, " +
            "class.`name` as classifyName, " +
            "p.examine_at  " +
            "FROM " +
            "com_act_easy_photo p " +
@@ -259,8 +262,9 @@
            "left join  com_act_easy_photo_user pu ON p.id = pu.easy_photo_id  " +
            "left JOIN sys_user su ON p.handler_id = su.user_id  " +
            "left JOIN com_act_easy_photo_comment c ON p.id = c.easy_photo_id  " +
            "left JOIN com_act_easy_photo_classify class ON p.classify_id = class.id  " +
            " <where>" +
            " p.del_tag = 0  "  +
            " p.del_tag = 0 and p.is_publicity = 1 "  +
            "<if test='comActEasyPhotoVO.communityId != null and comActEasyPhotoVO.communityId != 0'>" +
            "  and p.community_id=#{comActEasyPhotoVO.communityId} " +
            " </if> " +
@@ -273,6 +277,9 @@
            "<if test='comActEasyPhotoVO.sponsorId == null or comActEasyPhotoVO.sponsorId==0'>" +
            "AND p.`status` in (2,4)  " +
            " </if> " +
            "<if test='comActEasyPhotoVO.keyWord != null and comActEasyPhotoVO.keyWord != &quot;&quot;'>" +
            "AND (class.`name` like concat(#{comActEasyPhotoVO.keyWord},'%') or p.detail like concat(#{comActEasyPhotoVO.keyWord},'%'))   " +
            " </if> " +
            "group by p.id "+
            "order by p.create_at desc "+
            " </where>" +

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

@@ -145,10 +145,25 @@
     */
    QuestnaireDetailAdminVO getQuesDetail(@Param("questId") Long questId,@Param("userId") Long userId);

    /**
     * 问卷调查统计汇总
     * @param summaryDTO   请求参数
     * @return  统计汇总
     */
    IPage<QuestnaireStatisticsSummaryAdminVO> getStatisticsSummaryAdmin(Page page, @Param("summaryDTO") StatisticsSummaryDTO summaryDTO);

    /**
     * 问卷调查统计汇总导出数据查询
     * @param questId   调查问卷id
     * @return  调查统计汇总导出数据
     */
    List<QuestnaireStatisticsSummaryExcelAdminVO> getStatisticsSummaryExcelAdmin(@Param("questId") Long questId);

    /**
     * 问卷调查统计汇总表头统计
     * @param questId   调查问卷id
     * @return  问卷调查统计汇总表头统计数据
     */
    QuestnaireStatisticsSummaryHeaderAdminVO statisticsSummaryHeader(@Param("questId") Long questId);

    void addNoNotice(@Param("questId") Long questId,@Param("userId") Long userId);

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

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

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

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


/**
 * @auther lyq
 * @create 2021-08-19 15:50:58
 * @describe 随手拍分类表实体类
 */

@Data
@TableName("com_act_easy_photo_classify")
public class ComActEasyPhotoClassifyDO implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * 主键id
     */
    @TableId(type = IdType.AUTO)
    private Long id;

    /**
     * 随手拍分类名称
     */
    private String name;

    /**
     * 状态（1.启用 2.禁用）
     */
    private Integer status;

    /**
     * 权重
     */
    private Integer weight;

    /**
     * 备注
     */
    private String remark;

    /**
     * 创建时间
     */
    private Date createAt;

    /**
     * 修改时间
     */
    private Date updateAt;

    /**
     * 状态（1.启用 2.禁用）
     */
    public interface status{
        int yes = 1;
        int no = 2;
    }

    @Override
    public String toString() {
        return "ComActEasyPhotoClassifyDO{" +
                "id=" + id +
                ", name=" + name +
                ", status=" + status +
                ", weight=" + weight +
                ", remark=" + remark +
                ", createAt=" + createAt +
                ", updateAt=" + updateAt +
                "}";
    }
}

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

@@ -145,6 +145,34 @@
     * 完成人id
     */
    private Long completeId;
    /**
     * 是否上报到城管（ 0未上报 1已上报 2已退回）
     */
    private Integer isReportUrban;
    /**
     * 城管安排状态 （0未安排 1已安排 2已处理）
     */
    private Integer urbanStatus;
    /**
     * 城管退回原因
     */
    private String backResult;
    /**
     * 移交时间
     */
    private Date transferTime;
    /**
     * 移交说明
     */
    private String transferReason;
    /**
     * 退回时间
     */
    private Date backTime;
    /**
     * 随手拍分类id
     */
    private Long classifyId;

    /**
     * 参加活动标签（1.优质 2.精良 3.普通 4.一般）
@@ -154,6 +182,7 @@
        int jl = 2;
        int pt = 3;
        int yb = 4;
        int wu = 5;
    }

    /**

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

New file
@@ -0,0 +1,57 @@
package com.panzhihua.service_community.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.community.easyPhoto.AddEasyPhotoClassifyDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.model.dos.ComActEasyPhotoClassifyDO;

/**
 * @auther lyq
 * @create 2021-08-19 15:50:58
 * @describe 随手拍分类表服务类
 */
public interface ComActEasyPhotoClassifyService extends IService<ComActEasyPhotoClassifyDO> {

    /**
     * 运营后台-新增随手拍分类
     * @param addPhotoClassify  请求参数
     * @return  新增结果
     */
    R addPhotoClassify(AddEasyPhotoClassifyDTO addPhotoClassify);

    /**
     * 运营后台-编辑随手拍分类
     * @param addPhotoClassify  请求参数
     * @return  编辑结果
     */
    R editPhotoClassify(AddEasyPhotoClassifyDTO addPhotoClassify);

    /**
     * 运营后台-随手拍分类详情
     * @param id    随手拍分类id
     * @return  随手拍分类
     */
    R detailPhotoClassify(Long id);

    /**
     * 运营后台-分页查询随手拍分类
     * @param addPhotoClassify  请求参数
     * @return  随手拍分类列表
     */
    R pagePhotoClassify(AddEasyPhotoClassifyDTO addPhotoClassify);

    /**
     * 运营后台-查询随手拍分类列表
     * @return  随手拍分类列表
     */
    R listPhotoClassify();

    /**
     * 运营后台-随手拍分类删除
     * @param id    随手拍分类id
     * @return  删除结果
     */
    R deletePhotoClassify(Long id);


}

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

@@ -114,5 +114,12 @@
     */
    R readUserReward(Long userId,Long communityId);

    /**
     * 社区后台-切换随手拍公示状态
     * @param comActEasyPhotoVO 请求参数
     * @return  切换结果
     */
    R easyPhotoSwitchPublicity(ComActEasyPhotoVO comActEasyPhotoVO);


}

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

@@ -117,15 +117,44 @@
     */
    R getQuesDetail(Long questId,Long userId);

    /**
     * 问卷调查统计汇总
     * @param summaryDTO   请求参数
     * @return  统计汇总
     */
    R statisticsSummary(StatisticsSummaryDTO summaryDTO);

    /**
     * 问卷调查统计汇总导出数据查询
     * @param questId   调查问卷id
     * @return  调查统计汇总导出数据
     */
    R statisticsSummaryExport(Long questId);

    /**
     * 问卷调查统计汇总表头统计
     * @param questId   调查问卷id
     * @return  问卷调查统计汇总表头统计数据
     */
    R statisticsSummaryHeader(Long questId);

    /**
     * 定时任务检测待发布，调研中的问卷调查状态
     */
    R timedTaskQuestionnaire();

    /**
     * 小程序-新增问卷调查浏览数量
     * @param questId   问卷调查id
     * @return  增加结果
     */
    R addQuestnaireView(Long questId);

    /**
     * 小程序-用户弹窗添加不在提醒接口
     * @param questId   问卷id
     * @param userId    用户id
     * @return  添加结果
     */
    R addNoNotice(Long questId,Long userId);
}

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

New file
@@ -0,0 +1,119 @@
package com.panzhihua.service_community.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.community.easyPhoto.AddEasyPhotoClassifyDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoClassifyVO;
import com.panzhihua.service_community.dao.ComActEasyPhotoClassifyMapper;
import com.panzhihua.service_community.model.dos.ComActEasyPhotoClassifyDO;
import com.panzhihua.service_community.service.ComActEasyPhotoClassifyService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

import java.util.Date;

/**
 * @auther lyq
 * @create 2021-08-19 15:50:58
 * @describe 随手拍分类表服务实现类
 */
@Slf4j
@Service
public class ComActEasyPhotoClassifyServiceImpl extends ServiceImpl<ComActEasyPhotoClassifyMapper, ComActEasyPhotoClassifyDO> implements ComActEasyPhotoClassifyService {

    /**
     * 运营后台-新增随手拍分类
     * @param addPhotoClassify  请求参数
     * @return  新增结果
     */
    @Override
    public R addPhotoClassify(AddEasyPhotoClassifyDTO addPhotoClassify){
        ComActEasyPhotoClassifyDO photoClassifyDO = this.baseMapper.selectOne(new QueryWrapper<ComActEasyPhotoClassifyDO>().lambda()
                .eq(ComActEasyPhotoClassifyDO::getName,addPhotoClassify.getName()));
        if(photoClassifyDO != null){
            return R.fail("该随手拍分类已存在，请勿重复添加");
        }
        photoClassifyDO = new ComActEasyPhotoClassifyDO();
        BeanUtils.copyProperties(addPhotoClassify,photoClassifyDO);
        photoClassifyDO.setCreateAt(new Date());
        photoClassifyDO.setStatus(ComActEasyPhotoClassifyDO.status.yes);
        if(this.baseMapper.insert(photoClassifyDO) > 0){
            return R.ok();
        }else{
            return R.fail();
        }
    }

    /**
     * 运营后台-编辑随手拍分类
     * @param addPhotoClassify  请求参数
     * @return  编辑结果
     */
    @Override
    public R editPhotoClassify(AddEasyPhotoClassifyDTO addPhotoClassify){
        ComActEasyPhotoClassifyDO photoClassifyDO = this.baseMapper.selectById(addPhotoClassify.getId());
        if(photoClassifyDO == null){
            return R.fail("该随手拍分类不存在");
        }
        BeanUtils.copyProperties(addPhotoClassify,photoClassifyDO);
        photoClassifyDO.setUpdateAt(new Date());
        if(this.baseMapper.insert(photoClassifyDO) > 0){
            return R.ok();
        }else{
            return R.fail();
        }
    }

    /**
     * 运营后台-随手拍分类详情
     * @param id    随手拍分类id
     * @return  随手拍分类
     */
    @Override
    public R detailPhotoClassify(Long id){
        ComActEasyPhotoClassifyVO photoClassifyVO = new ComActEasyPhotoClassifyVO();
        ComActEasyPhotoClassifyDO photoClassifyDO = this.baseMapper.selectById(id);
        if(photoClassifyDO == null){
            return R.fail("该随手拍分类不存在");
        }
        BeanUtils.copyProperties(photoClassifyDO,photoClassifyVO);
        return R.ok(photoClassifyVO);
    }

    /**
     * 运营后台-分页查询随手拍分类
     * @param addPhotoClassify  请求参数
     * @return  随手拍分类列表
     */
    @Override
    public R pagePhotoClassify(AddEasyPhotoClassifyDTO addPhotoClassify){
        return R.ok(this.baseMapper.getPhotoClassifyPage(new Page(addPhotoClassify.getPageNum(),addPhotoClassify.getPageSize()),addPhotoClassify));
    }

    /**
     * 运营后台-查询随手拍分类列表
     * @return  随手拍分类列表
     */
    @Override
    public R listPhotoClassify(){
        return R.ok(this.baseMapper.getPhotoClassifyList());
    }

    /**
     * 运营后台-随手拍分类删除
     * @param id    随手拍分类id
     * @return  删除结果
     */
    @Override
    public R deletePhotoClassify(Long id){
        if(this.baseMapper.deleteById(id) > 0){
            return R.ok();
        }else{
            return R.fail();
        }
    }

}

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

@@ -87,7 +87,6 @@
                }else {
                    comActEasyPhotoVO1.setHaveGiveThumbsUp(1);
                }
                comActEasyPhotoVO1.setPhone(SensitiveUtil.desensitizedPhoneNumber(comActEasyPhotoVO1.getPhone()));

                if(comActEasyPhotoVO1.getActivityId() != null && comActEasyPhotoVO1.getStatus().equals(ComActEasyPhotoDO.status.ywc)){
                    //查询随手拍活动
@@ -102,6 +101,8 @@
                                comActEasyPhotoVO1.setActivityMoney(photoActivityDO.getOrdinaryReward());
                            }else if(comActEasyPhotoVO1.getActivityType().equals(ComActEasyPhotoDO.activityType.yb)){
                                comActEasyPhotoVO1.setActivityMoney(photoActivityDO.getCommonlyReward());
                            }else if(comActEasyPhotoVO1.getActivityType().equals(ComActEasyPhotoDO.activityType.wu)){
                                comActEasyPhotoVO1.setActivityMoney(BigDecimal.ZERO);
                            }
                        }
                    }
@@ -248,11 +249,19 @@
        switch (type){
            case 1:
                if(!cmActEasyPhotoDO.getStatus().equals(ComActEasyPhotoDO.status.dsh)){
                    return R.fail("该随手拍已审核，不可重复操作");
                    return R.fail("该随手拍已处理，不可重复操作");
                }
                cmActEasyPhotoDO.setStatus(2);//进行中
                cmActEasyPhotoDO.setIsNeedFeedBack(1);
                cmActEasyPhotoDO.setHandlerId(comActEasyPhotoVO.getUserId());
                cmActEasyPhotoDO.setIsPublicity(comActEasyPhotoVO.getIsPublicity());
                if(comActEasyPhotoVO.getIsReportUrban().equals(ComActEasyPhotoVO.isReportUrban.yes)){
                    cmActEasyPhotoDO.setIsReportUrban(ComActEasyPhotoVO.isReportUrban.yes);
                    cmActEasyPhotoDO.setTransferReason(comActEasyPhotoVO.getTransferReason());
                    cmActEasyPhotoDO.setTransferTime(nowDate);
                }else{
                    cmActEasyPhotoDO.setIsReportUrban(ComActEasyPhotoVO.isReportUrban.no);
                    cmActEasyPhotoDO.setHandlerId(comActEasyPhotoVO.getHandlerId());
                }
                cmActEasyPhotoDO.setExamineAt(nowDate);
                cmActEasyPhotoDO.setActivityType(comActEasyPhotoVO.getActivityType());
                if(StringUtils.isNotEmpty(comActEasyPhotoVO.getHandleResult()) || StringUtils.isNotEmpty(comActEasyPhotoVO.getHandlePhotoList())){
@@ -269,17 +278,17 @@
                comActUserWalletService.examineAddMoney(comActEasyPhotoVO.getActivityType(),comActEasyPhotoVO.getId(),comActEasyPhotoVO.getUserId(),BigDecimal.ZERO);
                break;
            case 2:
                if(!cmActEasyPhotoDO.getStatus().equals(ComActEasyPhotoDO.status.dsh)){
                    return R.fail("该随手拍已审核，不可重复操作");
                }
                cmActEasyPhotoDO.setHandlerId(comActEasyPhotoVO.getUserId());
                cmActEasyPhotoDO.setStatus(3);//已驳回
                cmActEasyPhotoDO.setExamineAt(nowDate);
                cmActEasyPhotoDO.setRejectReason(comActEasyPhotoVO.getRejectReason());
//                if(!cmActEasyPhotoDO.getStatus().equals(ComActEasyPhotoDO.status.dsh)){
//                    return R.fail("该随手拍已处理，不可重复操作");
//                }
//                cmActEasyPhotoDO.setHandlerId(comActEasyPhotoVO.getUserId());
//                cmActEasyPhotoDO.setStatus(3);//已驳回
//                cmActEasyPhotoDO.setExamineAt(nowDate);
//                cmActEasyPhotoDO.setRejectReason(comActEasyPhotoVO.getRejectReason());
                break;
            case 3:
                if(!cmActEasyPhotoDO.getStatus().equals(ComActEasyPhotoDO.status.dfk)){
                    return R.fail("该随手拍不是待反馈状态，不可进行反馈");
                    return R.fail("该随手拍不是进行中状态，不可进行反馈");
                }
                //给随手拍新增反馈信息
                ComActEasyPhotoFeedbackDO photoFeedbackDO = new ComActEasyPhotoFeedbackDO();
@@ -304,13 +313,13 @@
                    photoFeedback.setCreateBy(comActEasyPhotoVO.getUserId());
                    comActEasyPhotoFeedbackMapper.insert(photoFeedback);
                }
                if(cmActEasyPhotoDO.getStatus().equals(ComActEasyPhotoDO.status.dsh)){
                    cmActEasyPhotoDO.setExamineAt(nowDate);
                    cmActEasyPhotoDO.setHandlerId(comActEasyPhotoVO.getUserId());
                    cmActEasyPhotoDO.setActivityType(comActEasyPhotoVO.getActivityType());
                    //审核通过判断随手拍是否有活动并计算用户收益
                    comActUserWalletService.examineAddMoney(comActEasyPhotoVO.getActivityType(),comActEasyPhotoVO.getId(),comActEasyPhotoVO.getUserId(),BigDecimal.ZERO);
                }
//                if(cmActEasyPhotoDO.getStatus().equals(ComActEasyPhotoDO.status.dsh)){
//                    cmActEasyPhotoDO.setExamineAt(nowDate);
//                    cmActEasyPhotoDO.setHandlerId(comActEasyPhotoVO.getUserId());
//                    cmActEasyPhotoDO.setActivityType(comActEasyPhotoVO.getActivityType());
//                    //审核通过判断随手拍是否有活动并计算用户收益
//                    comActUserWalletService.examineAddMoney(comActEasyPhotoVO.getActivityType(),comActEasyPhotoVO.getId(),comActEasyPhotoVO.getUserId(),BigDecimal.ZERO);
//                }
                cmActEasyPhotoDO.setFeedbackAt(nowDate);
                cmActEasyPhotoDO.setStatus(ComActEasyPhotoDO.status.ywc);
                cmActEasyPhotoDO.setCompleteId(comActEasyPhotoVO.getUserId());
@@ -628,5 +637,25 @@
        return R.ok();
    }

    /**
     * 社区后台-切换随手拍公示状态
     * @param comActEasyPhotoVO 请求参数
     * @return  切换结果
     */
    @Override
    public R easyPhotoSwitchPublicity(ComActEasyPhotoVO comActEasyPhotoVO){
        //查询随手拍
        ComActEasyPhotoDO easyPhotoDO = this.baseMapper.selectById(comActEasyPhotoVO.getId());
        if(easyPhotoDO == null){
            return R.fail("未查询到随手拍记录");
        }
        easyPhotoDO.setIsPublicity(comActEasyPhotoVO.getIsPublicity());
        if(this.baseMapper.updateById(easyPhotoDO) > 0){
            return R.ok();
        }else{
            return R.fail();
        }
    }


}

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

@@ -664,6 +664,11 @@
        return R.ok(result);
    }

    /**
     * 问卷调查统计汇总
     * @param summaryDTO   请求参数
     * @return  统计汇总
     */
    @Override
    public R statisticsSummary(StatisticsSummaryDTO summaryDTO){
        IPage<QuestnaireStatisticsSummaryAdminVO> summaryAdminList = questnaireDAO.getStatisticsSummaryAdmin(new Page(summaryDTO.getPageNum(),summaryDTO.getPageSize()),summaryDTO);
@@ -674,9 +679,14 @@
                summary.setTag(BigDecimal.valueOf(summary.getCount()).divide(BigDecimal.valueOf(summary.getAllCount()),2, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)));
            }
        });
        return R.ok(questnaireDAO.getStatisticsSummaryAdmin(new Page(summaryDTO.getPageNum(),summaryDTO.getPageSize()),summaryDTO));
        return R.ok(summaryAdminList);
    }

    /**
     * 问卷调查统计汇总导出数据查询
     * @param questId   调查问卷id
     * @return  调查统计汇总导出数据
     */
    @Override
    public R statisticsSummaryExport(Long questId){
        List<QuestnaireStatisticsSummaryExcelAdminVO> summaryExcelList = questnaireDAO.getStatisticsSummaryExcelAdmin(questId);
@@ -690,12 +700,20 @@
        return R.ok(summaryExcelList);
    }

    /**
     * 问卷调查统计汇总表头统计
     * @param questId   调查问卷id
     * @return  问卷调查统计汇总表头统计数据
     */
    @Override
    public R statisticsSummaryHeader(Long questId){
        QuestnaireStatisticsSummaryHeaderAdminVO summaryHeaderAdminVO = this.questnaireDAO.statisticsSummaryHeader(questId);
        return R.ok(summaryHeaderAdminVO);
    }

    /**
     * 定时任务检测待发布，调研中的问卷调查状态
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R timedTaskQuestionnaire(){
@@ -721,6 +739,11 @@
        return R.ok();
    }

    /**
     * 小程序-新增问卷调查浏览数量
     * @param questId   问卷调查id
     * @return  增加结果
     */
    @Override
    public R addQuestnaireView(Long questId){
        ComActQuestnaireDO questnaireDO = questnaireDAO.selectById(questId);
@@ -731,6 +754,12 @@
        return R.ok();
    }

    /**
     * 小程序-用户弹窗添加不在提醒接口
     * @param questId   问卷id
     * @param userId    用户id
     * @return  添加结果
     */
    @Override
    public R addNoNotice(Long questId,Long userId){
        questnaireDAO.addNoNotice(questId,userId);

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoClassifyDOMapper.xml

New file
@@ -0,0 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.panzhihua.service_community.dao.ComActEasyPhotoClassifyMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.panzhihua.service_community.model.dos.ComActEasyPhotoClassifyDO">
        <id column="id" property="id" />
        <result column="name" property="name" />
        <result column="status" property="status" />
        <result column="weight" property="weight" />
        <result column="remark" property="remark" />
        <result column="create_at" property="createAt" />
        <result column="update_at" property="updateAt" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, name, status, weight, remark, create_at, update_at
    </sql>

    <select id="getPhotoClassifyPage" resultType="com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoClassifyVO">
        select id,`name`,`status`,weight,remark,create_at,update_at from com_act_easy_photo_classify
        <where>
            <if test="photoClassifyDTO.name != null and photoClassifyDTO.name != &quot;&quot;">
                and `name` like concat (#{photoClassifyDTO.name},'%')
            </if>
        </where>
        order by create_at desc
    </select>

    <select id="getPhotoClassifyList" resultType="com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoClassifyVO">
        select id,`name`,`status`,weight,remark,create_at,update_at from com_act_easy_photo_classify
        order by create_at desc
    </select>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoDOMapper.xml

@@ -57,6 +57,9 @@
            p.activity_type,
            p.activity_amount,
            p.activity_id,
            p.is_report_urban,
            p.classify_id,
            ca.`name` as classifyName,
            p.examine_at,
            c.name  communityName
        FROM
@@ -65,18 +68,22 @@
            LEFT JOIN com_act_easy_photo_user pu ON p.id = pu.easy_photo_id
            LEFT JOIN sys_user su ON p.handler_id = su.user_id
            left join com_act c on p.community_id =c.community_id
            left join com_act_easy_photo_classify ca on ca.id = p.classify_id
        WHERE
            p.del_tag = 0
            p.del_tag = 0 and p.`status` != 2
        <if test='comActEasyPhotoVO.communityId != null and comActEasyPhotoVO.communityId != 0'>
          and p.community_id=#{comActEasyPhotoVO.communityId}
        </if>
        <if test='comActEasyPhotoVO.status != null and comActEasyPhotoVO.status!=0' >
          AND p.`status` = #{comActEasyPhotoVO.status}
        </if>
        <if test='comActEasyPhotoVO.isReportUrban != null and comActEasyPhotoVO.isReportUrban!=0' >
        <if test='comActEasyPhotoVO.isPublicity != null' >
            AND p.`is_publicity` = #{comActEasyPhotoVO.isPublicity}
        </if>
        <if test='comActEasyPhotoVO.isReportUrban != null' >
            AND p.`is_report_urban` = #{comActEasyPhotoVO.isReportUrban}
        </if>
        <if test='comActEasyPhotoVO.urbanStatus != null and comActEasyPhotoVO.urbanStatus!=0' >
        <if test='comActEasyPhotoVO.urbanStatus != null' >
            AND p.`urban_status` = #{comActEasyPhotoVO.urbanStatus}
        </if>
        <if test='comActEasyPhotoVO.createBegin != null  '>

 springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/filters/JWTAuthenticationTokenFilter.java

@@ -222,6 +222,7 @@
                noLoginUrl.add("/api/applets/index/pagecomacteasyphotocomment");
                noLoginUrl.add("/api/applets/index/pagemicrowish");
                noLoginUrl.add("/api/applets/index/microwish");
                noLoginUrl.add("/api/applets/index/easyphoto/classify/list");
                noLoginUrl.add("/api/applets/index/getUserReward");
                noLoginUrl.add("/api/applets/pagediscuss");
                noLoginUrl.add("/api/applets/discuss");