Merge branch 'test' into 'master'

罗元桥

2021-07-12 0dc0a47cf5f655cb0dbff082f7c36613c21e328b

Merge branch 'test' into 'master'

Test

See merge request root/zhihuishequ!94

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

@@ -48,8 +48,8 @@
        }
        Integer type = comActDiscussDTO.getType();
        String voteTitle = comActDiscussDTO.getVoteTitle();
        List<String> discussOptions = comActDiscussDTO.getDiscussOptions();
        if (type.intValue()==2 ) {
        List<ComActDiscussOptionDTO> discussOptions = comActDiscussDTO.getDiscussOptions();
        if (type.equals(2)) {
            if(ObjectUtils.isEmpty(voteTitle)){
                return R.fail("投票标题不能为空");
            }

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

@@ -6,6 +6,7 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleAppVO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleDetailAppVO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleTopicAppVO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCommentReplyAppVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.StringUtils;
@@ -162,5 +163,15 @@
        commentReplyAppDTO.setUserId(userId);
        return communityService.neighborCommentReplyByApp(commentReplyAppDTO);
    }

    @ApiOperation(value = "查询社区邻里圈话题列表" , response = ComActNeighborCircleTopicAppVO.class)
    @GetMapping("topic/list")
    public R getNeighborTopicByApp() {
        Long communityId = this.getCommunityId();
        if(communityId == null){
            return R.fail("请先绑定社区");
        }
        return communityService.getNeighborTopicByApp(communityId);
    }
}


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/Constants.java

@@ -146,4 +146,6 @@
    public static final String ZONG_ZHI_GRID_MEMBER_IMAGE_URL = "https://www.psciio.com//idcard/57bf4104a76741cfabfead0bb8218307.jpg";

    public static final String ZZ_APP_TAG_LIST = "{\"list\":[\"流动人口\",\"户籍人口\",\"社区矫正\",\"吸毒人员\",\"重精患者\",\"刑满释放\"]}";

    public static final String PROFIT_EXPLAIN = "<p>一、简介</p><p>活动期间内，居民发布随手拍内容可获得一定现金奖励，具体奖励金额以社区设置为准，最终由对应社区统一结算。</p><p>二、如何使用</p><p>居民获得收益后由对应社区结算，具体结算方式由社区根据实际情况进行处理。</p><p>三、如何获得</p><p>1.参与活动</p><p>活动期间内，用户可以在西区社区通“随手拍”板块，用照片和视频记录展示社区生活；</p><p>活动由所在社区添加管理，社区发布活动后居民可进行参与。</p><p>2.&nbsp;社区审核</p><p>社区通过对用户发布内容的质量（优质、精良、普通内容）和价值进行审核，酌情对相关用户进行奖励；</p><p>3.&nbsp;获得奖励</p><p>审核完成后，根据社区设置的内容质量奖励金额下发奖励。</p><p>若内容被工作人员驳回将不可获得奖励。</p><p>&nbsp;</p><p><br></p>";
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/EventTasksStatusEnum.java

@@ -7,10 +7,10 @@
public enum  EventTasksStatusEnum {

    DZF(1,"待走访"),
    JXZ(2,"进行中"),
    ZJJJ(3,"正常"),
    DYZ(4,"待验证"),
    CG(5,"草稿"),
    YJJ(2,"已解决"),
    ZJJJ(3,"待验证"),
    DYZ(4,"草稿箱"),
    CG(5,"已撤销"),
    YCX(6,"已撤销"),
    YC(7,"异常"),
    ;

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/IdDTO.java

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

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

import javax.validation.constraints.NotNull;

@@ -10,17 +11,14 @@
 * @date 2021/6/28 16:30
 */
@ApiModel("id参数")
@Data
public class IdDTO {

    @NotNull(message = "id不能为空")
    @ApiModelProperty("id")
    private String id;

    public String getId() {
        return id;
    }
    @ApiModelProperty("网格id")
    private Long gridId;

    public void setId(String id) {
        this.id = id;
    }
}

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

@@ -52,7 +52,6 @@
    private String voteTitle;

    @ApiModelProperty("选项集合")
    private List<String> discussOptions;

    private List<ComActDiscussOptionDTO> discussOptions;

}

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

New file
@@ -0,0 +1,23 @@
package com.panzhihua.common.model.dtos.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: 2021-01-22 15:34
 **/
@Data
@ApiModel("一起议投票选项参数")
public class ComActDiscussOptionDTO {

    @ApiModelProperty("选项图片url")
    private String optionUrl;

    @ApiModelProperty("选项内容")
    private String optionContent;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/BigScreenEventDTO.java

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

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

@Data
@ApiModel("事件大屏请求参数")
public class BigScreenEventDTO {

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

    @ApiModelProperty(value = "查询开始时间")
    private String startTime;

    @ApiModelProperty(value = "查询结束时间")
    private String endTime;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/bigscreen/BigScreenStatisticPartyActivityDTO.java

@@ -20,14 +20,22 @@
    //@NotNull(message = "社区id不能为空")
    private Long communityId;

    @ApiModelProperty(value = "类型：3 按月;默认为3", hidden = false, example = "3", required = false)
    @ApiModelProperty(value = "类型：3 按月 2.按周;默认为3", hidden = false, example = "3", required = false)
    @NotNull(message = "类型不能为空")
    private Integer type = 3;

    @ApiModelProperty(value = "日期", hidden = false, example = "2021-06-01", required = true)
    @NotNull(message = "时间不能为空")
//    @NotNull(message = "时间不能为空")
    @Pattern(regexp = "^\\d{4}-\\d{2}-\\d{2}$", message = "时间格式错误")
    private String date;

    @ApiModelProperty(value = "开始时间", hidden = false, example = "2021-06-01")
    @Pattern(regexp = "^\\d{4}-\\d{2}-\\d{2}$", message = "时间格式错误")
    private String startTime;

    @ApiModelProperty(value = "结束时间", hidden = false, example = "2021-06-01")
    @Pattern(regexp = "^\\d{4}-\\d{2}-\\d{2}$", message = "时间格式错误")
    private String endTime;


}

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

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

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.validator.constraints.Length;

import java.math.BigDecimal;
import java.util.Date;

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

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

    @ApiModelProperty("活动开始时间")
    private String activityStartAt;

    @ApiModelProperty("活动结束时间")
    private String activityEndAt;

    @ApiModelProperty("活动简介")
    @Length(max=20)
    private String content;

    @ApiModelProperty("优质奖励金额")
    private BigDecimal goodReward;

    @ApiModelProperty("精良奖励金额")
    private BigDecimal excellentReward;

    @ApiModelProperty("普通奖励金额")
    private BigDecimal ordinaryReward;

    @ApiModelProperty("活动图片")
    private String logo;
}

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

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

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

import java.math.BigDecimal;
import java.util.Date;

@Data
@ApiModel("编辑随手拍活动请求参数")
public class EditEasyPhotoActivityDTO {

    @ApiModelProperty("随手拍活动id")
    private Long id;

    @ApiModelProperty("活动开始时间")
    private String activityStartAt;

    @ApiModelProperty("活动结束时间")
    private String activityEndAt;

    @ApiModelProperty("活动简介")
    private String content;

    @ApiModelProperty("优质奖励金额")
    private BigDecimal goodReward;

    @ApiModelProperty("精良奖励金额")
    private BigDecimal excellentReward;

    @ApiModelProperty("普通奖励金额")
    private BigDecimal ordinaryReward;

    @ApiModelProperty("活动图片")
    private String logo;
}

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

New file
@@ -0,0 +1,28 @@
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 PageEasyPhotoActivityDTO {

    @ApiModelProperty("活动状态（1.待开始 2.进行中 3.已结束  4.已取消）")
    private Integer status;

    @ApiModelProperty("活动开始时间")
    private String startTime;

    @ApiModelProperty("活动结束时间")
    private String endTime;

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

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

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

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

New file
@@ -0,0 +1,19 @@
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 PageEasyPhotoActivityUserDTO {

    @ApiModelProperty(value = "活动id")
    private Long activityId;

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

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

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/wallet/ComActWalletSettlementAdminDTO.java

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

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

import java.math.BigDecimal;

@Data
@ApiModel("用户结算收益请求参数")
public class ComActWalletSettlementAdminDTO {

    @ApiModelProperty("钱包id")
    private Long id;

    @ApiModelProperty("结算金额")
    private BigDecimal settlementAmount;

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

    @ApiModelProperty(value = "登录用户id",hidden = true)
    private Long userId;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/wallet/PageComActWalletAdminDTO.java

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

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

@Data
@ApiModel("收益结算列表请求参数")
public class PageComActWalletAdminDTO {

    @ApiModelProperty("用户名称")
    private String name;

    @ApiModelProperty("手机号")
    private String phone;

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

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

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

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/wallet/PageComActWalletTradeAdminDTO.java

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

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

@Data
@ApiModel("收益结算列表请求参数")
public class PageComActWalletTradeAdminDTO {

    @ApiModelProperty("用户名称")
    private String name;

    @ApiModelProperty("手机号")
    private String phone;

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

    @ApiModelProperty("交易类型（1.发布随手拍 2.结算）")
    private Integer type;

    @ApiModelProperty("开始时间")
    private String startTime;

    @ApiModelProperty("结束时间")
    private String endTime;

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

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

    @ApiModelProperty("排序（1.升序 2.降序）")
    private Integer sort;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridDataAddAdminDTO.java

@@ -51,9 +51,12 @@
    @ApiModelProperty(value = "网格员id集合", hidden = false, example = "")
    private List<Long> memberIds;

    @ApiModelProperty(value = "网格所属社区ID", hidden = true, example = "1")
    @ApiModelProperty(value = "网格所属社区ID", hidden = false, example = "1")
    private Long gridCommunityId;

    @ApiModelProperty(value = "市平台网格关联id", hidden = false, example = "")
    private Long lcGridId;

    @ApiModelProperty(value = "当前登录用户id", hidden = true, example = "1")
    private Long userId;


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridDataEditAdminDTO.java

@@ -57,4 +57,9 @@
    @ApiModelProperty(value = "当前登录用户id", hidden = true, example = "1")
    private Long userId;

    @ApiModelProperty(value = "市平台网格关联id", hidden = false, example = "")
    private Long lcGridId;

    @ApiModelProperty(value = "网格所属社区ID", hidden = false, example = "1")
    private Long gridCommunityId;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageComMngPopulationDTO.java

@@ -4,6 +4,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

/**
 * 分页查询表单
 *
@@ -25,4 +27,7 @@
    @ApiModelProperty(value = "关键词")
    private String keyWord;

    @ApiModelProperty(value = "已选中实有人口id集合")
    private List<Long> populationIds;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventDTO.java

@@ -288,4 +288,7 @@
    @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
    private Long userId;

    @ApiModelProperty(value = "是否查询全部（1.是 2.否）", hidden = false, example = "true")
    private Integer isAll;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/AddComActNeighborCircleAppDTO.java

@@ -19,6 +19,9 @@
    @ApiModelProperty("邻里圈图片url")
    private String releaseImages;

    @ApiModelProperty("邻里圈话题id")
    private Long topicId;

    @ApiModelProperty(value = "用户id",hidden = true)
    private Long userId;


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/AddNeighborCircleTopicAdminDTO.java

New file
@@ -0,0 +1,30 @@
package com.panzhihua.common.model.dtos.neighbor;

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

/**
 * @auther lyq
 * @describe 邻里圈话题列表请求参数
 */
@Data
@ApiModel("邻里圈话题列表请求参数")
public class AddNeighborCircleTopicAdminDTO {

    @ApiModelProperty("话题名称")
    private String name;

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

    @ApiModelProperty(value = "登录用户id",hidden = true)
    private Long userId;

    @ApiModelProperty(value="发布状态(1.启用 2.禁用)")
    private Integer status;

    @ApiModelProperty("话题id")
    private Long id;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAdminDTO.java

@@ -39,4 +39,7 @@
    @ApiModelProperty(value="发布状态(1.待审核 2.显示 3.隐藏 4.驳回)")
    private Integer status;

    @ApiModelProperty("话题名称")
    private String topicName;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAppDTO.java

@@ -22,6 +22,9 @@
    @ApiModelProperty("邻里圈查询类型（1.热门 2.最新 3.精品）")
    private Integer type = 1;

    @ApiModelProperty("话题id")
    private Long topicId;

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


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleTopicAdminDTO.java

New file
@@ -0,0 +1,30 @@
package com.panzhihua.common.model.dtos.neighbor;

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

/**
 * @auther lyq
 * @describe 邻里圈话题列表请求参数
 */
@Data
@ApiModel("邻里圈话题列表请求参数")
public class ComActNeighborCircleTopicAdminDTO {

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

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

    @ApiModelProperty("话题名称")
    private String name;

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

    @ApiModelProperty(value="发布状态(1.启用 2.禁用)")
    private Integer status;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/query/visit/EventTasksQuery.java

@@ -37,6 +37,9 @@

    private Long userId;

    @ApiModelProperty("网格id")
    private Long gridId;

    @ApiModelProperty("正常状态（0.正常 1.异常）")
    private Integer exception;
}

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

@@ -20,4 +20,8 @@
    private String dictValue;
    @ApiModelProperty(value = "字典项助记码")
    private String code;
    /**
     * 字典id
     */
    private Long dictId;
}

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

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

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

import java.io.Serializable;

/**
 * @author manailin
 * @date 2021/6/11 16:27
 */
@ApiModel("字典")
@Data
public class DictionaryVO implements Serializable {
    private Long id;
    @ApiModelProperty(value = "字典项名称")
    private String dictName;
    @ApiModelProperty(value = "字典项值")
    private String dictKey;
    @ApiModelProperty(value = "字典项助记码")
    private Long parentId;

    /**
     * 层级
     */
    private Integer levelIndex;

}

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

@@ -77,4 +77,7 @@
    @ApiModelProperty("二级评论集合")
    private List<ComActDiscussCommentVO> comActDiscussCommentVOList;

    @ApiModelProperty("评论人用户类型（1.小程序用户（其他均为后台用户））")
    private Integer userType;

}

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

@@ -25,10 +25,16 @@
    @ApiModelProperty("选项内容")
    private String optionContent;

    @ApiModelProperty("选项图片url")
    private String optionUrl;

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

    @ApiModelProperty("投票数量")
    private Integer num;

    @ApiModelProperty("是否已经投票 1 是 0 否")
    private Integer haveVote;
}

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

@@ -73,4 +73,7 @@
    @ApiModelProperty("是否已经投票 1 是 0 否")
    private Integer haveVote;

    @ApiModelProperty("用户类型 1 小程序 2 运营平台 3 社区平台 5 商家后台 6 网格综治APP 7 网格综治后台")
    private Integer userType;

}

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

@@ -22,11 +22,11 @@
    private String content;

    @ApiModelProperty("活动开始时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
    private Date activityStartAt;

    @ApiModelProperty("活动结束时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
    private Date activityEndAt;

    @ApiModelProperty("优质奖励金额")
@@ -40,4 +40,11 @@

    @ApiModelProperty("活动图片")
    private String logo;

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

    @ApiModelProperty("随手拍参与次数")
    private Integer count;
}

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

@@ -148,4 +148,7 @@

    @ApiModelProperty(value = "参加活动奖励金额")
    private BigDecimal activityAmount;

    @ApiModelProperty(value = "类型（1.心情类 2.治理类）")
    private Integer easyType;
}

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

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

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

import java.math.BigDecimal;
import java.util.Date;

@Data
@ApiModel("随手拍活动居民参与列表返回参数")
public class ComActEasyPhotoActivityUserVO {

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

    @ApiModelProperty("用户昵称")
    private String nickName;

    @ApiModelProperty("用户姓名")
    private String userName;

    @ApiModelProperty("用户手机号")
    private String phone;

    @ApiModelProperty("随手拍内容")
    private String detail;

    @ApiModelProperty("随手拍标签（1.优质 2.精良 3.普通）")
    private Integer activityType;

    @ApiModelProperty("随手拍活动奖励金额")
    private BigDecimal activityAmount;

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

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

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

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

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

import java.math.BigDecimal;
import java.util.Date;

@Data
@ApiModel("随手拍活动返回参数")
public class ComActEasyPhotoActivityVO {

    @ApiModelProperty("活动id")
    private Long id;

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

    @ApiModelProperty("活动状态（1.待开始 2.进行中 3.已结束  4.已取消）")
    private Integer status;

    @ApiModelProperty("活动简介")
    private String content;

    @ApiModelProperty("活动开始时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date activityStartAt;

    @ApiModelProperty("活动结束时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date activityEndAt;

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

    @ApiModelProperty("优质奖励金额")
    private BigDecimal goodReward;

    @ApiModelProperty("精良奖励金额")
    private BigDecimal excellentReward;

    @ApiModelProperty("普通奖励金额")
    private BigDecimal ordinaryReward;

    @ApiModelProperty("参与活动随手拍数量")
    private Integer count;

    @ApiModelProperty("活动图片地址")
    private String logo;

}

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

New file
@@ -0,0 +1,22 @@
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 ComActEasyPhotoStatisticsVO {

    @ApiModelProperty("待审核数量")
    private Integer examineNum;

    @ApiModelProperty("待验证数量")
    private Integer verificationNum;

    @ApiModelProperty("已驳回数量")
    private Integer rejectNum;

    @ApiModelProperty("已完成数量")
    private Integer completeNum;
}

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

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

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

import java.math.BigDecimal;

@Data
@ApiModel("收益结算列表返回参数")
public class ComActWalletAdminVO {

    @ApiModelProperty("钱包id")
    private Long id;

    @ApiModelProperty("用户id")
    private Long userId;

    @ApiModelProperty("收益总金额")
    private BigDecimal incomeAmount;

    @ApiModelProperty("可用金额(未结算金额)")
    private BigDecimal availableAmount;

    @ApiModelProperty("结算金额")
    private BigDecimal settlementAmount;

    @ApiModelProperty("用户昵称")
    private String nickName;

    @ApiModelProperty("用户姓名")
    private String userName;

    @ApiModelProperty("手机号")
    private String phone;
}

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

@@ -13,9 +13,15 @@
    @ApiModelProperty("钱包id")
    private Long id;

    @ApiModelProperty("姓名")
    @ApiModelProperty("昵称")
    private String nickName;

    @ApiModelProperty("姓名")
    private String userName;

    @ApiModelProperty("用户头像")
    private String imageUrl;

    @ApiModelProperty("收益总金额")
    private BigDecimal incomeAmount;


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

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

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

import java.math.BigDecimal;
import java.util.Date;

@Data
@ApiModel("交易记录列表返回参数")
public class ComActWalletTradeAdminVO {

    @ApiModelProperty("交易记录id")
    private Long id;

    @ApiModelProperty("用户id")
    private Long userId;

    @ApiModelProperty("用户昵称")
    private String nickName;

    @ApiModelProperty("用户姓名")
    private String userName;

    @ApiModelProperty("用户手机号")
    private String phone;

    @ApiModelProperty("变动类型（1.增加  2.减少）")
    private Integer changeType;

    @ApiModelProperty("交易金额")
    private BigDecimal amount;

    @ApiModelProperty("交易类型（1.发布随手拍 2.结算）")
    private Integer type;

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

    @ApiModelProperty("操作人")
    private String operationUserName;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridAdminVO.java

@@ -41,4 +41,8 @@
    private String data;
    @ApiModelProperty(value = "所在社区")
    private String communityName;
    @ApiModelProperty(value = "关联市平台id")
    private String lcGirdId;
    @ApiModelProperty(value = "关联市平台网格")
    private String lcGirdName;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridCommunityAdminVO.java

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

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
import java.util.Date;
import java.util.List;

@Data
@ApiModel("管理后台-社区返回参数")
public class EventGridCommunityAdminVO {

    @ApiModelProperty(value = "社区id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long communityId;
    @ApiModelProperty(value = "社区名称")
    private String name;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventLcGridAdminVO.java

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

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@ApiModel("管理后台-市平台网格返回参数")
public class EventLcGridAdminVO {

    @ApiModelProperty(value = "市平台网格关联id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;

    @ApiModelProperty(value = "浪潮市平台网格名称")
    private String lcGridName;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/GridMemberVO.java

@@ -1,8 +1,11 @@
package com.panzhihua.common.model.vos.grid;

import com.panzhihua.common.model.vos.grid.admin.GridMemberBuildingVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

@Data
@ApiModel("管理后台-网格员返回参数")
@@ -28,5 +31,9 @@
    private Integer workStartTime;
    @ApiModelProperty(value = "网格员上班结束时间")
    private Integer workEndTime;
    @ApiModelProperty(value = "市平台网格员关联id")
    private Long lcMemberId;
    @ApiModelProperty(value = "网格员关联楼栋信息")
    private List<GridMemberBuildingVO> memberBuildingList;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/PopulationListVO.java

@@ -64,4 +64,10 @@
    @JsonSerialize(using = ToStringSerializer.class)
    private Long housePopulationId;

    @ApiModelProperty(value = "经度")
    private String lng;

    @ApiModelProperty(value = "纬度")
    private String lat;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/admin/GridMemberBuildingVO.java

New file
@@ -0,0 +1,29 @@
package com.panzhihua.common.model.vos.grid.admin;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@ApiModel("管理后台-网格员与楼栋关联关系返回参数")
public class GridMemberBuildingVO {

    @ApiModelProperty(value = "社区id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long communityId;
    @ApiModelProperty(value = "社区名字")
    private String communityName;
    @ApiModelProperty(value = "小区id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long villageId;
    @ApiModelProperty(value = "小区名字")
    private String villageName;
    @ApiModelProperty(value = "楼栋id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long buildingId;
    @ApiModelProperty(value = "楼栋名字")
    private String buildingName;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAdminVO.java

@@ -27,6 +27,8 @@
    @ApiModelProperty("发布人")
    private String releaseName;

    @ApiModelProperty("话题名称")
    private String topicName;

    @ApiModelProperty(value = "用户类型 1 小程序 2 运营平台 3 社区平台",hidden = true)
    private Integer userType;

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAppVO.java

@@ -100,4 +100,7 @@
     */
    @ApiModelProperty("社区id")
    private Long communityId;

    @ApiModelProperty("话题名称")
    private String topicName;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleDetailAppVO.java

@@ -73,4 +73,7 @@
    @ApiModelProperty("社区id")
    private Long communityId;

    @ApiModelProperty("邻里圈话题名字")
    private String topicName;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleTopicAdminVO.java

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

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

import java.util.Date;

/**
 * @auther lyq
 * @describe 邻里圈话题返回参数
 */
@Data
@ApiModel("邻里圈话题返回参数")
public class ComActNeighborCircleTopicAdminVO {

    @ApiModelProperty("id")
    private Long id;

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

    @ApiModelProperty("话题名字")
    private String name;

    @ApiModelProperty(value = "状态（1.启用  2.禁用）")
    private Integer status;

    @ApiModelProperty("发布人")
    private String createBy;

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

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleTopicAppVO.java

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

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

import java.util.Date;

/**
 * @auther lyq
 * @describe 邻里圈话题返回参数
 */
@Data
@ApiModel("邻里圈话题返回参数")
public class ComActNeighborCircleTopicAppVO {

    @ApiModelProperty("id")
    private Long id;

    @ApiModelProperty("话题名字")
    private String name;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/DetailNeighborCircleAdminVO.java

@@ -54,4 +54,7 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;

    @ApiModelProperty("话题名称")
    private String topicName;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitingTasksDetailsVO.java

@@ -63,6 +63,9 @@
    @EncryptDecryptField
    private String visiterTele;

    @ApiModelProperty(value = "需走访人电话")
    private String visiterPhone;

    @ApiModelProperty(value = "需走访人居住地址")
    private String visiterAddress;

@@ -128,7 +131,7 @@
    private Date submitDate;

    @ApiModelProperty(value = "是否异常行为:0否，1是")
    private Boolean exception;
    private Integer exception;

    @ApiModelProperty(value = "走访内容根据重点人员类型输入项不同，录入全部的表单内容数据")
    private JSONObject tableContentJson;

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitingTasksVO.java

@@ -51,6 +51,7 @@

    @ExcelProperty(value = "身份证号码",index = 3)
    @ApiModelProperty(value = "身份证号码")
    @EncryptDecryptField
    private String cardNoStr;

    @ExcelProperty(value = "走访地址",index = 4)
@@ -214,5 +215,8 @@
    @ApiModelProperty(value = "民族")
    private String nation;

    @ApiModelProperty(value = "政治面貌(1.中共党员2.中共预备党员3.共青团员4.民革党员5.民盟盟员6.民建会员7.8.农工党党员9.致公党党员10.九三学社社员11.台盟盟员12.无党派人士13.群众)")
    private Integer politicalOutlook;


}

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

@@ -5,16 +5,16 @@
import com.panzhihua.common.model.dtos.advertisement.ComOpsAdvDTO;
import com.panzhihua.common.model.dtos.advertisement.PageComOpsAdvDTO;
import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDetailDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenStatisticAgeGenderDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenStatisticPartyActivityDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.PageBigScreenStatisticPartyOrg;
import com.panzhihua.common.model.dtos.community.bigscreen.*;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityListDTO;
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.wallet.ComActWalletDetailDTO;
import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeDTO;
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.wallet.*;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthGetResultDTO;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthPageDTO;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthUserAddAppDTO;
@@ -24,10 +24,7 @@
import com.panzhihua.common.model.dtos.shop.*;
import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
import com.panzhihua.common.model.dtos.vaccines.*;
import com.panzhihua.common.model.vos.BcDictionaryItemVO;
import com.panzhihua.common.model.vos.BcDictionaryVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
import com.panzhihua.common.model.vos.*;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticAgeGender;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyActivity;
@@ -2939,6 +2936,24 @@
    R listSaveBuildingExcelVO(@RequestBody List<ComMngBuildingExcelVO> newVoList, @RequestParam("communityId") Long communityId);

    /**
     * 插入字典
     * @param dictionaryVO  字典数据
     * @return R  是否保存成功
     * @author manailin
     * @date 2021/6/10 17:00
     */
    @PostMapping("/dictionary/insertDiction")
    R  insertDiction(@RequestBody DictionaryVO dictionaryVO);
    /**
     * 插入字典项
     * @param dictionaryVO  字典数据
     * @return R  是否保存成功
     * @author manailin
     * @date 2021/6/10 17:00
     */
    @PostMapping("/dictionary/insertDictionItem")
    R  insertDictionItem(@RequestBody BcDictionaryVO dictionaryVO);
    /**
     * 根据字典key查询字典项
     *
     * @param key
@@ -3124,11 +3139,11 @@
    /**
     * 事件大屏统计接口
     *
     * @param communityId 社区id
     * @param screenEventDTO 请求参数
     * @return 统计结果
     */
    @GetMapping("/screen/getScreenEvent")
    R getScreenEvent(@RequestParam("communityId") Long communityId);
    @PostMapping("/screen/getScreenEvent")
    R getScreenEvent(@RequestBody BigScreenEventDTO screenEventDTO);

    /**
     * 民生大屏统计接口
@@ -3484,4 +3499,122 @@
     */
    @PostMapping("/village/admin/export")
    R getGridVillageListExport(@RequestBody ComMngVillageListExportAdminDTO villageListAppDTO);

    /**
     * 社区后台-分页查询随手拍活动列表
     * @param pageEasyPhotoActivityDTO  请求参数
     * @return  随手拍活动列表
     */
    @PostMapping("/easy/photo/activity/page")
    R pageEasyPhotoActivity(@RequestBody PageEasyPhotoActivityDTO pageEasyPhotoActivityDTO);

    /**
     * 社区后台-添加随手拍活动
     * @param addEasyPhotoActivityDTO   请求参数
     * @return  添加结果
     */
    @PostMapping("/easy/photo/activity/add")
    R addEasyPhotoActivity(@RequestBody AddEasyPhotoActivityDTO addEasyPhotoActivityDTO);

    /**
     * 社区后台-编辑随手拍活动
     * @param editEasyPhotoActivityDTO  请求参数
     * @return  编辑结果
     */
    @PostMapping("/easy/photo/activity/edit")
    R editEasyPhotoActivity(@RequestBody EditEasyPhotoActivityDTO editEasyPhotoActivityDTO);

    /**
     * 社区后台-取消随手拍活动
     * @param id    随手拍活动id
     * @return  取消结果
     */
    @GetMapping("/easy/photo/activity/cancel")
    R cancelEasyPhotoActivity(@RequestParam("id") Long id);

    /**
     * 分页查询随手拍活动下居民参与记录
     * @param pageEasyPhotoActivityUserDTO  请求参数
     * @return  居民参与记录
     */
    @PostMapping("/easy/photo/activity/page/user")
    R pageEasyPhotoActivityUser(@RequestBody PageEasyPhotoActivityUserDTO pageEasyPhotoActivityUserDTO);

    /**
     * 随手拍活动定时任务
     * @return  执行结果
     */
    @PostMapping("timeTaskEasyPhotoActivity")
    R timedTaskEasyPhotoActivity();

    /**
     * 分页查询收益结算列表
     * @param pageWalletAdminDTO    请求参数
     * @return  收益结算列表
     */
    @PostMapping("/user/wallet/page")
    R pageUserWalletAdmin(@RequestBody PageComActWalletAdminDTO pageWalletAdminDTO);

    /**
     * 用户结算收益
     * @param settlementAdminDTO    请求参数
     * @return  结算结果
     */
    @PostMapping("/user/wallet/settlement")
    R userWalletSettlementAdmin(@RequestBody ComActWalletSettlementAdminDTO settlementAdminDTO);

    /**
     * 分页查询交易记录
     * @param pageTradeAdminDTO 请求参数
     * @return  交易记录列表
     */
    @PostMapping("/user/wallet/trade/page")
    R pageUserWalletTradeAdmin(@RequestBody PageComActWalletTradeAdminDTO pageTradeAdminDTO);

    /**
     * 社区随手拍列表统计
     * @param communityId   社区id
     * @return  统计结果
     */
    @GetMapping("/easyphoto/statistics")
    R easyPhotoStatistics(@RequestParam("communityId") Long communityId);

    /**
     * 分页查询邻里圈话题列表
     * @param circleTopicAdminDTO   请求参数
     * @return  邻里圈话题列表
     */
    @PostMapping("/neighbor/pageNeighborTopicByAdmin")
    R pageNeighborTopicByAdmin(@RequestBody ComActNeighborCircleTopicAdminDTO circleTopicAdminDTO);

    /**
     * 添加邻里圈话题
     * @param addCircleTopicAdminDTO    请求参数
     * @return  添加结果
     */
    @PostMapping("/neighbor/addNeighborTopicByAdmin")
    R addNeighborTopicByAdmin(@RequestBody AddNeighborCircleTopicAdminDTO addCircleTopicAdminDTO);

    /**
     * 编辑邻里圈话题
     * @param addCircleTopicAdminDTO    请求参数
     * @return  编辑结果
     */
    @PostMapping("/neighbor/editNeighborTopicByAdmin")
    R editNeighborTopicByAdmin(@RequestBody AddNeighborCircleTopicAdminDTO addCircleTopicAdminDTO);

    /**
     * 小程序查询邻里圈话题列表
     * @param communityId   社区id
     * @return  邻里圈话题列表
     */
    @GetMapping("/neighbor/getNeighborTopicByApp")
    R getNeighborTopicByApp(@RequestParam("communityId") Long communityId);

    /**
     * 综治后台-查询社区列表
     * @return  社区列表
     */
    @GetMapping("/eventgrid/community/list")
    R getCommunityLists();
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java

@@ -1217,4 +1217,11 @@
     */
    @PostMapping("/eventgridmemberrelation/cascade/list")
    R gridMemberCascadeList(@RequestBody EventGridMemberCascadeAddDTO memberCascadeAddDTO);

    /**
     * 综治后台-查询所有市平台网格列表
     * @return  市平台网格列表
     */
    @GetMapping("/eventgriddata/lc/list")
    R getLcGridLists();
}

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

@@ -760,4 +760,12 @@

    @GetMapping("big/no/tip")
    R noTips(@RequestParam("userId") Long userId);

    /**
     * 查询社区的收益说明
     * @param communityId   社区id
     * @return  收益说明
     */
    @PostMapping("listagreements")
    R listAgreements(@RequestParam("communityId")Long communityId);
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java

@@ -32,6 +32,8 @@

    public static SimpleDateFormat ymdhms_format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

    public static SimpleDateFormat ymdhm_format = new SimpleDateFormat("yyyy-MM-dd HH:mm");

    public static DateTimeFormatter format_ymd_String = DateTimeFormatter.ofPattern("yyMMdd");

    public static SimpleDateFormat yyyyMM_format = new SimpleDateFormat("yyyy-MM");

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

@@ -1,5 +1,6 @@
package com.panzhihua.community_backstage.api;

import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDetailDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.event.ScreenEventListDTO;
import com.panzhihua.common.model.vos.R;
@@ -45,12 +46,12 @@
    }

    @ApiOperation(value = "事件大屏统计接口@lyq",response = EventStatisticsVO.class)
    @GetMapping("/event/noToken")
    public R event(@RequestParam("communityId") Long communityId) {
        if(communityId == null){
    @PostMapping("/event/noToken")
    public R event(@RequestBody BigScreenEventDTO screenEventDTO) {
        if(screenEventDTO.getCommunityId() == null){
            return R.fail("参数错误");
        }
        return communityService.getScreenEvent(communityId);
        return communityService.getScreenEvent(screenEventDTO);
    }

    @ApiOperation(value = "事件大屏详情接口@lyq",response = EventNewStatisticsVO.class)

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

New file
@@ -0,0 +1,56 @@
package com.panzhihua.community_backstage.api;

import com.panzhihua.common.controller.BaseController;
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.wallet.ComActWalletSettlementAdminDTO;
import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletAdminDTO;
import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeAdminDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoActivityVO;
import com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoActivityUserVO;
import com.panzhihua.common.model.vos.community.wallet.ComActWalletAdminVO;
import com.panzhihua.common.model.vos.community.wallet.ComActWalletTradeAdminVO;
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("/user/wallet/")
public class ComActUserWalletApi extends BaseController {

    @Resource
    private CommunityService communityService;

    @ApiOperation(value = "分页查询收益结算列表",response = ComActWalletAdminVO.class)
    @PostMapping("/page")
    public R page(@RequestBody PageComActWalletAdminDTO pageWalletAdminDTO) {
        Long communityId = this.getCommunityId();
        pageWalletAdminDTO.setCommunityId(communityId);
        return communityService.pageUserWalletAdmin(pageWalletAdminDTO);
    }

    @ApiOperation(value = "结算收益")
    @PostMapping("/settlement")
    public R settlement(@RequestBody ComActWalletSettlementAdminDTO settlementAdminDTO) {
        settlementAdminDTO.setUserId(this.getUserId());
        return communityService.userWalletSettlementAdmin(settlementAdminDTO);
    }

    @ApiOperation(value = "分页查询交易记录列表",response = ComActWalletTradeAdminVO.class)
    @PostMapping("/trade/page")
    public R tradePage(@RequestBody PageComActWalletTradeAdminDTO pageTradeAdminDTO) {
        Long communityId = this.getCommunityId();
        pageTradeAdminDTO.setCommunityId(communityId);
        return communityService.pageUserWalletTradeAdmin(pageTradeAdminDTO);
    }

}

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

@@ -235,9 +235,9 @@
    public R pageEasyPhoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        Long communityId = loginUserInfo.getCommunityId();
        Long userId = loginUserInfo.getUserId();
//        Long userId = loginUserInfo.getUserId();
        comActEasyPhotoVO.setCommunityId(communityId);
        comActEasyPhotoVO.setBackUserId(userId);
//        comActEasyPhotoVO.setBackUserId(userId);
        return communityService.pageEasyPhoto(comActEasyPhotoVO);
    }

@@ -408,4 +408,12 @@
        return communityService.deletemicrowish(id);
    }

    @ApiOperation(value = "随手拍统计")
    @GetMapping("pageeasyphoto/statistics")
    public R easyPhotoStatistics() {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        Long communityId = loginUserInfo.getCommunityId();
        return communityService.easyPhotoStatistics(communityId);
    }

}

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

@@ -1,10 +1,7 @@
package com.panzhihua.community_backstage.api;

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.ComActDiscussCommentDTO;
import com.panzhihua.common.model.dtos.community.ComActDiscussDTO;
import com.panzhihua.common.model.dtos.community.PageComActDiscussCommentDTO;
import com.panzhihua.common.model.dtos.community.PageComActDiscussDTO;
import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActDiscussCommentVO;
@@ -40,8 +37,8 @@
    public R addDiscuss(@RequestBody @Validated(AddGroup.class) ComActDiscussDTO comActDiscussDTO) {
        Integer type = comActDiscussDTO.getType();
        String voteTitle = comActDiscussDTO.getVoteTitle();
        List<String> discussOptions = comActDiscussDTO.getDiscussOptions();
        if (type.intValue()==2 ) {
        List<ComActDiscussOptionDTO> discussOptions = comActDiscussDTO.getDiscussOptions();
        if (type.equals(2) ) {
            if(ObjectUtils.isEmpty(voteTitle)){
                return R.fail("投票标题不能为空");
            }

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

New file
@@ -0,0 +1,65 @@
package com.panzhihua.community_backstage.api;

import com.panzhihua.common.controller.BaseController;
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.vos.R;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoActivityVO;
import com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoActivityUserVO;
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.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

@Slf4j
@Api(tags = {"随手拍活动模块"})
@RestController
@RequestMapping("/easy/photo/")
public class EasyPhotoActivityApi extends BaseController {

    @Resource
    private CommunityService communityService;

    @ApiOperation(value = "分页查询随手拍活动列表",response = ComActEasyPhotoActivityVO.class)
    @PostMapping("/page")
    public R page(@RequestBody PageEasyPhotoActivityDTO pageEasyPhotoActivityDTO) {
        Long communityId = this.getCommunityId();
        pageEasyPhotoActivityDTO.setCommunityId(communityId);
        return communityService.pageEasyPhotoActivity(pageEasyPhotoActivityDTO);
    }

    @ApiOperation(value = "添加随手拍活动")
    @PostMapping("/add")
    public R add(@Validated @RequestBody AddEasyPhotoActivityDTO addEasyPhotoActivityDTO) {
        Long communityId = this.getCommunityId();
        addEasyPhotoActivityDTO.setCommunityId(communityId);
        return communityService.addEasyPhotoActivity(addEasyPhotoActivityDTO);
    }

    @ApiOperation(value = "编辑随手拍活动")
    @PostMapping("/edit")
    public R edit(@RequestBody EditEasyPhotoActivityDTO editEasyPhotoActivityDTO) {
        if(editEasyPhotoActivityDTO.getId() == null){
            return R.fail("参数错误");
        }
        return communityService.editEasyPhotoActivity(editEasyPhotoActivityDTO);
    }

    @ApiOperation(value = "取消随手拍活动")
    @GetMapping("/cancel")
    public R cancel(@RequestParam("id") Long id) {
        return communityService.cancelEasyPhotoActivity(id);
    }

    @ApiOperation(value = "分页查询随手拍活动居民参与列表",response = ComActEasyPhotoActivityUserVO.class)
    @PostMapping("/page/user")
    public R pageUser(@RequestBody PageEasyPhotoActivityUserDTO pageEasyPhotoActivityUserDTO) {
        return communityService.pageEasyPhotoActivityUser(pageEasyPhotoActivityUserDTO);
    }
}

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

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

import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAdminDTO;
import com.panzhihua.common.model.dtos.neighbor.DetailNeighborAllCommentByAdminDTO;
import com.panzhihua.common.model.dtos.neighbor.DetailNeighborCommentReplyByAdminDTO;
import com.panzhihua.common.model.dtos.neighbor.*;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.neighbor.*;
@@ -154,4 +152,29 @@
        return communityService.addNeighborByAdmin(addNeighborCircleAdminVO);
    }

    @ApiOperation(value = "分页查询邻里圈话题列表",response = ComActNeighborCircleTopicAdminVO.class)
    @PostMapping("pageNeighborTopicByAdmin")
    public R pageNeighborTopicByAdmin(@RequestBody ComActNeighborCircleTopicAdminDTO circleTopicAdminDTO){
        circleTopicAdminDTO.setCommunityId(this.getCommunityId());
        return communityService.pageNeighborTopicByAdmin(circleTopicAdminDTO);
    }

    @ApiOperation(value = "添加邻里圈话题")
    @PostMapping("addNeighborTopicByAdmin")
    public R addNeighborTopicByAdmin(@RequestBody AddNeighborCircleTopicAdminDTO addCircleTopicAdminDTO){
        addCircleTopicAdminDTO.setCommunityId(this.getCommunityId());
        addCircleTopicAdminDTO.setUserId(this.getUserId());
        return communityService.addNeighborTopicByAdmin(addCircleTopicAdminDTO);
    }

    @ApiOperation(value = "编辑邻里圈话题")
    @PostMapping("editNeighborTopicByAdmin")
    public R editNeighborTopicByAdmin(@RequestBody AddNeighborCircleTopicAdminDTO addCircleTopicAdminDTO){
        if(addCircleTopicAdminDTO.getId() == null){
            return R.fail("参数错误");
        }
        addCircleTopicAdminDTO.setCommunityId(this.getCommunityId());
        return communityService.editNeighborTopicByAdmin(addCircleTopicAdminDTO);
    }

}

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

@@ -205,5 +205,22 @@
        return r1;
    }

    @ApiOperation(value = "用户协议",response = SysUserAgreementVO.class)
    @GetMapping("listagreement")
    public R listAgreement(){
        return userService.listAgreements(this.getCommunityId());
    }

    @ApiOperation(value = "编辑用户协议")
    @PutMapping("agreement")
    @OperLog(operModul = "用户协议",operType = 2)
    public R putAgreement(@RequestBody SysUserAgreementVO sysUserAgreementVO){
        Long id = sysUserAgreementVO.getId();
        if (null==id||id==0) {
            return R.fail("协议主键不能为空");
        }
        return userService.putAgreement(sysUserAgreementVO);
    }


}

 springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EasyPhotoApi.java

@@ -63,7 +63,7 @@
            return R.fail("请先登录");
        }
        photoHandleDTO.setHandlerId(userInfoVO.getUserId());
        return gridService.easyHandle(photoHandleDTO);
        return gridService.easyHandleByAdmin(photoHandleDTO);
    }

    @ApiOperation(value = "随手拍切换公示状态-lyq")

 springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventGridMemberRelationApi.java

@@ -6,6 +6,7 @@
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.*;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.ClazzUtils;
import com.panzhihua.common.utlis.StringUtils;
import io.swagger.annotations.Api;
@@ -33,6 +34,8 @@

    @Resource
    private GridService gridService;
    @Resource
    private CommunityService communityService;

    @ApiOperation(value = "网格分页查询", response = EventGridAdminVO.class)
    @PostMapping("/event/list")
@@ -49,11 +52,11 @@
    @ApiOperation(value = "查询当前社区所有网格员", response = EventGridMemberAdminVO.class)
    @PostMapping("/member/list")
    public R getGridMemberLists(){
        Long communityId = this.getCommunityId();
        if(communityId == null){
           return R.fail("请先登录");
        }
        return gridService.getGridMemberLists(communityId);
//        Long communityId = this.getCommunityId();
//        if(communityId == null){
//           return R.fail("请先登录");
//        }
        return gridService.getGridMemberLists(null);
    }

    @ApiOperation(value = "新增网格")
@@ -64,7 +67,7 @@
        if(loginUserInfo == null){
            return R.fail("请先登录");
        }
        eventGridDataDTO.setGridCommunityId(loginUserInfo.getCommunityId());
//        eventGridDataDTO.setGridCommunityId(loginUserInfo.getCommunityId());
        eventGridDataDTO.setUserId(loginUserInfo.getUserId());
        return gridService.addGridDataByAdmin(eventGridDataDTO);
    }
@@ -90,4 +93,16 @@
        return gridService.deleteGridData(Ids);
    }

    @ApiOperation(value = "查询所有社区列表",response = EventGridCommunityAdminVO.class)
    @GetMapping("/community/list")
    public R getCommunityLists(){
        return communityService.getCommunityLists();
    }

    @ApiOperation(value = "查询所有关联市平台列表",response = EventLcGridAdminVO.class)
    @GetMapping("/lc/grid/list")
    public R getLcGridLists(){
        return gridService.getLcGridLists();
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/api/LcEventApi.java

@@ -97,15 +97,20 @@
    /**
     * description 获取所有或者根据姓名和工号查询,分页
     *
     * @param eventId 事件ID
     * @param areaId 西区ID
     * @return String 事件信息
     * @author manailin
     * @date 2021/6/10 17:00
     */
    @ApiOperation(value = "获取所有或者根据姓名和工号查询,分页")
    @GetMapping("lc/event/getGridMemberListByAreaIdOrName")
    public String getGridMemberListByAreaIdOrName(String eventId) {
        return lcApiService.getGridMemberListByAreaIdOrName(eventId);
    public R getGridMemberListByAreaIdOrName(String areaId,String param) {
        try {
            return R.ok(lcApiService.getGridMemberListByAreaIdOrName(areaId,param));
        } catch (Exception e) {
            log.error("获取指定区域网格列表出现错误：{}", e.getMessage());
        }
        return R.ok(Collections.emptyList());
    }

    /**
@@ -118,13 +123,13 @@
     */
    @ApiOperation(value = "获取指定区域网格列表")
    @GetMapping("lc/grid/list")
    public List<LcGridData> getGridListByAreaId(String areaId) {
    public R getGridListByAreaId(String areaId) {
        try {
            return lcApiService.getGridListByAreaId(areaId);
            return R.ok(lcApiService.getGridListByAreaId(areaId));
        } catch (Exception e) {
            log.error("获取指定区域网格列表出现错误：{}", e.getMessage());
        }
        return Collections.emptyList();
        return R.ok(Collections.emptyList());
    }



 springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/biz/LcApiService.java

@@ -5,10 +5,7 @@
import com.panzhihua.common.model.dtos.api.EventInfo;
import com.panzhihua.common.model.dtos.grid.LcEventVisitingTasksListDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.serviceapi.model.dto.LcFlowPersonVisitRecordDTO;
import com.panzhihua.serviceapi.model.dto.LcGridData;
import com.panzhihua.serviceapi.model.dto.LcKeyPersonVisitRecordDTO;
import com.panzhihua.serviceapi.model.dto.LcKeyPersonVisitRecordQueryDTO;
import com.panzhihua.serviceapi.model.dto.*;

import java.util.List;

@@ -86,11 +83,12 @@
     * description 获取所有或者根据姓名和工号查询,分页
     *
     * @param areaId 区域ID
     * @param  param 姓名或者工号
     * @return String 网格员列表
     * @author manailin
     * @date 2021/6/10 17:00
     */
    String getGridMemberListByAreaIdOrName(String areaId);
    List<GridMemberPageListDTO> getGridMemberListByAreaIdOrName(String areaId,String param);

    /**
     * description 提交事件登记关联的文件或者图片信息

 springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/biz/impl/LcApiServiceImpl.java

@@ -159,12 +159,16 @@
    }

    @Override
    public String getGridMemberListByAreaIdOrName(String areaId) {
    public List<GridMemberPageListDTO> getGridMemberListByAreaIdOrName(String areaId,String param) {
        HttpRequest request = HttpUtil.createGet(LcApiConstants.GRID_GET_GETALL_SEARCH_PAGE_URL);
        request.auth(getAuthToken());
        request.form("areaId", areaId);
        if(param !=null){
            request.form("param", param);
        }
        HttpResponse result = request.execute();
        return result.body();
        LcReturnObject returenData = JSONObject.parseObject(result.body(), LcReturnObject.class);
        return JSONArray.parseArray(returenData.getData(), GridMemberPageListDTO.class);
    }

    @Override

 springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/model/dto/GridMemberPageListDTO.java

New file
@@ -0,0 +1,50 @@
package com.panzhihua.serviceapi.model.dto;

import lombok.Data;

/**
 * program 攀枝花智慧社区项目
 * description 浪潮网格员接口返回对象
 *
 * @author manailin
 * Date 2021-06-22 15:30
 **/
@Data
public class GridMemberPageListDTO {

    private String bindUserId;
    private String bindUserName;
    private String birthDate;
    private String contactPhone;
    private String createBy;
    private String createTime;
    private String dutyType;
    private String educationCode;
    private String educationName;
    private String genderCode;
    private String genderName;
    private String gridDutyId;
    private String gridDutyName;
    private String id;
    private String imei;
    private Integer isLeader;
    private Integer jobNum;
    private String lastReportTime;
    private String latitude;
    private String locateUpdateTime;
    private String longitude;
    private String name;
    private String nationCode;
    private String nationName;
    private String orgDuty;
    private String orgDutyDate;
    private String orgId;
    private String orgName;
    private String password;
    private String politicalAffiliationCode;
    private String politicalAffiliationName;
    private String standbyPhone;
    private String updateBy;
    private String updateTime;
    private String workState;
}

 springcloud_k8s_panzhihuazhihuishequ/service_api/src/test/java/com/panzhihua/serviceapi/biz/impl/DictionData.java

New file
@@ -0,0 +1,20 @@
package com.panzhihua.serviceapi.biz.impl;

import lombok.Data;

import java.util.ArrayList;
import java.util.List;
/**
 * @author manailin
 * @date 2021/6/11 16:27
 */
@Data
public class DictionData {

    private String id;
    private String level;
    private String name;
    private String title;
    private String value;
    private List<DictionData> children =new ArrayList<>();
}

 springcloud_k8s_panzhihuazhihuishequ/service_api/src/test/java/com/panzhihua/serviceapi/biz/impl/DictionValueData.java

New file
@@ -0,0 +1,14 @@
package com.panzhihua.serviceapi.biz.impl;

import lombok.Data;
/**
 * @author manailin
 * @date 2021/6/11 16:27
 */
@Data
public class DictionValueData {
    private String dictCode;
    private String dictName;
    private Boolean enable;
    private String remark;
}

 springcloud_k8s_panzhihuazhihuishequ/service_api/src/test/java/com/panzhihua/serviceapi/biz/impl/LcApiServiceImplTest.java

@@ -1,22 +1,31 @@
package com.panzhihua.serviceapi.biz.impl;

import cn.hutool.core.util.RandomUtil;
import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpResponse;
import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.SerializerFeature;
import com.panzhihua.common.api.LcReturnObject;
import com.panzhihua.common.enums.LocalEventToLangChaoEventTypeEnum;
import com.panzhihua.common.model.dtos.api.EventFile;
import com.panzhihua.common.model.dtos.api.EventInfo;
import com.panzhihua.common.model.dtos.api.PartiesBody;
import com.panzhihua.common.model.vos.BcDictionaryVO;
import com.panzhihua.common.model.vos.DictionaryVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventDetailsVO;
import com.panzhihua.common.model.vos.grid.EventGridDataDetailsVO;
import com.panzhihua.common.model.vos.grid.EventResourceVO;
import com.panzhihua.common.service.api.ApiServiceFeign;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.grid.GridService;
import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.common.utlis.Snowflake;
import com.panzhihua.serviceapi.ServiceApiApplication;
import com.panzhihua.serviceapi.biz.LcApiService;
import com.panzhihua.serviceapi.model.dto.GridMemberPageListDTO;
import com.panzhihua.serviceapi.model.dto.LcGridData;
import lombok.extern.slf4j.Slf4j;
import org.junit.jupiter.api.Test;
@@ -40,6 +49,9 @@

    @Resource
    private ApiServiceFeign ApiServiceFeign;

    @Autowired
    private CommunityService communityService;

    @Test
    void saveTokenFromRemoteRequest() {
@@ -189,8 +201,54 @@

    @Test
    void getGridMemberListByAreaIdOrName() {
        String data = lcApiService.getGridMemberListByAreaIdOrName("jhRxqEQp");
        log.info(data);
        List<GridMemberPageListDTO> data = lcApiService.getGridMemberListByAreaIdOrName("jhRxqEQp", "");
        // log.info(data);
    }

    @Test
    void downloadDiction() {
        //获取字典全部大类
        HttpRequest request = HttpUtil.createPost("http://171.217.92.33:53301/dict/getTypeTree");
        request.cookie("SESSION=ZTQ1ZGRmZjktNWU1MC00ZjEyLWJhOGItNDdjZjlmODc1MjQy; UISESSIONMEMBER=C6FE0698B29832B18CBAEB71CCD3A2BA");
        HttpResponse result = request.execute();
        List<DictionData> remoteData = JSONArray.parseArray(result.body(), DictionData.class);
        remoteData.forEach(dictionData -> {
            DictionaryVO dictionaryVO = new DictionaryVO();
            long parentzId = Snowflake.getId();
            dictionaryVO.setId(parentzId);
            dictionaryVO.setDictName(dictionData.getName());
            dictionaryVO.setDictKey(dictionData.getValue());
            dictionaryVO.setLevelIndex(1);
            dictionaryVO.setParentId(0L);
            communityService.insertDiction(dictionaryVO);
            //获取二级字典项
            dictionData.getChildren().forEach(children -> {
                DictionaryVO dictionaryChiVO = new DictionaryVO();
                long erparentzId = Snowflake.getId();
                dictionaryChiVO.setId(erparentzId);
                dictionaryChiVO.setDictName(children.getName());
                dictionaryChiVO.setDictKey(children.getValue());
                dictionaryChiVO.setLevelIndex(2);
                dictionaryChiVO.setParentId(dictionaryVO.getId());
                communityService.insertDiction(dictionaryChiVO);
                //获取字典全部值
                HttpRequest requestDictionValue = HttpUtil.createPost("http://171.217.92.33:53301/dict/getDictByTypeCodeAndParentId?typeCode=" + children.getId() + "&parentId=0");
                requestDictionValue.cookie("SESSION=ZTQ1ZGRmZjktNWU1MC00ZjEyLWJhOGItNDdjZjlmODc1MjQy; UISESSIONMEMBER=C6FE0698B29832B18CBAEB71CCD3A2BA");
                HttpResponse childResult = requestDictionValue.execute();
                LcReturnObject remoteDataChild = JSONObject.parseObject(childResult.body(), LcReturnObject.class);
                List<DictionValueData> dictionValueData = JSONArray.parseArray(remoteDataChild.getData(), DictionValueData.class);
                dictionValueData.forEach(dictionValueData1 -> {
                    BcDictionaryVO dictionaryItemVO = new BcDictionaryVO();
                    dictionaryItemVO.setDictName(dictionValueData1.getDictName());
                    dictionaryItemVO.setDictValue(dictionValueData1.getDictCode());
                    dictionaryItemVO.setCode("");
                    dictionaryItemVO.setDictId(erparentzId);
                    communityService.insertDictionItem(dictionaryItemVO);
                });
//                String pretty = JSONArray.toJSONString(dictionValueData, SerializerFeature.PrettyFormat, SerializerFeature.WriteMapNullValue,
//                        SerializerFeature.WriteDateUseDateFormat);
//                log.info(pretty);
            });
        });
    }
}

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

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

import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDetailDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.service.ComMngPopulationService;
@@ -28,12 +29,12 @@

    /**
     * 事件大屏统计接口
     * @param communityId   社区id
     * @param screenEventDTO   请求参数
     * @return  统计结果
     */
    @GetMapping("/getScreenEvent")
    public R event(@RequestParam("communityId") Long communityId) {
        return R.ok(comMngPopulationService.getScreenEvent(communityId));
    @PostMapping("/getScreenEvent")
    public R event(@RequestBody BigScreenEventDTO screenEventDTO) {
        return R.ok(comMngPopulationService.getScreenEvent(screenEventDTO));
    }

    /**

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

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

import com.panzhihua.common.model.dtos.community.easyPhoto.PageEasyPhotoActivityDTO;
import com.panzhihua.common.model.dtos.community.wallet.ComActWalletSettlementAdminDTO;
import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletAdminDTO;
import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeAdminDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.service.ComActUserWalletService;
import com.panzhihua.service_community.service.ComActUserWalletTradeService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

@Slf4j
@RestController
@RequestMapping("/user/wallet/")
public class ComActUserWalletApi {

    @Resource
    private ComActUserWalletService comActUserWalletService;
    @Resource
    private ComActUserWalletTradeService comActUserWalletTradeService;

    /**
     * 分页查询收益结算列表
     * @param pageWalletAdminDTO    请求参数
     * @return  收益结算列表
     */
    @PostMapping("/page")
    public R page(@RequestBody PageComActWalletAdminDTO pageWalletAdminDTO){
        return comActUserWalletService.pageUserWalletAdmin(pageWalletAdminDTO);
    }

    /**
     * 用户结算收益
     * @param settlementAdminDTO    请求参数
     * @return  结算结果
     */
    @PostMapping("/settlement")
    public R settlement(@RequestBody ComActWalletSettlementAdminDTO settlementAdminDTO){
        return comActUserWalletService.userWalletSettlementAdmin(settlementAdminDTO);
    }

    @PostMapping("/trade/page")
    public R tradePage(@RequestBody PageComActWalletTradeAdminDTO pageTradeAdminDTO){
        return comActUserWalletTradeService.pageUserWalletTradeAdmin(pageTradeAdminDTO);
    }


}

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

@@ -1723,4 +1723,32 @@
    R setCommunityAuthType(@RequestParam("communityId")Long communityId,@RequestParam("type") Integer type){
        return eldersAuthService.setCommunityAuthType(communityId, type);
    }

    /**
     * 随手拍活动定时任务
     * @return  执行结果
     */
    @PostMapping("timeTaskEasyPhotoActivity")
    public R timeTaskEasyPhotoActivity(){
        return comActEasyPhotoActivityService.timeTaskEasyPhotoActivity();
    }

    /**
     * 社区随手拍列表统计
     * @param communityId   社区id
     * @return  统计结果
     */
    @GetMapping("easyphoto/statistics")
    public R easyPhotoStatistics(@RequestParam("communityId")Long communityId) {
        return comActEasyPhotoService.easyPhotoStatistics(communityId);
    }

    /**
     * 综治后台-查询社区列表
     * @return  社区列表
     */
    @GetMapping("/eventgrid/community/list")
    public R getCommunityLists(){
        return comActService.getCommunityLists();
    }
}

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

@@ -2,12 +2,16 @@

import com.panzhihua.common.model.vos.BcDictionaryItemVO;
import com.panzhihua.common.model.vos.BcDictionaryVO;
import com.panzhihua.common.model.vos.DictionaryVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.service.BcDictionaryService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;

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

/** 字典
@@ -23,6 +27,34 @@
    private BcDictionaryService bcDictionaryService;

    /**
     * 插入字典
     * @param dictionaryVO  字典数据
     * @return Boolean 是否保存成功
     * @author manailin
     * @date 2021/6/10 17:00
     */
    @PostMapping("/insertDiction")
    R insertDiction(@RequestBody @Valid DictionaryVO dictionaryVO, @ApiIgnore BindingResult results){
        if (results.hasErrors()) {
            return R.fail(results.getFieldError().getDefaultMessage());
        }
        return bcDictionaryService.insertDiction(dictionaryVO);
    }
    /**
     * 插入字典项
     * @param dictionaryVO  字典数据
     * @return Boolean 是否保存成功
     * @author manailin
     * @date 2021/6/10 17:00
     */
    @PostMapping("/insertDictionItem")
    R insertDictionItem(@RequestBody @Valid BcDictionaryVO dictionaryVO, @ApiIgnore BindingResult results){
        if (results.hasErrors()) {
            return R.fail(results.getFieldError().getDefaultMessage());
        }
        return bcDictionaryService.insertDictionItem(dictionaryVO);
    }
    /**
     * 根据字典key查询自典项
     * @param key
     * @return

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

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

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.vos.R;
import com.panzhihua.service_community.service.ComActEasyPhotoActivityService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

@Slf4j
@RestController
@RequestMapping("/easy/photo/activity")
public class EasyPhotoActivityApi {

    @Resource
    private ComActEasyPhotoActivityService comActEasyPhotoActivityService;

    /**
     * 社区后台-分页查询随手拍活动列表
     * @param pageEasyPhotoActivityDTO  请求参数
     * @return  随手拍活动列表
     */
    @PostMapping("/page")
    public R page(@RequestBody PageEasyPhotoActivityDTO pageEasyPhotoActivityDTO){
        return comActEasyPhotoActivityService.pageActivity(pageEasyPhotoActivityDTO);
    }

    /**
     * 社区后台-添加随手拍活动
     * @param addEasyPhotoActivityDTO   请求参数
     * @return  添加结果
     */
    @PostMapping("/add")
    public R add(@RequestBody AddEasyPhotoActivityDTO addEasyPhotoActivityDTO){
        return comActEasyPhotoActivityService.addActivity(addEasyPhotoActivityDTO);
    }

    /**
     * 社区后台-编辑随手拍活动
     * @param editEasyPhotoActivityDTO  请求参数
     * @return  编辑结果
     */
    @PostMapping("/edit")
    public R edit(@RequestBody EditEasyPhotoActivityDTO editEasyPhotoActivityDTO){
        return comActEasyPhotoActivityService.editActivity(editEasyPhotoActivityDTO);
    }

    /**
     * 社区后台-取消随手拍活动
     * @param id    随手拍活动id
     * @return  取消结果
     */
    @GetMapping("/cancel")
    public R cancel(@RequestParam("id") Long id){
        return comActEasyPhotoActivityService.cancelActivity(id);
    }

    /**
     * 分页查询随手拍活动下居民参与记录
     * @param pageEasyPhotoActivityUserDTO  请求参数
     * @return  居民参与记录
     */
    @PostMapping("/page/user")
    public R pageUser(@RequestBody PageEasyPhotoActivityUserDTO pageEasyPhotoActivityUserDTO){
        return comActEasyPhotoActivityService.pageActivityUser(pageEasyPhotoActivityUserDTO);
    }

}

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

@@ -7,6 +7,7 @@
import com.panzhihua.common.model.vos.neighbor.ChangeCommentStatusByAdminVO;
import com.panzhihua.common.model.vos.neighbor.EditNeighborCircleAdminVO;
import com.panzhihua.service_community.service.ComActNeighborCircleService;
import com.panzhihua.service_community.service.ComActNeighborCircleTopicService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -25,6 +26,8 @@

    @Resource
    private ComActNeighborCircleService comActNeighborCircleService;
    @Resource
    private ComActNeighborCircleTopicService comActNeighborCircleTopicService;

    /**
     * 分页查询邻里圈列表
@@ -72,7 +75,7 @@
     * @return 邻里圈列表
     */
    @PostMapping("addNeighborByAdmin")
    public R pageNeighborByAdmin(@RequestBody AddNeighborCircleAdminVO addNeighborCircleAdminVO) {
    public R addNeighborByAdmin(@RequestBody AddNeighborCircleAdminVO addNeighborCircleAdminVO) {
        return comActNeighborCircleService.addNeighborByAdmin(addNeighborCircleAdminVO);
    }

@@ -253,4 +256,44 @@
        return comActNeighborCircleService.neighborCommentReplyByApp(commentReplyAppDTO);
    }

    /**
     * 分页查询邻里圈话题列表
     * @param circleTopicAdminDTO   请求参数
     * @return  邻里圈话题列表
     */
    @PostMapping("pageNeighborTopicByAdmin")
    public R pageNeighborTopicByAdmin(@RequestBody ComActNeighborCircleTopicAdminDTO circleTopicAdminDTO) {
        return comActNeighborCircleTopicService.pageNeighborTopicByAdmin(circleTopicAdminDTO);
    }

    /**
     * 添加邻里圈话题
     * @param addCircleTopicAdminDTO    请求参数
     * @return  添加结果
     */
    @PostMapping("addNeighborTopicByAdmin")
    public R addNeighborTopicByAdmin(@RequestBody AddNeighborCircleTopicAdminDTO addCircleTopicAdminDTO) {
        return comActNeighborCircleTopicService.addNeighborTopicByAdmin(addCircleTopicAdminDTO);
    }

    /**
     * 编辑邻里圈话题
     * @param addCircleTopicAdminDTO    请求参数
     * @return  编辑结果
     */
    @PostMapping("editNeighborTopicByAdmin")
    public R editNeighborTopicByAdmin(@RequestBody AddNeighborCircleTopicAdminDTO addCircleTopicAdminDTO) {
        return comActNeighborCircleTopicService.editNeighborTopicByAdmin(addCircleTopicAdminDTO);
    }

    /**
     * 小程序查询邻里圈话题列表
     * @param communityId   社区id
     * @return  邻里圈话题列表
     */
    @GetMapping("getNeighborTopicByApp")
    public R getNeighborTopicByApp(@RequestParam("communityId") Long communityId) {
        return comActNeighborCircleTopicService.getNeighborTopicByApp(communityId);
    }

}

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

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

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

/**
 * 字典
 *
 * @author manailin
 * @since 2021-06-11
 */
@Mapper
public interface BcDictionaryDAO extends BaseMapper<BcDictionaryDO> {

}

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

@@ -123,7 +123,7 @@
    @Select("<script> " +
            " SELECT pm.id, pm.member_id, pm.user_id, pm.name, " +
            " case " +
            " when me.photo_path is NOT NULL then  me.photo_path \n" +
            " when me.photo_path is NOT NULL then  me.photo_path  " +
            " when CAST(SUBSTRING(me.id_card , 17, 1) AS SIGNED)%2=1 then 'https://www.psciio.com/idcard/tst/idcard/a723e5bcbd594a48956ef9354c8b477c.jpg' " +
            " ELSE 'https://www.psciio.com/idcard/tst/idcard/cfb9b58913074068bba8c7002f91e7ff.jpg' END AS photo_path " +
            " ,COUNT(pa.id) AS total   " +
@@ -179,4 +179,42 @@
            " ORDER BY m.idxName  " +
            "</script>")
    List<BigScreenStatisticPartyActivity> partyactivity(@Param("queryDTO")BigScreenStatisticPartyActivityDTO bigScreenStatisticPartyActivityDTO);

    @Select("<script> " +
            "SELECT " +
            " m.idxName, " +
            "CASE " +
            "   " +
            "  WHEN d.total IS NOT NULL THEN " +
            "  d.total ELSE 0  " +
            " END AS total  " +
            "FROM " +
            " ( " +
            " SELECT " +
            "  DATE_FORMAT( @cdate := date_add( @cdate, INTERVAL - 1 DAY ), '%Y-%m-%d' ) AS idxName  " +
            " FROM " +
            "  ( SELECT @cdate := date_add( #{queryDTO.endTime}, INTERVAL 1 DAY ) FROM com_pb_activity LIMIT 7 ) d  " +
            " ORDER BY " +
            "  idxName  " +
            " ) m " +
            " LEFT JOIN ( " +
            " SELECT " +
            "  date_format( activity_time_begin, '%Y-%m-%d' ) AS idxName, " +
            "  COUNT( id ) AS total  " +
            " FROM " +
            "  com_pb_activity  " +
            " WHERE " +
            "  community_id = #{queryDTO.communityId}  " +
            "  AND STATUS IN ( 3, 4, 5 )  " +
            "  AND activity_time_begin &lt; DATE_FORMAT( STR_TO_DATE( #{queryDTO.startTime}, '%Y-%m-%d' ), '%Y-%m-%d' )  " +
            "  AND activity_time_begin &gt; DATE_FORMAT( STR_TO_DATE( #{queryDTO.endTime}, '%Y-%m-%d' ), '%Y-%m-%d' )  " +
            " GROUP BY " +
            "  idxName  " +
            " ORDER BY " +
            "  idxName ASC  " +
            " ) d ON m.idxName = d.idxName   " +
            "ORDER BY " +
            " m.idxName" +
            " </script>")
    List<BigScreenStatisticPartyActivity> partyactivityByWeek(@Param("queryDTO")BigScreenStatisticPartyActivityDTO bigScreenStatisticPartyActivityDTO);
}

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

@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.community.PageComActDTO;
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.grid.EventGridCommunityAdminVO;
import com.panzhihua.service_community.model.dos.ComActDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -78,4 +79,7 @@
    IPage<ComActVO> pageCommunity(Page page, @Param("pageComActDTO") PageComActDTO pageComActDTO);
    @Update("update sys_user u set u.password=#{password} where u.account=#{account} and u.type=3 and u.community_id=#{communityId}")
    void updateAccountPassword(@Param("password") String password, @Param("account") String account, @Param("communityId")Long communityId);

    @Select("select community_id,`name` from com_act where state = 0")
    List<EventGridCommunityAdminVO> getCommunityLists();
}

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

@@ -109,6 +109,7 @@
            "d.photo_pah, " +
            "d.`discuss_subject`, " +
            "d.type, " +
            "u.type as userType, " +
            "COUNT( DISTINCT c.id ) commentNum, " +
            "COUNT( DISTINCT du.id ) signNum, " +
            "if(u.type=1,u.name,a.name) userName, " +
@@ -148,6 +149,7 @@
            "u.nick_name userNickName, " +
            "u.`image_url`, " +
            "u.phone, " +
            "u.type as userType, " +
            "c.`comment`, " +
            "c.`parent_id`, " +
            "c.`is_author`, " +

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

@@ -31,4 +31,7 @@
            "JOIN com_act_discuss_option o ON d.id = o.discuss_id and d.id=#{id}\n" +
            "JOIN com_act_discuss_option_user ou ON o.id = ou.discuss_option_id and ou.user_id=#{loginUserId}")
    int selectHaveVote(@Param("id") Long id, @Param("loginUserId") Long loginUserId);

    @Select("select count(id) from com_act_discuss_option_user where discuss_option_id = #{discussOptionId} and user_id = #{userId}")
    int selectHaveVotes(@Param("discussOptionId") Long discussOptionId, @Param("userId") Long userId);
}

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

@@ -1,8 +1,17 @@
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.PageEasyPhotoActivityDTO;
import com.panzhihua.common.model.dtos.community.easyPhoto.PageEasyPhotoActivityUserDTO;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoActivityVO;
import com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoActivityUserVO;
import com.panzhihua.service_community.model.dos.ComActEasyPhotoActivityDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.util.Date;

/**
 * @auther lyq
@@ -12,4 +21,27 @@
@Mapper
public interface ComActEasyPhotoActivityMapper extends BaseMapper<ComActEasyPhotoActivityDO> {

    /**
     * 社区后台-分页查询随手拍活动列表
     * @param page  分页参数
     * @param pageEasyPhotoActivityDTO  请求参数
     * @return  随手拍活动列表
     */
    IPage<ComActEasyPhotoActivityVO> pageActivity(Page page, @Param("pageEasyPhotoActivityDTO") PageEasyPhotoActivityDTO pageEasyPhotoActivityDTO);

    /**
     * 判断当前活动时间是否与其他时间有冲突
     * @param startTime     活动开始时间
     * @param endTime   活动结束时间
     * @return  返回冲突的活动数量
     */
    Integer getEasyPhotoActivityTimeConflict(@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("activityId") Long activityId);

    /**
     * 分页查询随手拍活动下居民参与记录
     * @param pageEasyPhotoActivityUserDTO  请求参数
     * @return  居民参与记录
     */
    IPage<ComActEasyPhotoActivityUserVO> pageActivityUser(Page page, @Param("pageEasyPhotoActivityUserDTO") PageEasyPhotoActivityUserDTO pageEasyPhotoActivityUserDTO);

}

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

@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
import com.panzhihua.common.model.vos.community.TodoEventsVO;
import com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoStatisticsVO;
import com.panzhihua.common.model.vos.screen.EastPhotoTypeVO;
import com.panzhihua.common.model.vos.screen.EastPhotoVO;
import com.panzhihua.common.model.vos.screen.EasyPhotoDataVO;
@@ -27,98 +28,111 @@
public interface ComActEasyPhotoDAO extends BaseMapper<ComActEasyPhotoDO> {
    @Select("<script> " +
            "select t.* from ("+
            "SELECT\n" +
            "p.id,\n" +
            "u.`name` sponsor_name,\n" +
            "u.phone phone,\n" +
            "count(pu.id)giveThumbsUpNum,\n" +
            "u.image_url,\n" +
            "p.happen_addr,\n" +
            "su.`name` handler_name,\n" +
            "p.`status`,\n" +
            "p.`detail`,\n" +
            "p.`is_need_feed_back`,\n" +
            "p.`photo_path_list`,\n" +
            "p.create_at,\n" +
            "p.feedback_at,\n" +
            "p.is_report,\n" +
            "p.is_publicity,\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" +
            "SELECT " +
            "p.id, " +
            "u.`name` sponsor_name, " +
            "u.phone phone, " +
            "count(pu.id)giveThumbsUpNum, " +
            "u.image_url, " +
            "p.happen_addr, " +
            "su.`name` handler_name, " +
            "p.`status`, " +
            "p.`detail`, " +
            "p.`is_need_feed_back`, " +
            "p.`photo_path_list`, " +
            "p.create_at, " +
            "p.feedback_at, " +
            "p.is_report, " +
            "p.is_publicity, " +
            "p.activity_type, " +
            "p.activity_amount, " +
            "p.examine_at  " +
            "FROM " +
            "com_act_easy_photo p " +
            "JOIN sys_user u ON p.sponsor_id = u.user_id  " +
            "<if test='comActEasyPhotoVO.sponsorName != null and comActEasyPhotoVO.sponsorName.trim() != &quot;&quot;'>" +
            "AND u.`name` like concat(#{comActEasyPhotoVO.sponsorName},'%')  \n" +
            "AND u.`name` like concat(#{comActEasyPhotoVO.sponsorName},'%')   " +
            " </if> " +
            "<if test='comActEasyPhotoVO.userId != null and comActEasyPhotoVO.userId != 0'>" +
            "AND u.`user_id` = #{comActEasyPhotoVO.userId} \n" +
            "AND u.`user_id` = #{comActEasyPhotoVO.userId}  " +
            " </if> " +
            "left join  com_act_easy_photo_user pu ON p.id = pu.easy_photo_id \n" +
            "left join  com_act_easy_photo_user pu ON p.id = pu.easy_photo_id  " +
            "<if test='comActEasyPhotoVO.handlerName == null or comActEasyPhotoVO.handlerName.trim() == &quot;&quot;'>" +
            "left JOIN sys_user su ON p.handler_id = su.user_id \n" +
            "left JOIN sys_user su ON p.handler_id = su.user_id  " +
            " </if> " +
            "<if test='comActEasyPhotoVO.handlerName != null and comActEasyPhotoVO.handlerName.trim() != &quot;&quot;'>" +
            " JOIN sys_user su ON p.handler_id = su.user_id \n" +
            " JOIN sys_user su ON p.handler_id = su.user_id  " +
            " </if> " +
            "<if test='comActEasyPhotoVO.handlerName != null and comActEasyPhotoVO.handlerName.trim() != &quot;&quot;'>" +
            "AND su.`name` like concat(#{comActEasyPhotoVO.handlerName},'%')  \n" +
            "AND su.`name` like concat(#{comActEasyPhotoVO.handlerName},'%')   " +
            " </if> " +
            "where 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.happenAddr != null and comActEasyPhotoVO.happenAddr.trim() != &quot;&quot;'>" +
            "AND p.happen_addr like concat(#{comActEasyPhotoVO.happenAddr},'%')  \n" +
            "AND p.happen_addr like concat(#{comActEasyPhotoVO.happenAddr},'%')   " +
            " </if> " +
            "<if test='comActEasyPhotoVO.status != null and comActEasyPhotoVO.status!=0' >" +
            "AND p.`status` = #{comActEasyPhotoVO.status} \n" +
            "AND p.`status` = #{comActEasyPhotoVO.status}  " +
            " </if> " +
            "<if test='comActEasyPhotoVO.createBegin != null  '>" +
            "AND p.create_at BETWEEN #{comActEasyPhotoVO.createBegin} \n" +
            "AND p.create_at BETWEEN #{comActEasyPhotoVO.createBegin}  " +
            "AND #{comActEasyPhotoVO.createEnd}" +
            " </if> " +
            "<if test='comActEasyPhotoVO.sponsorId != null and comActEasyPhotoVO.sponsorId != 0'>" +
            "AND p.sponsor_id =#{comActEasyPhotoVO.sponsorId} \n" +
            "AND p.sponsor_id =#{comActEasyPhotoVO.sponsorId}  " +
            " </if> " +
            "<if test='comActEasyPhotoVO.activityType != null'>" +
            "AND p.activity_type =#{comActEasyPhotoVO.activityType}  " +
            " </if> " +
            "<if test='comActEasyPhotoVO.easyType != null and comActEasyPhotoVO.easyType == 1'>" +
            " AND (p.status = 1 or (p.status > 1 and is_need_feed_back = 0)) " +
            " </if> " +
            "<if test='comActEasyPhotoVO.easyType != null and comActEasyPhotoVO.easyType == 2'>" +
            " AND p.status > 1 and is_need_feed_back = 1 " +
            " </if> " +
            "group by p.id "+

            "union all "+

            "SELECT\n" +
            "p.id,\n" +
            "u.`name` sponsor_name,\n" +
            "u.phone phone,\n" +
            "count(pu.id)giveThumbsUpNum,\n" +
            "u.image_url,\n" +
            "p.happen_addr,\n" +
            "su.`name` handler_name,\n" +
            "p.`status`,\n" +
            "p.`detail`,\n" +
            "p.`is_need_feed_back`,\n" +
            "p.`photo_path_list`,\n" +
            "p.create_at,\n" +
            "p.feedback_at,\n" +
            "p.is_report,\n" +
            "p.is_publicity,\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" +
            "SELECT " +
            "p.id, " +
            "u.`name` sponsor_name, " +
            "u.phone phone, " +
            "count(pu.id)giveThumbsUpNum, " +
            "u.image_url, " +
            "p.happen_addr, " +
            "su.`name` handler_name, " +
            "p.`status`, " +
            "p.`detail`, " +
            "p.`is_need_feed_back`, " +
            "p.`photo_path_list`, " +
            "p.create_at, " +
            "p.feedback_at, " +
            "p.is_report, " +
            "p.is_publicity, " +
            "p.activity_type, " +
            "p.activity_amount, " +
            "p.examine_at  " +
            "FROM " +
            "com_act_easy_photo p " +
            "JOIN sys_user u ON p.sponsor_id = u.user_id  " +
            "<if test='comActEasyPhotoVO.sponsorName != null and comActEasyPhotoVO.sponsorName.trim() != &quot;&quot;'>" +
            "AND u.`name` like concat(#{comActEasyPhotoVO.sponsorName},'%')  \n" +
            "AND u.`name` like concat(#{comActEasyPhotoVO.sponsorName},'%')   " +
            " </if> " +
            "<if test='comActEasyPhotoVO.userId != null and comActEasyPhotoVO.userId != 0'>" +
            "AND u.`user_id` = #{comActEasyPhotoVO.userId} \n" +
            "AND u.`user_id` = #{comActEasyPhotoVO.userId}  " +
            " </if> " +
            "left join  com_act_easy_photo_user pu ON p.id = pu.easy_photo_id \n" +
            "left join  com_act_easy_photo_user pu ON p.id = pu.easy_photo_id  " +
            "<if test='comActEasyPhotoVO.handlerName == null or comActEasyPhotoVO.handlerName.trim() == &quot;&quot;'>" +
            "left JOIN sys_user su ON p.handler_id = su.user_id \n" +
            "left JOIN sys_user su ON p.handler_id = su.user_id  " +
            " </if> " +
            "<if test='comActEasyPhotoVO.handlerName != null and comActEasyPhotoVO.handlerName.trim() != &quot;&quot;'>" +
            " JOIN sys_user su ON p.handler_id = su.user_id \n" +
            " JOIN sys_user su ON p.handler_id = su.user_id  " +
            " </if> " +
            "<if test='comActEasyPhotoVO.handlerName != null and comActEasyPhotoVO.handlerName.trim() != &quot;&quot;'>" +
            "AND su.`name` like concat(#{comActEasyPhotoVO.handlerName},'%') \n" +
            "AND su.`name` like concat(#{comActEasyPhotoVO.handlerName},'%')  " +
            " </if> " +
            "where  p.del_tag = 0 and  p.status=2 and p.is_need_feed_back=1 " +
            "<if test='comActEasyPhotoVO.backUserId != null and comActEasyPhotoVO.backUserId != 0'>" +
@@ -128,115 +142,124 @@
            "  and p.community_id=#{comActEasyPhotoVO.communityId} " +
            " </if> " +
            "<if test='comActEasyPhotoVO.happenAddr != null and comActEasyPhotoVO.happenAddr.trim() != &quot;&quot;'>" +
            "AND p.happen_addr like concat(#{comActEasyPhotoVO.happenAddr},'%')  \n" +
            "AND p.happen_addr like concat(#{comActEasyPhotoVO.happenAddr},'%')   " +
            " </if> " +
            "<if test='comActEasyPhotoVO.status != null and comActEasyPhotoVO.status!=0' >" +
            "AND p.`status` = #{comActEasyPhotoVO.status} \n" +
            "AND p.`status` = #{comActEasyPhotoVO.status}  " +
            " </if> " +
            "<if test='comActEasyPhotoVO.createBegin != null  '>" +
            "AND p.create_at BETWEEN #{comActEasyPhotoVO.createBegin} \n" +
            "AND p.create_at BETWEEN #{comActEasyPhotoVO.createBegin}  " +
            "AND #{comActEasyPhotoVO.createEnd}" +
            " </if> " +
            "<if test='comActEasyPhotoVO.sponsorId != null and comActEasyPhotoVO.sponsorId != 0'>" +
            "AND p.sponsor_id =#{comActEasyPhotoVO.sponsorId} \n" +
            "AND p.sponsor_id =#{comActEasyPhotoVO.sponsorId}  " +
            " </if> " +
            "<if test='comActEasyPhotoVO.activityType != null'>" +
            "AND p.activity_type =#{comActEasyPhotoVO.activityType}  " +
            " </if> " +
            "<if test='comActEasyPhotoVO.easyType != null and comActEasyPhotoVO.easyType == 1'>" +
            " AND (p.status = 1 or (p.status > 1 and is_need_feed_back = 0)) " +
            " </if> " +
            "<if test='comActEasyPhotoVO.easyType != null and comActEasyPhotoVO.easyType == 2'>" +
            " AND p.status > 1 and is_need_feed_back = 1 " +
            " </if> " +
            " group by p.id "+
            ")t order by t.create_at desc "+
            "</script>")
    IPage<ComActEasyPhotoVO> pageEasyPhoto(Page page, @Param("comActEasyPhotoVO") ComActEasyPhotoVO comActEasyPhotoVO);
    @Select("SELECT \n" +
            "p.id,\n" +
            "p.sponsor_id,\n" +
            "p.feedback_at,\n" +
            "p.examine_at,\n" +
            "p.create_at,\n" +
            "u.`name` sponsorName,\n" +
            "u.nick_name userNickName,\n" +
            "su.`name` handlerName,\n" +
            "u.`image_url`,\n" +
            "u.phone,\n" +
            "p.detail,\n" +
            "p.is_need_feed_back,\n" +
            "p.examine_at,\n" +
            "p.status,\n" +
            "p.reject_reason,\n" +
            "p.is_hide,\n" +
            "p.happen_addr,\n" +
            "p.addr_remark,\n" +
            "su.`name`,\n" +
            "p.handle_result,\n" +
            "p.photo_path_list,\n" +
            "p.activity_type,\n" +
            "p.activity_amount,\n" +
            "count(pu.id)giveThumbsUpNum,\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" +
            "LEFT JOIN com_act_easy_photo_user pu on p.id=pu.easy_photo_id\n" +
    @Select("SELECT  " +
            "p.id, " +
            "p.sponsor_id, " +
            "p.feedback_at, " +
            "p.examine_at, " +
            "p.create_at, " +
            "u.`name` sponsorName, " +
            "u.nick_name userNickName, " +
            "su.`name` handlerName, " +
            "u.`image_url`, " +
            "u.phone, " +
            "p.detail, " +
            "p.is_need_feed_back, " +
            "p.examine_at, " +
            "p.status, " +
            "p.reject_reason, " +
            "p.is_hide, " +
            "p.happen_addr, " +
            "p.addr_remark, " +
            "su.`name`, " +
            "p.handle_result, " +
            "p.photo_path_list, " +
            "p.activity_type, " +
            "p.activity_amount, " +
            "count(pu.id)giveThumbsUpNum, " +
            "p.handle_photo_list " +
            "FROM " +
            "com_act_easy_photo p " +
            "JOIN sys_user u on p.sponsor_id=u.user_id " +
            "LEFT JOIN sys_user su on p.handler_id=su.user_id " +
            "LEFT JOIN com_act_easy_photo_user pu on p.id=pu.easy_photo_id " +
            "WHERE p.del_tag = 0 and p.id=#{id}")
    ComActEasyPhotoVO detailEasyPhoto(Long id);
    @Select("SELECT\n" +
            "'1' type\n" +
            "FROM\n" +
            " com_act_easy_photo p \n" +
            "WHERE\n" +
            " p.del_tag = 0 and p.community_id = #{communityId} \n" +
            "AND p.STATUS = 1 \n"+
            "\n" +
            "union all \n" +
            "\n" +
            "SELECT\n" +
            "'1' type\n" +
            "FROM\n" +
            "  com_act_easy_photo p \n" +
            "WHERE\n" +
            " p.del_tag = 0 and p.community_id = #{communityId} \n" +
            "AND p.`status` = 2 and p.is_need_feed_back=1 and p.handler_id=#{userId}\n"
    @Select("SELECT " +
            "'1' type " +
            "FROM " +
            " com_act_easy_photo p  " +
            "WHERE " +
            " p.del_tag = 0 and p.community_id = #{communityId}  " +
            "AND p.STATUS = 1  "+
            " " +
            "union all  " +
            " " +
            "SELECT " +
            "'1' type " +
            "FROM " +
            "  com_act_easy_photo p  " +
            "WHERE " +
            " p.del_tag = 0 and p.community_id = #{communityId}  " +
            "AND p.`status` = 2 and p.is_need_feed_back=1 and p.handler_id=#{userId} "
            )
    List<TodoEventsVO> selectNeedToDo(@Param("communityId") Long communityId, @Param("userId") Long userId);

    @Select("<script> " +
            "SELECT\n" +
            "p.id,\n" +
            "u.`name` sponsor_name,\n" +
            "u.`nick_name` userNickName,\n" +
            "u.phone sponsor_phone,\n" +
            "count(DISTINCT pu.id)giveThumbsUpNum,\n" +
            "count(DISTINCT c.id)commentNum,\n" +
            "u.image_url,\n" +
            "p.happen_addr,\n" +
            "su.`name` handler_name,\n" +
            "p.`status`,\n" +
            "p.`is_hide`,\n" +
            "p.`detail`,\n" +
            "p.`is_need_feed_back`,\n" +
            "p.`photo_path_list`,\n" +
            "p.create_at,\n" +
            "p.feedback_at,\n" +
            "p.activity_type,\n" +
            "p.activity_amount,\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" +
            "left join  com_act_easy_photo_user pu ON p.id = pu.easy_photo_id \n" +
            "left JOIN sys_user su ON p.handler_id = su.user_id \n" +
            "left JOIN com_act_easy_photo_comment c ON p.id = c.easy_photo_id \n" +
            "SELECT " +
            "p.id, " +
            "u.`name` sponsor_name, " +
            "u.`nick_name` userNickName, " +
            "u.phone sponsor_phone, " +
            "count(DISTINCT pu.id)giveThumbsUpNum, " +
            "count(DISTINCT c.id)commentNum, " +
            "u.image_url, " +
            "p.happen_addr, " +
            "su.`name` handler_name, " +
            "p.`status`, " +
            "p.`is_hide`, " +
            "p.`detail`, " +
            "p.`is_need_feed_back`, " +
            "p.`photo_path_list`, " +
            "p.create_at, " +
            "p.feedback_at, " +
            "p.activity_type, " +
            "p.activity_amount, " +
            "p.examine_at  " +
            "FROM " +
            "com_act_easy_photo p " +
            "JOIN sys_user u ON p.sponsor_id = u.user_id  " +
            "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  " +
            " <where>" +
            " p.del_tag = 0  "  +
            "<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} \n" +
            "AND p.`status` = #{comActEasyPhotoVO.status}  " +
            " </if> " +
            "<if test='comActEasyPhotoVO.sponsorId != null and comActEasyPhotoVO.sponsorId != 0'>" +
            "AND p.sponsor_id =#{comActEasyPhotoVO.sponsorId} \n" +
            "AND p.sponsor_id =#{comActEasyPhotoVO.sponsorId}  " +
            " </if> " +
            "<if test='comActEasyPhotoVO.sponsorId == null or comActEasyPhotoVO.sponsorId==0'>" +
            "AND p.`status` in (2,4) \n" +
            "AND p.`status` in (2,4)  " +
            " </if> " +
            "group by p.id "+
            "order by p.create_at desc "+
@@ -276,4 +299,16 @@
            "(SELECT COUNT(id) FROM com_act_easy_photo WHERE community_id =#{communityId} AND handle_status = 2 AND #{start} < create_at and create_at < #{end}) AS deal " +
            "FROM com_act_easy_photo WHERE community_id = #{communityId} AND #{start} < create_at and create_at < #{end} ")
    EastPhotoVO countByTime(@Param("start")String start, @Param("end")String end, @Param("nowDate")String nowDate, @Param("communityId")Long communityId);

    @Select("SELECT " +
            " count( id ) AS examineNum, " +
            " ( SELECT count( id ) FROM com_act_easy_photo WHERE `status` = 2 AND community_id = #{communityId} and del_tag = 0 ) AS verificationNum, " +
            " ( SELECT count( id ) FROM com_act_easy_photo WHERE `status` = 3 AND community_id = #{communityId} and del_tag = 0 ) AS rejectNum, " +
            " ( SELECT count( id ) FROM com_act_easy_photo WHERE `status` = 4 AND community_id = #{communityId} and del_tag = 0 ) AS completeNum  " +
            "FROM " +
            " com_act_easy_photo  " +
            "WHERE " +
            " `status` = 1  " +
            " AND community_id = #{communityId} and del_tag = 0")
    ComActEasyPhotoStatisticsVO getEasyPhotoStatistics(@Param("communityId")Long communityId);
}

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

@@ -44,11 +44,16 @@
            "canc.type," +
            "su.nick_name as name," +
            "su.community_id," +
            "canct.name as topicName," +
            "su.image_url as headUrl " +
            " FROM " +
            " com_act_neighbor_circle AS canc" +
            " left join sys_user as su on su.user_id = canc.release_id" +
            " left join sys_user as su on su.user_id = canc.release_id " +
            " left join com_act_neighbor_circle_topic as canct on canct.id = canc.topic_id " +
            " where canc.status = 2 and canc.community_id = #{neighborCircleAppDTO.communityId} " +
            "<if test='neighborCircleAppDTO.topicId != null '>" +
            " and canc.topic_id = #{neighborCircleAppDTO.topicId}  " +
            " </if> " +
            "<if test='neighborCircleAppDTO.type != null and neighborCircleAppDTO.type == 1'>" +
            " order by (canc.last_views_num + canc.last_comment_num + canc.last_fabulous_num) desc " +
            " </if> " +
@@ -63,23 +68,28 @@

    @Select("<script> " +
            "select canc.id,su.nick_name as name,su.image_url as headUrl,canc.release_content " +
            ",canc.release_images,canc.comment_num,canc.fabulous_num,canc.forward_num,canc.views_num " +
            ",canc.release_images,canc.comment_num,canc.fabulous_num,canc.forward_num,canc.views_num,canct.name as topicName " +
            ",canc.is_boutique,canc.create_at,canc.reply_at,su.community_id,canc.type from com_act_neighbor_circle as canc " +
            " left join sys_user as su on su.user_id = canc.release_id where id = #{circleId}"+
            " left join sys_user as su on su.user_id = canc.release_id  "+
            " left join com_act_neighbor_circle_topic as canct on canct.id = canc.topic_id where canc.id = #{circleId}" +
            " </script>")
    ComActNeighborCircleDetailAppVO neighborDetailByApp(@Param("circleId") Long circleId);
    @Select("<script> \n"+
            "SELECT\n" +
            "nc.*,\n" +
            "u.`nick_name` AS releaseName,u.image_url,u.`type` as userType\n" +
            "u.`nick_name` AS releaseName,u.image_url,canct.`name` as topicName ,u.`type` as userType\n" +
            ",u.name as communityName\n" +
            "FROM\n" +
            "com_act_neighbor_circle nc\n" +
            "LEFT JOIN sys_user u ON nc.release_id = u.user_id \n" +
            "LEFT JOIN com_act_neighbor_circle_topic as canct ON canct.id = nc.topic_id \n" +
            "<where>"+
            "nc.community_id = #{neighborCircleAdminDTO.communityId}  \n"+
            "<if test='neighborCircleAdminDTO.releaseContent != null and neighborCircleAdminDTO.releaseContent != &quot;&quot;'>" +
            "and nc.release_content like concat('%',#{neighborCircleAdminDTO.releaseContent},'%')  \n" +
            " </if> " +
            "<if test='neighborCircleAdminDTO.topicName != null and neighborCircleAdminDTO.topicName != &quot;&quot;'>" +
            "and canct.`name` = #{neighborCircleAdminDTO.topicName}  " +
            " </if> " +
            "<if test='neighborCircleAdminDTO.startAt != null and neighborCircleAdminDTO.endAt !=null '>" +
            "and nc.create_at between #{neighborCircleAdminDTO.startAt} and #{neighborCircleAdminDTO.endAt}  \n" +
@@ -98,10 +108,11 @@
    AdministratorsUserVO selectUserByUserId(@Param("userId") Long userId);

    @Select("<script> " +
            "select canc.id,canc.release_content,canc.release_images,canc.status,canc.create_at" +
            "select canc.id,canc.release_content,canc.release_images,canc.status,canc.create_at,canct.name as topicName" +
            ",canc.comment_num,canc.fabulous_num,canc.forward_num,canc.views_num,canc.refuse_reason,su.nick_name as name,su.image_url as headUrl " +
            " from com_act_neighbor_circle as canc " +
            " left join sys_user as su on su.user_id = canc.release_id " +
            " left join com_act_neighbor_circle_topic as canct on canct.id = canc.topic_id " +
            " where canc.release_id = #{userId} and canc.status != 3 order by create_at desc" +
            " </script>")
    IPage<ComActNeighborCircleAppVO> neighborExamineByApp(Page page,@Param("userId") Long userId);

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

New file
@@ -0,0 +1,36 @@
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.neighbor.ComActNeighborCircleTopicAdminDTO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleTopicAdminVO;
import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleTopicAppVO;
import com.panzhihua.service_community.model.dos.ComActNeighborCircleTopicDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * @auther lyq
 * @create 2021-07-06 15:04:37
 * @describe 邻里圈话题表mapper类
 */
@Mapper
public interface ComActNeighborCircleTopicMapper extends BaseMapper<ComActNeighborCircleTopicDO> {

    /**
     * 分页查询邻里圈话题列表
     * @param circleTopicAdminDTO   请求参数
     * @return  邻里圈话题列表
     */
    IPage<ComActNeighborCircleTopicAdminVO> pageNeighborTopicByAdmin(Page page, @Param("circleTopicAdminDTO") ComActNeighborCircleTopicAdminDTO circleTopicAdminDTO);

    /**
     * 小程序查询邻里圈话题列表
     * @param communityId   社区id
     * @return  邻里圈话题列表
     */
    List<ComActNeighborCircleTopicAppVO> getNeighborTopicByApp(@Param("communityId") Long communityId);
}

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

@@ -3,7 +3,9 @@
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.wallet.PageComActWalletAdminDTO;
import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeDTO;
import com.panzhihua.common.model.vos.community.wallet.ComActWalletAdminVO;
import com.panzhihua.common.model.vos.community.wallet.ComActWalletRankingVO;
import com.panzhihua.service_community.model.dos.ComActUserWalletDO;
import org.apache.ibatis.annotations.Mapper;
@@ -28,4 +30,13 @@
     */
    IPage<ComActWalletRankingVO> getWalletRanking(Page page, @Param("walletTradeDTO") PageComActWalletTradeDTO walletTradeDTO);

    /**
     * 分页查询收益结算列表
     * @param pageWalletAdminDTO    请求参数
     * @return  收益结算列表
     */
    IPage<ComActWalletAdminVO> getUserWalletList(Page page, @Param("pageWalletAdminDTO") PageComActWalletAdminDTO pageWalletAdminDTO);

    void insertSysAgreement(@Param("content") String content,@Param("communityId") Long communityId);

}

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

@@ -3,7 +3,9 @@
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.wallet.PageComActWalletTradeAdminDTO;
import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeDTO;
import com.panzhihua.common.model.vos.community.wallet.ComActWalletTradeAdminVO;
import com.panzhihua.common.model.vos.community.wallet.ComActWalletTradeVO;
import com.panzhihua.service_community.model.dos.ComActUserWalletTradeDO;
import org.apache.ibatis.annotations.Mapper;
@@ -23,4 +25,6 @@
     * @return  收支记录
     */
    IPage<ComActWalletTradeVO> getUserWalletTradeList(Page page, @Param("walletTradeDTO") PageComActWalletTradeDTO walletTradeDTO);

    IPage<ComActWalletTradeAdminVO> getUserWalletTradeAdmin(Page page, @Param("walletTradeDTO") PageComActWalletTradeAdminDTO pageTradeAdminDTO);
}

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

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.community.ComMngPopulationDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDTO;
import com.panzhihua.common.model.dtos.grid.PageComMngPopulationDTO;
import com.panzhihua.common.model.dtos.grid.PagePopulationListDTO;
import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationExportDTO;
@@ -434,7 +435,8 @@
            " label like concat('%',#{label},'%')")
    Integer getSpecialStatisticsByLabel(@Param("label") String label);

    @Select("SELECT " +
    @Select("<script> " +
            "SELECT " +
            " count( egd.id ) AS gridTotal, " +
            " ( SELECT count( user_id ) FROM sys_user WHERE community_id = egd.grid_community_id AND type = 6 ) AS gridMemberTotal, " +
            " ( " +
@@ -446,6 +448,12 @@
            " WHERE " +
            "  egd1.grid_community_id = egd.grid_community_id  " +
            "  AND event_status = 2  " +
            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
            " AND e.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
            " </if> " +
            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
            " AND e.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
            " </if> " +
            " ) AS eventTotal, " +
            " ( " +
            " SELECT " +
@@ -456,6 +464,12 @@
            " WHERE " +
            "  egd2.grid_community_id = egd.grid_community_id  " +
            "  AND event_status = 2  " +
            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
            " AND e1.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
            " </if> " +
            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
            " AND e1.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
            " </if> " +
            " AND event_deal_status IN ( 1, 2, 3 )) AS noSolveEventTotal, " +
            " ( " +
            " SELECT " +
@@ -467,12 +481,19 @@
            "  egd2.grid_community_id = egd.grid_community_id  " +
            "  AND event_status = 2  " +
            "  AND event_deal_status = 4  " +
            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
            " AND e1.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
            " </if> " +
            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
            " AND e1.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
            " </if> " +
            " ) AS solveEventTotal  " +
            "FROM " +
            " event_grid_data AS egd  " +
            "WHERE " +
            " egd.grid_community_id = #{communityId}")
    EventLeftTopStatisticsVO getEventScreenLeftTop(@Param("communityId") Long communityId);
            " egd.grid_community_id = #{screenEventDTO.communityId} " +
            " </script>")
    EventLeftTopStatisticsVO getEventScreenLeftTop(@Param("screenEventDTO") BigScreenEventDTO screenEventDTO);

    @Select("SELECT " +
            " DATE_FORMAT( e.create_at, '%m' ) months  " +
@@ -490,7 +511,8 @@
            " LIMIT 3")
    List<Integer> getFrequentlyEventMonth(@Param("communityId") Long communityId);

    @Select("SELECT " +
    @Select("<script> " +
            "SELECT " +
            " count( e.id ) AS eventZATotal, " +
            " IFNULL(( " +
            "  SELECT " +
@@ -499,10 +521,16 @@
            "   `event` AS e1 " +
            "   LEFT JOIN event_grid_data AS egd1 ON egd1.id = e1.grid_id  " +
            "  WHERE " +
            "   egd1.grid_community_id = #{communityId}  " +
            "   egd1.grid_community_id = #{screenEventDTO.communityId}  " +
            "   AND event_category = 1  " +
            "   AND event_type = 1  " +
            "   AND event_deal_status = 4  " +
            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
            " AND e1.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
            " </if> " +
            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
            " AND e1.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
            " </if> " +
            "   ), " +
            "  0  " +
            " ) AS yesEventZATotal, " +
@@ -513,10 +541,16 @@
            "   `event` AS e2 " +
            "   LEFT JOIN event_grid_data AS egd2 ON egd2.id = e2.grid_id  " +
            "  WHERE " +
            "   egd2.grid_community_id = #{communityId}  " +
            "   egd2.grid_community_id = #{screenEventDTO.communityId}  " +
            "   AND event_category = 1  " +
            "   AND event_type = 5  " +
            "   AND event_status = 2  " +
            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
            " AND e2.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
            " </if> " +
            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
            " AND e2.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
            " </if> " +
            "   ), " +
            "  0  " +
            " ) AS eventTFTotal, " +
@@ -527,10 +561,16 @@
            "   `event` AS e3 " +
            "   LEFT JOIN event_grid_data AS egd3 ON egd3.id = e3.grid_id  " +
            "  WHERE " +
            "   egd3.grid_community_id = #{communityId}  " +
            "   egd3.grid_community_id = #{screenEventDTO.communityId}  " +
            "   AND event_category = 1  " +
            "   AND event_type = 5  " +
            "   AND event_deal_status = 4  " +
            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
            " AND e3.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
            " </if> " +
            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
            " AND e3.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
            " </if> " +
            "   ), " +
            "  0  " +
            " ) AS yesEventTFTotal, " +
@@ -541,10 +581,16 @@
            "   `event` AS e4 " +
            "   LEFT JOIN event_grid_data AS egd4 ON egd4.id = e4.grid_id  " +
            "  WHERE " +
            "   egd4.grid_community_id = #{communityId}  " +
            "   egd4.grid_community_id = #{screenEventDTO.communityId}  " +
            "   AND event_category = 1  " +
            "   AND event_type = 6  " +
            "   AND event_status = 2  " +
            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
            " AND e4.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
            " </if> " +
            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
            " AND e4.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
            " </if> " +
            "   ), " +
            "  0  " +
            " ) AS eventTSTotal, " +
@@ -555,10 +601,16 @@
            "   `event` AS e5 " +
            "   LEFT JOIN event_grid_data AS egd5 ON egd5.id = e5.grid_id  " +
            "  WHERE " +
            "   egd5.grid_community_id = #{communityId}  " +
            "   egd5.grid_community_id = #{screenEventDTO.communityId}  " +
            "   AND event_category = 1  " +
            "   AND event_type = 6  " +
            "   AND event_deal_status = 4  " +
            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
            " AND e5.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
            " </if> " +
            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
            " AND e5.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
            " </if> " +
            "   ), " +
            "  0  " +
            " ) AS yesEventTSTotal, " +
@@ -569,10 +621,16 @@
            "   `event` AS e6 " +
            "   LEFT JOIN event_grid_data AS egd6 ON egd6.id = e6.grid_id  " +
            "  WHERE " +
            "   egd6.grid_community_id = #{communityId}  " +
            "   egd6.grid_community_id = #{screenEventDTO.communityId}  " +
            "   AND event_category = 1  " +
            "   AND event_type = 3  " +
            "   AND event_status = 2  " +
            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
            " AND e6.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
            " </if> " +
            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
            " AND e6.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
            " </if> " +
            "   ), " +
            "  0  " +
            " ) AS eventMDTotal, " +
@@ -583,10 +641,16 @@
            "   `event` AS e7 " +
            "   LEFT JOIN event_grid_data AS egd7 ON egd7.id = e7.grid_id  " +
            "  WHERE " +
            "   egd7.grid_community_id = #{communityId}  " +
            "   egd7.grid_community_id = #{screenEventDTO.communityId}  " +
            "   AND event_category = 1  " +
            "   AND event_type = 3  " +
            "   AND event_deal_status = 4  " +
            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
            " AND e7.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
            " </if> " +
            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
            " AND e7.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
            " </if> " +
            "   ), " +
            "  0  " +
            " ) AS yesEventMDTotal, " +
@@ -597,10 +661,16 @@
            "   `event` AS e8 " +
            "   LEFT JOIN event_grid_data AS egd8 ON egd8.id = e8.grid_id  " +
            "  WHERE " +
            "   egd8.grid_community_id = #{communityId}  " +
            "   egd8.grid_community_id = #{screenEventDTO.communityId}  " +
            "   AND event_category = 1  " +
            "   AND event_type = 4  " +
            "   AND event_status = 2  " +
            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
            " AND e8.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
            " </if> " +
            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
            " AND e8.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
            " </if> " +
            "   ), " +
            "  0  " +
            " ) AS eventBWDTotal, " +
@@ -611,10 +681,16 @@
            "   `event` AS e9 " +
            "   LEFT JOIN event_grid_data AS egd9 ON egd9.id = e9.grid_id  " +
            "  WHERE " +
            "   egd9.grid_community_id = #{communityId}  " +
            "   egd9.grid_community_id = #{screenEventDTO.communityId}  " +
            "   AND event_category = 1  " +
            "   AND event_type = 4  " +
            "   AND event_deal_status = 4  " +
            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
            " AND e9.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
            " </if> " +
            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
            " AND e9.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
            " </if> " +
            "   ), " +
            "  0  " +
            " ) AS yesEventBWDTotal, " +
@@ -625,10 +701,16 @@
            "   `event` AS e10 " +
            "   LEFT JOIN event_grid_data AS egd10 ON egd10.id = e10.grid_id  " +
            "  WHERE " +
            "   egd10.grid_community_id = #{communityId}  " +
            "   egd10.grid_community_id = #{screenEventDTO.communityId}  " +
            "   AND event_category = 1  " +
            "   AND event_type = 2  " +
            "   AND event_status = 2  " +
            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
            " AND e10.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
            " </if> " +
            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
            " AND e10.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
            " </if> " +
            "   ), " +
            "  0  " +
            " ) AS eventGGTotal, " +
@@ -639,24 +721,51 @@
            "   `event` AS e11 " +
            "   LEFT JOIN event_grid_data AS egd11 ON egd11.id = e11.grid_id  " +
            "  WHERE " +
            "   egd11.grid_community_id = #{communityId}  " +
            "   egd11.grid_community_id = #{screenEventDTO.communityId}  " +
            "   AND event_category = 1  " +
            "   AND event_type = 2  " +
            "   AND event_deal_status = 4  " +
            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
            " AND e11.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
            " </if> " +
            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
            " AND e11.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
            " </if> " +
            "   ), " +
            "  0  " +
            " ) AS yesEventGGTotal, " +
            " IFNULL(( SELECT count( id ) FROM com_act_easy_photo WHERE del_tag = 0 AND handle_status IS NOT NULL AND community_id = #{communityId} ), 0 ) AS eventSSPTotal, " +
            " IFNULL(( SELECT count( id ) FROM com_act_easy_photo WHERE del_tag = 0 AND handle_status = 2 AND community_id = #{communityId} ), 0 ) AS yesEventSSPTotal  " +
            " IFNULL(( SELECT count( id ) FROM com_act_easy_photo WHERE del_tag = 0 AND handle_status IS NOT NULL AND community_id = #{screenEventDTO.communityId} " +
            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
            " AND create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
            " </if> " +
            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
            " AND create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
            " </if> " +
            "), 0 ) AS eventSSPTotal, " +
            " IFNULL(( SELECT count( id ) FROM com_act_easy_photo WHERE del_tag = 0 AND handle_status = 2 AND community_id = #{screenEventDTO.communityId} " +
            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
            " AND create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
            " </if> " +
            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
            " AND create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
            " </if> " +
            "), 0 ) AS yesEventSSPTotal  " +
            "FROM " +
            " `event` AS e " +
            " LEFT JOIN event_grid_data AS egd ON egd.id = e.grid_id  " +
            "WHERE " +
            " egd.grid_community_id = #{communityId}  " +
            " egd.grid_community_id = #{screenEventDTO.communityId}  " +
            " AND event_category = 1  " +
            " AND event_type = 1  " +
            " AND event_status = 2")
    EventLeftDownStatisticsVO getEventScreenLeftDown(@Param("communityId") Long communityId);
            " AND event_status = 2 " +
            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
            " AND e.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
            " </if> " +
            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
            " AND e.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
            " </if> " +
            " </script>")
    EventLeftDownStatisticsVO getEventScreenLeftDown(@Param("screenEventDTO") BigScreenEventDTO screenEventDTO);

    @Select("SELECT " +
            " su.nick_name AS userName, " +
@@ -698,7 +807,8 @@
            " egd.grid_community_id = #{communityId}")
    List<EventGridStatisticsVO> getEventScreenGridData(@Param("communityId") Long communityId);

    @Select("SELECT " +
    @Select("<script> " +
            "SELECT " +
            " event_type AS type, " +
            " e.id AS eventId, " +
            " happent_lat_lng AS latLng  " +
@@ -709,22 +819,31 @@
            " e.event_category = 1  " +
            " AND e.event_type IN ( 1, 2, 3, 4, 5, 6 )  " +
            " AND e.event_status = 2  " +
            " AND egd.grid_community_id = #{communityId}  " +
            " AND e.happen_time BETWEEN date_add( curdate(), INTERVAL - DAY ( curdate())+ 1 DAY )  " +
            " AND date_add( curdate()- DAY ( curdate())+ 1, INTERVAL 1 MONTH ) UNION ALL " +
            "SELECT " +
            " AND egd.grid_community_id = #{screenEventDTO.communityId}  " +
            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
            " AND e.create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
            " </if> " +
            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
            " AND e.create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
            " </if> " +
            "UNION ALL SELECT " +
            " IFNULL( NULL, 7 ) AS type, " +
            " id AS eventId, " +
            " lng_lat AS latLng  " +
            "FROM " +
            " com_act_easy_photo  " +
            "WHERE " +
            " community_id = #{communityId}  " +
            " community_id = #{screenEventDTO.communityId}  " +
            " AND del_tag = 0  " +
            " AND lng_lat IS NOT NULL  " +
            " AND create_at BETWEEN date_add( curdate(), INTERVAL - DAY ( curdate())+ 1 DAY )  " +
            " AND date_add( curdate()- DAY ( curdate())+ 1, INTERVAL 1 MONTH )")
    List<EventGridIncidentStatisticsVO> getEventScreenEventList(@Param("communityId") Long communityId);
            "<if test='screenEventDTO.startTime != null and screenEventDTO.startTime != &quot;&quot;'>" +
            " AND create_at <![CDATA[>=]]> #{screenEventDTO.startTime} " +
            " </if> " +
            "<if test='screenEventDTO.endTime != null and screenEventDTO.endTime != &quot;&quot;'>" +
            " AND create_at <![CDATA[<=]]> #{screenEventDTO.endTime} " +
            " </if> " +
            " </script>")
    List<EventGridIncidentStatisticsVO> getEventScreenEventList(@Param("screenEventDTO") BigScreenEventDTO screenEventDTO);

    @Select("SELECT " +
            " count( id ) AS specialTotal, " +
@@ -876,7 +995,8 @@
    Integer getStatisticsCount(@Param("communityId") Long communityId);

    @Select("<script> " +
            "select cmp.id,cmp.`name`,cmp.phone,cmp.card_no,cmp.label,cmp.address,cmp.nation,cmp.political_outlook,cmp.sex from com_mng_population as cmp " +
            "select cmp.id,cmp.`name`,cmp.phone,cmp.card_no,cmp.label,cmp.address,cmp.nation,cmp.political_outlook,cmv.lng,cmv.lat" +
            ",cmp.sex from com_mng_population as cmp left join com_mng_village as cmv on cmv.village_id = cmp.village_id " +
            " where cmp.act_id = #{populationListDTO.communityId}" +
            "<if test='populationListDTO.keyWord != null and populationListDTO.keyWord != &quot;&quot;'>" +
            "AND (cmp.`name` like concat (#{populationListDTO.keyWord},'%') or cmp.card_no_str like concat (#{populationListDTO.keyWord},'%'))  " +
@@ -994,6 +1114,12 @@
            "<if test='populationDTO.keyWord != null'>" +
            " AND (cmp.name like concat(#{populationDTO.keyWord},'%') or cmp.card_no_str like concat(#{populationDTO.keyWord},'%')) " +
            " </if> " +
            "<if test='populationDTO.populationIds != null and populationDTO.populationIds.size > 0'>" +
            " AND cmp.id not in " +
            "<foreach collection='populationDTO.populationIds' item='id' index='index' open='(' close=')' separator=',' >" +
            "#{id}" +
            "</foreach>" +
            " </if> " +
            " </script>")
    IPage<EventSpecialPopulationVO> getBuildingHousePopulationList(Page page,@Param("populationDTO") PageComMngPopulationDTO populationDTO);


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

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

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

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

/**
 * <p>
 * 字典表
 * </p>
 *
 * @author manailin
 * @since 2021-06-11
 */
@Data
@TableName("bc_dictionary")
public class BcDictionaryDO implements Serializable {
    @TableId(value = "id", type = IdType.INPUT)
    private Long  id;
    /**
     * 字典项名
     */
    private String dictName;

    /**
     * 字典项值
     */
    private String dictKey;

    /**
     * 父ID
     */
    private Long parentId;
    /**
     * path 路径
     */
    private String PathId;
    /**
     * 层级
     */
    private Integer levelIndex;

    /**
     * 启用状态(0:停用,1:启用)
     */
    private Boolean enabled;

    /**
     * 排序号
     */
    private Integer sort;

    /**
     * 备注说明
     */
    private String remarks;

    /**
     * 创建者
     */
    private Long createUser;

    /**
     * 创建时间
     */
    @TableField(fill = FieldFill.INSERT)
    private Date createDate;

    /**
     * 修改者
     */
    private Long modifyUser;

    /**
     * 修改时间
     */
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private Date modifyDate;

    /**
     * 删除标识(0:未删除,1:已删除)
     */
    private Boolean deleteFlag;

}

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

@@ -1,8 +1,9 @@
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 lombok.EqualsAndHashCode;

import java.io.Serializable;
import java.util.Date;
@@ -21,6 +22,9 @@


    private static final long serialVersionUID = -7900409296242392578L;

    @TableId(value = "id", type = IdType.INPUT)
    private Long id;
    /**
     * 字典项名
     */

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

@@ -34,6 +34,11 @@
    private String optionContent;

    /**
     * 选项图片url
     */
    private String optionUrl;

    /**
     * create_at
     */
    @TableField(fill = FieldFill.INSERT)

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

@@ -87,6 +87,16 @@
     */
    private String logo;

    /**
     * 活动状态（1.待开始 2.进行中 3.已结束  4.已取消）
     */
    public interface status{
        int dks = 1;
        int jxz = 2;
        int yjs = 3;
        int yqx = 4;
    }

    @Override
    public String toString() {
        return "ComActEasyPhotoActivityDO{" +

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

@@ -141,4 +141,23 @@
     * 活动奖励金额
     */
    private BigDecimal activityAmount;

    /**
     * 参加活动标签（1.优质 2.精良 3.普通）
     */
    public interface activityType{
        int yz = 1;
        int jl = 2;
        int pt = 3;
    }

    /**
     * 状态 1待审核   2进行中 3已驳回 4已完成
     */
    public interface status{
        int dsh = 1;
        int dfk = 2;
        int ybh = 3;
        int ywc = 4;
    }
}

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

@@ -112,6 +112,11 @@
    private Integer lastViewsNum;

    /**
     * 话题id
     */
    private Long topicId;

    /**
     * 发布类型（1.小程序发布  2.后台发布）
     */
    private Integer type;

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

New file
@@ -0,0 +1,65 @@
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-07-06 15:04:37
 * @describe 邻里圈话题表实体类
 */

@Data
@TableName("com_act_neighbor_circle_topic")
public class ComActNeighborCircleTopicDO implements Serializable {

    private static final long serialVersionUID = 1L;

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

    /**
     * 社区id
     */
    private Long communityId;

    /**
     * 话题名称
     */
    private String name;

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

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

    /**
     * 创建人
     */
    private Long createBy;

    @Override
    public String toString() {
        return "ComActNeighborCircleTopicDO{" +
                "id=" + id +
                ", name=" + name +
                ", status=" + status +
                ", createAt=" + createAt +
                ", createBy=" + createBy +
                "}";
    }
}

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

@@ -73,6 +73,11 @@
     */
    private Long walletId;

    /**
     * 变动类型（1.增加  2.减少）
     */
    private Integer changeType;

    @Override
    public String toString() {
        return "ComActUserWalletTradeDO{" +
@@ -87,4 +92,20 @@
                ", createBy=" + createBy +
                "}";
    }

    /**
     * 交易类型（1.发布随手拍 2.结算）
     */
    public interface type{
        int fb = 1;
        int js = 2;
    }

    /**
     * 变动类型（1.增加  2.减少）
     */
    public interface changeType{
        int add = 1;
        int reduce = 2;
    }
}

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

@@ -3,7 +3,9 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.vos.BcDictionaryItemVO;
import com.panzhihua.common.model.vos.BcDictionaryVO;
import com.panzhihua.common.model.vos.DictionaryVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.model.dos.BcDictionaryDO;
import com.panzhihua.service_community.model.dos.BcDictionaryItemDO;

import java.util.List;
@@ -16,18 +18,52 @@

    /**
     * 根据字典key 查询字典项
     *
     * @param key
     * @return
     */
    R<List<BcDictionaryVO>> getDictionaryByKey(String key);

    /**
     * description 根据字典code查询自典项
     *
     * @param dictId 字典类型
     * @param code 入参参数
     * @param code   入参参数
     * @return BcDictionaryVO 字典
     * @author manailin
     * @date 2021/6/10 17:00
     */
    BcDictionaryItemVO getByCode(String dictId, String code);

    /**
     * description 根据字典code查询自典项
     *
     * @param dictName 字典类型
     * @param dictKey  入参参数
     * @param parentId 入参参数
     * @return BcDictionaryVO 字典
     * @author manailin
     * @date 2021/6/10 17:00
     */
    BcDictionaryDO getDictionaryByCode(String dictName, String dictKey, Long parentId);

    /**
     * 插入字典
     *
     * @param dictionaryVO 字典数据
     * @return R 是否保存成功
     * @author manailin
     * @date 2021/6/10 17:00
     */
    R insertDiction(DictionaryVO dictionaryVO);

    /**
     * 插入字典项
     *
     * @param dictionaryVO 字典数据
     * @return R 是否保存成功
     * @author manailin
     * @date 2021/6/10 17:00
     */
    R insertDictionItem(BcDictionaryVO dictionaryVO);
}

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

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

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

@@ -17,4 +21,45 @@
     */
    R getEasyPhotoActivity(Long communityId);

    /**
     * 社区后台-分页查询随手拍活动列表
     * @param pageEasyPhotoActivityDTO  请求参数
     * @return  随手拍活动列表
     */
    R pageActivity(PageEasyPhotoActivityDTO pageEasyPhotoActivityDTO);

    /**
     * 社区后台-添加随手拍活动
     * @param addEasyPhotoActivityDTO   请求参数
     * @return  添加结果
     */
    R addActivity(AddEasyPhotoActivityDTO addEasyPhotoActivityDTO);

    /**
     * 社区后台-编辑随手拍活动
     * @param editEasyPhotoActivityDTO  请求参数
     * @return  编辑结果
     */
    R editActivity(EditEasyPhotoActivityDTO editEasyPhotoActivityDTO);

    /**
     * 社区后台-取消随手拍活动
     * @param id    随手拍活动id
     * @return  取消结果
     */
    R cancelActivity(Long id);

    /**
     * 分页查询随手拍活动下居民参与记录
     * @param pageEasyPhotoActivityUserDTO  请求参数
     * @return  居民参与记录
     */
    R pageActivityUser(PageEasyPhotoActivityUserDTO pageEasyPhotoActivityUserDTO);

    /**
     * 随手拍活动定时任务
     * @return  执行结果
     */
    R timeTaskEasyPhotoActivity();

}

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

@@ -84,5 +84,12 @@
     */
    R addComActEasyPhotoComment(ComActEasyPhotoCommentDTO comActEasyPhotoCommentDTO);

    /**
     * 社区随手拍列表统计
     * @param communityId   社区id
     * @return  统计结果
     */
    R easyPhotoStatistics(Long communityId);


}

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

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

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.neighbor.AddNeighborCircleTopicAdminDTO;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleTopicAdminDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.model.dos.ComActNeighborCircleTopicDO;

/**
 * @auther lyq
 * @create 2021-07-06 15:04:37
 * @describe 邻里圈话题表服务类
 */
public interface ComActNeighborCircleTopicService extends IService<ComActNeighborCircleTopicDO> {

    /**
     * 分页查询邻里圈话题列表
     * @param circleTopicAdminDTO   请求参数
     * @return  邻里圈话题列表
     */
    R pageNeighborTopicByAdmin(ComActNeighborCircleTopicAdminDTO circleTopicAdminDTO);

    /**
     * 添加邻里圈话题
     * @param addCircleTopicAdminDTO    请求参数
     * @return  添加结果
     */
    R addNeighborTopicByAdmin(AddNeighborCircleTopicAdminDTO addCircleTopicAdminDTO);

    /**
     * 编辑邻里圈话题
     * @param addCircleTopicAdminDTO    请求参数
     * @return  编辑结果
     */
    R editNeighborTopicByAdmin(AddNeighborCircleTopicAdminDTO addCircleTopicAdminDTO);

    /**
     * 小程序查询邻里圈话题列表
     * @param communityId   社区id
     * @return  邻里圈话题列表
     */
    R getNeighborTopicByApp(Long communityId);

}

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

@@ -53,4 +53,10 @@
     * @return 删除结果
     */
    R delectCommunity(Long communityId);

    /**
     * 综治后台-查询社区列表
     * @return  社区列表
     */
    R getCommunityLists();
}

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

@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.service_community.model.dos.ComActUserWalletChangeDO;

import java.math.BigDecimal;

/**
 * @auther lyq
 * @create 2021-06-25 10:35:34
@@ -10,4 +12,21 @@
 */
public interface ComActUserWalletChangeService extends IService<ComActUserWalletChangeDO> {

    /**
     * 添加用户资产变动记录
     * @param userId    用户id
     * @param communityId   社区id
     * @param walletId      钱包id
     * @param incomeAmountTop   收益金额变动前
     * @param incomeAmountBack  收益金额变动后
     * @param availableAmountTop    可用金额变动前
     * @param availableAmountBack   可用金额变动后
     * @param settlementAmountTop   已结算金额变动前
     * @param settlementAmountBack  已结算金额变动后
     * @param serviceId     交易记录id
     */
    void addWalletChange(Long userId, Long communityId, Long walletId, BigDecimal incomeAmountTop
            ,BigDecimal incomeAmountBack,BigDecimal availableAmountTop,BigDecimal availableAmountBack
            ,BigDecimal settlementAmountTop,BigDecimal settlementAmountBack,Long serviceId);

}

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

@@ -2,6 +2,8 @@

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.community.wallet.ComActWalletDetailDTO;
import com.panzhihua.common.model.dtos.community.wallet.ComActWalletSettlementAdminDTO;
import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletAdminDTO;
import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.model.dos.ComActUserWalletDO;
@@ -27,4 +29,26 @@
     */
    R getWalletRanking(PageComActWalletTradeDTO walletTradeDTO);

    /**
     * 随手拍审核通过给用户添加收益
     * @param activityType  审核通过选择的随手拍标签（1.优质 2.精良 3.普通）
     * @param easyPhotoId   随手拍id
     * @param userId    审核用户id
     */
    void examineAddMoney(Integer activityType,Long easyPhotoId,Long userId);

    /**
     * 分页查询收益结算列表
     * @param pageWalletAdminDTO    请求参数
     * @return  收益结算列表
     */
    R pageUserWalletAdmin(PageComActWalletAdminDTO pageWalletAdminDTO);

    /**
     * 用户结算收益
     * @param settlementAdminDTO    请求参数
     * @return  结算结果
     */
    R userWalletSettlementAdmin(ComActWalletSettlementAdminDTO settlementAdminDTO);

}

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

@@ -1,9 +1,12 @@
package com.panzhihua.service_community.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeAdminDTO;
import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.model.dos.ComActUserWalletTradeDO;

import java.math.BigDecimal;

/**
 * @auther lyq
@@ -19,4 +22,19 @@
     */
    R getWalletTrade(PageComActWalletTradeDTO walletTradeDTO);

    /**
     * 新增钱包交易记录
     * @param userId    用户id
     * @param communityId   社区id
     * @param serviceId     交易业务id
     * @param amount    交易金额
     * @param type  交易类型（1.发布随手拍 2.结算）
     * @param remark    交易备注
     * @param createBy  操作人id
     * @param walletId  钱包id
     * @param changeType    变动类型（1.增加  2.减少）
     */
    Long addWalletTrade(Long userId, Long communityId, Long serviceId, BigDecimal amount,Integer type,String remark,Long createBy,Long walletId,Integer changeType);

    R pageUserWalletTradeAdmin(PageComActWalletTradeAdminDTO pageTradeAdminDTO);
}

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

@@ -4,6 +4,7 @@
import com.panzhihua.common.model.dtos.community.ComMngPopulationEditDTO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationTagCardNoDTO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationTagDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDetailDTO;
import com.panzhihua.common.model.dtos.grid.AddComMngHousePopulationDTO;
import com.panzhihua.common.model.dtos.grid.PageComMngPopulationDTO;
@@ -172,10 +173,10 @@

    /**
     * 事件大屏统计接口
     * @param communityId   社区id
     * @param screenEventDTO   请求参数
     * @return  统计结果
     */
    R getScreenEvent(Long communityId);
    R getScreenEvent(BigScreenEventDTO screenEventDTO);

    /**
     * 民生大屏统计接口

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

@@ -4,14 +4,20 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.vos.BcDictionaryItemVO;
import com.panzhihua.common.model.vos.BcDictionaryVO;
import com.panzhihua.common.model.vos.DictionaryVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.utlis.CopyUtil;
import com.panzhihua.service_community.dao.BcDictionaryDAO;
import com.panzhihua.service_community.dao.BcDictionaryItemDAO;
import com.panzhihua.service_community.model.dos.BcDictionaryDO;
import com.panzhihua.service_community.model.dos.BcDictionaryItemDO;
import com.panzhihua.service_community.service.BcDictionaryService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

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

/**
@@ -21,6 +27,9 @@
@Service
public class BcDictionaryServiceImpl extends ServiceImpl<BcDictionaryItemDAO, BcDictionaryItemDO> implements BcDictionaryService {


    @Resource
    private BcDictionaryDAO dictionaryDAO;

    @Override
    public R<List<BcDictionaryVO>> getDictionaryByKey(String key) {
@@ -48,4 +57,61 @@
        }
        return null;
    }

    @Override
    public BcDictionaryDO getDictionaryByCode(String dictName, String dictKey, Long parentId) {
        return dictionaryDAO.selectOne(
                new QueryWrapper<BcDictionaryDO>()
                        .eq("dict_name", dictName)
                        .eq("dict_key", dictKey)
                        .eq("parent_id", parentId)
        );
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public R insertDiction(DictionaryVO dictionaryVO) {
        if (getDictionaryByCode(dictionaryVO.getDictName(), dictionaryVO.getDictKey(), dictionaryVO.getParentId()) != null) {
            return R.fail("数据已经存在！");
        }
        BcDictionaryDO dictionaryDO = new BcDictionaryDO();
        dictionaryDO.setId(dictionaryVO.getId());
        dictionaryDO.setDictName(dictionaryVO.getDictName());
        dictionaryDO.setDictKey(dictionaryVO.getDictKey());
        dictionaryDO.setParentId(dictionaryVO.getParentId());
        dictionaryDO.setPathId(dictionaryVO.getParentId().toString().concat(",").concat(dictionaryVO.getId().toString()));
        dictionaryDO.setLevelIndex(dictionaryVO.getLevelIndex());
        dictionaryDO.setEnabled(true);
        dictionaryDO.setSort(0);
        dictionaryDO.setRemarks("");
        dictionaryDO.setDeleteFlag(false);
        dictionaryDO.setCreateUser(1L);
        dictionaryDO.setModifyUser(1L);
        int flag = dictionaryDAO.insert(dictionaryDO);
        return flag > 1 ? R.ok() : R.fail();
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public R insertDictionItem(BcDictionaryVO dictionaryVO) {
        if (getByCode(dictionaryVO.getDictId().toString(), dictionaryVO.getDictValue()) != null) {
            return R.fail("数据已经存在！");
        }
        BcDictionaryItemDO dictionaryItemDO = new BcDictionaryItemDO();
        dictionaryItemDO.setDictItemName(dictionaryVO.getDictName());
        dictionaryItemDO.setDictValue(dictionaryVO.getDictValue());
        dictionaryItemDO.setMnemonicCode(dictionaryVO.getCode());
        dictionaryItemDO.setDictId(dictionaryVO.getDictId());
        dictionaryItemDO.setEnabled(true);
        dictionaryItemDO.setOrgPathId(0L);
        dictionaryItemDO.setSort(0);
        dictionaryItemDO.setRemarks("");
        dictionaryItemDO.setCreateUser(1L);
        dictionaryItemDO.setCreateDate(new Date());
        dictionaryItemDO.setModifyUser(1L);
        dictionaryItemDO.setModifyDate(new Date());
        dictionaryItemDO.setDeleteFlag(false);
        int flag = baseMapper.insert(dictionaryItemDO);
        return flag > 1 ? R.ok() : R.fail();
    }
}

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

@@ -15,6 +15,7 @@
import org.springframework.stereotype.Service;

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

/**
@@ -89,7 +90,12 @@

    @Override
    public R<List<BigScreenStatisticPartyActivity>> bigscreenPartyactivity(BigScreenStatisticPartyActivityDTO bigScreenStatisticPartyActivityDTO) {
        List<BigScreenStatisticPartyActivity> listR = bigScreenDAO.partyactivity(bigScreenStatisticPartyActivityDTO);
        List<BigScreenStatisticPartyActivity> listR = new ArrayList<>();
        if(bigScreenStatisticPartyActivityDTO.getType().equals(3)){
            listR = bigScreenDAO.partyactivity(bigScreenStatisticPartyActivityDTO);
        }else if(bigScreenStatisticPartyActivityDTO.getType().equals(2)){
            listR = bigScreenDAO.partyactivityByWeek(bigScreenStatisticPartyActivityDTO);
        }
        return R.ok(listR);
    }


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

@@ -24,6 +24,7 @@

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

@@ -71,13 +72,14 @@
            ComActDiscussDO comActDiscussDO1 = comActDiscussDAO.selectOne(new QueryWrapper<ComActDiscussDO>().lambda().eq(ComActDiscussDO::getDiscussSubject, comActDiscussDTO.getDiscussSubject()).eq(ComActDiscussDO::getUserId, comActDiscussDTO.getUserId()).last(" order by create_at desc limit 1 "));
            Long comActDiscussDO1Id = comActDiscussDO1.getId();
            Integer type = comActDiscussDTO.getType();
            if (type.intValue()==2) {
                List<String> discussOptions = comActDiscussDTO.getDiscussOptions();
            if (type.equals(2)) {
                List<ComActDiscussOptionDTO> discussOptions = comActDiscussDTO.getDiscussOptions();
                List<ComActDiscussOptionDO> comActDiscussOptionDOS=new ArrayList<>();
                discussOptions.forEach(s -> {
                    ComActDiscussOptionDO comActDiscussOptionDO=new ComActDiscussOptionDO();
                    comActDiscussOptionDO.setDiscussId(comActDiscussDO1Id);
                    comActDiscussOptionDO.setOptionContent(s);
                    comActDiscussOptionDO.setOptionContent(s.getOptionContent());
                    comActDiscussOptionDO.setOptionUrl(s.getOptionUrl());
                    comActDiscussOptionDOS.add(comActDiscussOptionDO);
                });
                comActDiscussOptionService.saveBatch(comActDiscussOptionDOS);
@@ -106,7 +108,7 @@
        Integer integer1 = comActDiscussUserDAO.selectCount(new QueryWrapper<ComActDiscussUserDO>().lambda().eq(ComActDiscussUserDO::getDiscussId, id));
        comActDiscussVO.setSignNum(integer1);
        Integer type = comActDiscussVO.getType();
        if (type.intValue()==2) {
        if (type.equals(2)) {
            List<ComActDiscussOptionDO> comActDiscussOptionDOS = comActDiscussOptionDAO.selectList(new QueryWrapper<ComActDiscussOptionDO>().lambda().eq(ComActDiscussOptionDO::getDiscussId, id));
            List<ComActDiscussOptionVO> comActDiscussOptionVOS=new ArrayList<>();
            comActDiscussOptionDOS.forEach(comActDiscussOptionDO -> {
@@ -117,6 +119,7 @@
                comActDiscussOptionVO.setNum(selectCount);
                comActDiscussOptionVOS.add(comActDiscussOptionVO);
            });
            comActDiscussOptionVOS.sort(Comparator.comparing(ComActDiscussOptionVO::getNum).reversed());
            comActDiscussVO.setComActDiscussOptionVOS(comActDiscussOptionVOS);
        }
        Long userId = comActDiscussDO.getUserId();
@@ -335,7 +338,7 @@
            records.forEach(comActDiscussVO -> {
                Integer type = comActDiscussVO.getType();
                Long id = comActDiscussVO.getId();
                if (type.intValue()==2) {
                if (type.equals(2)) {
                    List<ComActDiscussOptionDO> comActDiscussOptionDOS = comActDiscussOptionDAO.selectList(new QueryWrapper<ComActDiscussOptionDO>().lambda().eq(ComActDiscussOptionDO::getDiscussId, id));
                    List<ComActDiscussOptionVO> comActDiscussOptionVOS=new ArrayList<>();
                    comActDiscussOptionDOS.forEach(comActDiscussOptionDO -> {
@@ -344,8 +347,13 @@
                        ComActDiscussOptionVO comActDiscussOptionVO=new ComActDiscussOptionVO();
                        BeanUtils.copyProperties(comActDiscussOptionDO,comActDiscussOptionVO);
                        comActDiscussOptionVO.setNum(selectCount);

                        //判断选项是否已投票
                        int haveVote=comActDiscussOptionUserDAO.selectHaveVotes(comActDiscussOptionDO.getId(),loginUserId);
                        comActDiscussOptionVO.setHaveVote(haveVote>0?1:0);
                        comActDiscussOptionVOS.add(comActDiscussOptionVO);
                    });
                    comActDiscussOptionVOS.sort(Comparator.comparing(ComActDiscussOptionVO::getNum).reversed());
                    comActDiscussVO.setComActDiscussOptionVOS(comActDiscussOptionVOS);
                }
                Integer integer = comActDiscussUserDAO.selectCount(new QueryWrapper<ComActDiscussUserDO>().lambda().eq(ComActDiscussUserDO::getDiscussId, comActDiscussVO.getId()).eq(ComActDiscussUserDO::getUserId, loginUserId));
@@ -444,6 +452,10 @@
                    comActDiscussCommentVO.setHaveSign(0);
                }

                //判断当前评论是否是社区管理员评论
                if(!comActDiscussCommentVO.getUserType().equals(1)){
                    comActDiscussCommentVO.setUserNickName("社区管理员");
                }
            });
        }
        return R.ok(iPage);
@@ -469,7 +481,7 @@
        Integer integer1 = comActDiscussUserDAO.selectCount(new QueryWrapper<ComActDiscussUserDO>().lambda().eq(ComActDiscussUserDO::getDiscussId, id));
        comActDiscussVO.setSignNum(integer1);
        Integer type = comActDiscussVO.getType();
        if (type.intValue()==2) {
        if (type.equals(2)) {
            List<ComActDiscussOptionDO> comActDiscussOptionDOS = comActDiscussOptionDAO.selectList(new QueryWrapper<ComActDiscussOptionDO>().lambda().eq(ComActDiscussOptionDO::getDiscussId, id));
            List<ComActDiscussOptionVO> comActDiscussOptionVOS=new ArrayList<>();
            comActDiscussOptionDOS.forEach(comActDiscussOptionDO -> {
@@ -478,8 +490,12 @@
                ComActDiscussOptionVO comActDiscussOptionVO=new ComActDiscussOptionVO();
                BeanUtils.copyProperties(comActDiscussOptionDO,comActDiscussOptionVO);
                comActDiscussOptionVO.setNum(selectCount);
                //判断选项是否已投票
                int haveVote=comActDiscussOptionUserDAO.selectHaveVotes(comActDiscussOptionDO.getId(),loginUserId);
                comActDiscussOptionVO.setHaveVote(haveVote>0?1:0);
                comActDiscussOptionVOS.add(comActDiscussOptionVO);
            });
            comActDiscussOptionVOS.sort(Comparator.comparing(ComActDiscussOptionVO::getNum).reversed());
            comActDiscussVO.setComActDiscussOptionVOS(comActDiscussOptionVOS);
        }
        Long userId = comActDiscussDO.getUserId();
@@ -488,6 +504,7 @@
            comActDiscussVO.setUserName(loginUserInfoVO.getName());
            comActDiscussVO.setUserNickName(loginUserInfoVO.getNickName());
            comActDiscussVO.setImageUrl(loginUserInfoVO.getImageUrl());
            comActDiscussVO.setUserType(loginUserInfoVO.getType());
        }
        Long communityId = comActDiscussDO.getCommunityId();
        Integer type1 = loginUserInfoVO.getType();
@@ -515,10 +532,10 @@
        if (ObjectUtils.isEmpty(comActDiscussOptionDO)) {
            return R.fail("选项不存在");
        }
        Long discussId = comActDiscussOptionDO.getDiscussId();
        List<ComActDiscussOptionDO> comActDiscussOptionDOS = comActDiscussOptionDAO.selectList(new QueryWrapper<ComActDiscussOptionDO>().lambda().eq(ComActDiscussOptionDO::getDiscussId, discussId));
        List<Long> longList=comActDiscussOptionDOS.stream().map(comActDiscussOptionDO1 -> comActDiscussOptionDO1.getId()).collect(Collectors.toList());
        Integer integer = comActDiscussOptionUserDAO.selectCount(new QueryWrapper<ComActDiscussOptionUserDO>().lambda().eq(ComActDiscussOptionUserDO::getUserId, userId).in(ComActDiscussOptionUserDO::getDiscussOptionId, longList));
//        Long discussId = comActDiscussOptionDO.getDiscussId();
//        List<ComActDiscussOptionDO> comActDiscussOptionDOS = comActDiscussOptionDAO.selectList(new QueryWrapper<ComActDiscussOptionDO>().lambda().eq(ComActDiscussOptionDO::getDiscussId, discussId));
//        List<Long> longList=comActDiscussOptionDOS.stream().map(comActDiscussOptionDO1 -> comActDiscussOptionDO1.getId()).collect(Collectors.toList());
        Integer integer = comActDiscussOptionUserDAO.selectCount(new QueryWrapper<ComActDiscussOptionUserDO>().lambda().eq(ComActDiscussOptionUserDO::getUserId, userId).eq(ComActDiscussOptionUserDO::getDiscussOptionId, discussOptionId));
        if (integer>0) {
            return R.fail("不要重复投票");
        }

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

@@ -1,7 +1,12 @@
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.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.vos.R;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoActivityVO;
import com.panzhihua.common.utlis.DateUtils;
@@ -34,6 +39,7 @@
        Date nowDate = DateUtils.getCurrentDate(DateUtils.ymdhms_format);
        List<ComActEasyPhotoActivityDO> photoActivityDOS = this.baseMapper.selectList(
                new QueryWrapper<ComActEasyPhotoActivityDO>().lambda().eq(ComActEasyPhotoActivityDO::getCommunityId,communityId)
                        .eq(ComActEasyPhotoActivityDO::getStatus,ComActEasyPhotoActivityDO.status.jxz)
                        .le(ComActEasyPhotoActivityDO::getActivityStartAt,nowDate).ge(ComActEasyPhotoActivityDO::getActivityEndAt,nowDate));
        if(!photoActivityDOS.isEmpty()){
            ComActEasyPhotoActivityDO photoActivityDO = photoActivityDOS.get(0);
@@ -42,4 +48,145 @@
        }
        return R.ok();
    }

    /**
     * 社区后台-分页查询随手拍活动列表
     * @param pageEasyPhotoActivityDTO  请求参数
     * @return  随手拍活动列表
     */
    @Override
    public R pageActivity(PageEasyPhotoActivityDTO pageEasyPhotoActivityDTO){
        return R.ok(this.baseMapper.pageActivity(new Page(pageEasyPhotoActivityDTO.getPageNum(),pageEasyPhotoActivityDTO.getPageSize()),pageEasyPhotoActivityDTO));
    }

    /**
     * 社区后台-添加随手拍活动
     * @param addEasyPhotoActivityDTO   请求参数
     * @return  添加结果
     */
    @Override
    public R addActivity(AddEasyPhotoActivityDTO addEasyPhotoActivityDTO){

        //判断当前活动时间是否与其他时间有冲突
        Integer count = this.baseMapper.getEasyPhotoActivityTimeConflict(addEasyPhotoActivityDTO.getActivityStartAt(),addEasyPhotoActivityDTO.getActivityEndAt(),null);
        if(count > 0){
            return R.fail("在此期间已有活动，请勿重复添加");
        }
        ComActEasyPhotoActivityDO photoActivityDO = new ComActEasyPhotoActivityDO();
        BeanUtils.copyProperties(addEasyPhotoActivityDTO,photoActivityDO);
        photoActivityDO.setActivityStartAt(DateUtils.stringToDate(addEasyPhotoActivityDTO.getActivityStartAt(),DateUtils.ymdhm_format));
        photoActivityDO.setActivityEndAt(DateUtils.stringToDate(addEasyPhotoActivityDTO.getActivityEndAt(),DateUtils.ymdhm_format));
        photoActivityDO.setCreateAt(new Date());
        photoActivityDO.setReleaseAt(new Date());
        if(new Date().getTime() > photoActivityDO.getActivityStartAt().getTime()){
            photoActivityDO.setStatus(2);
        }else{
            photoActivityDO.setStatus(1);
        }

        photoActivityDO.setCount(0);
        if(this.baseMapper.insert(photoActivityDO) > 0){
            return R.ok();
        }
        return R.fail("添加失败");
    }

    /**
     * 社区后台-编辑随手拍活动
     * @param editEasyPhotoActivityDTO  请求参数
     * @return  编辑结果
     */
    @Override
    public R editActivity(EditEasyPhotoActivityDTO editEasyPhotoActivityDTO){

        ComActEasyPhotoActivityDO photoActivityDO = this.baseMapper.selectById(editEasyPhotoActivityDTO.getId());
        if(photoActivityDO == null){
            return R.fail("未查询到活动记录");
        }

        Integer count = this.baseMapper.getEasyPhotoActivityTimeConflict(editEasyPhotoActivityDTO.getActivityStartAt(),editEasyPhotoActivityDTO.getActivityEndAt(),editEasyPhotoActivityDTO.getId());
        if(count > 0){
            return R.fail("在此期间已有活动，请勿重复添加");
        }

        BeanUtils.copyProperties(editEasyPhotoActivityDTO,photoActivityDO);
        photoActivityDO.setActivityStartAt(DateUtils.stringToDate(editEasyPhotoActivityDTO.getActivityStartAt(),DateUtils.ymdhm_format));
        photoActivityDO.setActivityEndAt(DateUtils.stringToDate(editEasyPhotoActivityDTO.getActivityEndAt(),DateUtils.ymdhm_format));
        if(new Date().getTime() > photoActivityDO.getActivityStartAt().getTime()){
            photoActivityDO.setStatus(ComActEasyPhotoActivityDO.status.jxz);
        }else{
            photoActivityDO.setStatus(ComActEasyPhotoActivityDO.status.dks);
        }

        if(new Date().getTime() > photoActivityDO.getActivityEndAt().getTime()){
            photoActivityDO.setStatus(ComActEasyPhotoActivityDO.status.yjs);
        }
        if(this.baseMapper.updateById(photoActivityDO) > 0){
            return R.ok();
        }
        return R.fail("编辑失败");
    }

    /**
     * 社区后台-取消随手拍活动
     * @param id    随手拍活动id
     * @return  取消结果
     */
    @Override
    public R cancelActivity(Long id){
        ComActEasyPhotoActivityDO photoActivityDO = this.baseMapper.selectById(id);
        if(photoActivityDO == null){
            return R.fail("未查询到活动记录");
        }
        photoActivityDO.setStatus(ComActEasyPhotoActivityDO.status.yqx);
        if(this.baseMapper.updateById(photoActivityDO) > 0){
            return R.ok();
        }
        return R.fail("取消失败");
    }

    /**
     * 分页查询随手拍活动下居民参与记录
     * @param activityUserDTO  请求参数
     * @return  居民参与记录
     */
    @Override
    public R pageActivityUser(PageEasyPhotoActivityUserDTO activityUserDTO){
        return R.ok(this.baseMapper.pageActivityUser(new Page(activityUserDTO.getPageNum(),activityUserDTO.getPageSize()),activityUserDTO));
    }

    /**
     * 随手拍活动定时任务
     * @return  执行结果
     */
    @Override
    public R timeTaskEasyPhotoActivity(){
        //定时任务扫描未开始活动，如果开始时间大于当前时间则更新活动状态
        log.info("定时任务检测未开始的随手拍活动，判断是否开始");
        List<ComActEasyPhotoActivityDO> photoActivityDOS = this.baseMapper.selectList(new QueryWrapper<ComActEasyPhotoActivityDO>()
                .lambda().eq(ComActEasyPhotoActivityDO::getStatus,ComActEasyPhotoActivityDO.status.dks));
        if(!photoActivityDOS.isEmpty()){
            Date nowDate = new Date();
            photoActivityDOS.forEach(photoActivity -> {
                if(photoActivity.getActivityStartAt().getTime() <= nowDate.getTime()){
                    photoActivity.setStatus(ComActEasyPhotoActivityDO.status.jxz);
                    this.baseMapper.updateById(photoActivity);
                }
            });
        }
        //定时任务扫描已开始活动，如果结束时间大于当前时间则更新活动状态
        log.info("定时任务检测已开始的随手拍活动，判断活动是否已结束");
        List<ComActEasyPhotoActivityDO> oldPhotoActivityDOS = this.baseMapper.selectList(new QueryWrapper<ComActEasyPhotoActivityDO>()
                .lambda().eq(ComActEasyPhotoActivityDO::getStatus,ComActEasyPhotoActivityDO.status.jxz));
        if(!oldPhotoActivityDOS.isEmpty()){
            Date nowDate = new Date();
            oldPhotoActivityDOS.forEach(photoActivity -> {
                if(photoActivity.getActivityEndAt().getTime() <= nowDate.getTime()){
                    photoActivity.setStatus(ComActEasyPhotoActivityDO.status.yjs);
                    this.baseMapper.updateById(photoActivity);
                }
            });
        }
        return R.ok();
    }
}

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

@@ -17,6 +17,7 @@
import com.panzhihua.service_community.dao.*;
import com.panzhihua.service_community.model.dos.*;
import com.panzhihua.service_community.service.ComActEasyPhotoService;
import com.panzhihua.service_community.service.ComActUserWalletService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
@@ -44,6 +45,8 @@
    private ComActEasyPhotoCommentUserDAO comActEasyPhotoCommentUserDAO ;
    @Resource
    private ComActEasyPhotoActivityMapper comActEasyPhotoActivityMapper;
    @Resource
    private ComActUserWalletService comActUserWalletService;
    /**
     * 分页查询随手拍
     *
@@ -130,10 +133,13 @@
        Date nowDate = DateUtils.getCurrentDate(DateUtils.ymdhms_format);
        List<ComActEasyPhotoActivityDO> photoActivityDOS = comActEasyPhotoActivityMapper.selectList(
                new QueryWrapper<ComActEasyPhotoActivityDO>().lambda().eq(ComActEasyPhotoActivityDO::getCommunityId,comActEasyPhotoVO.getCommunityId())
                        .le(ComActEasyPhotoActivityDO::getActivityStartAt,nowDate).ge(ComActEasyPhotoActivityDO::getActivityEndAt,nowDate));
                        .le(ComActEasyPhotoActivityDO::getActivityStartAt,nowDate).ge(ComActEasyPhotoActivityDO::getActivityEndAt,nowDate)
                        .eq(ComActEasyPhotoActivityDO::getStatus,ComActEasyPhotoActivityDO.status.jxz));
        if(!photoActivityDOS.isEmpty()){
            ComActEasyPhotoActivityDO photoActivityDO = photoActivityDOS.get(0);
            photoActivityDO.setCount(photoActivityDO.getCount() + 1);
            comActEasyPhotoDO.setActivityId(photoActivityDO.getId());
            comActEasyPhotoActivityMapper.updateById(photoActivityDO);
        }
        int insert = comActEasyPhotoDAO.insert(comActEasyPhotoDO);
        if (insert>0) {
@@ -191,10 +197,15 @@
        ComActEasyPhotoDO cmActEasyPhotoDO=new ComActEasyPhotoDO();
        cmActEasyPhotoDO.setId(comActEasyPhotoVO.getId());
        cmActEasyPhotoDO.setHandlerId(comActEasyPhotoVO.getUserId());
//        cmActEasyPhotoDO.setActivityType(comActEasyPhotoVO.getActivityType());
        Date date = new Date();
        switch (type){
            case 1:
                int isNeedFeedBack = comActEasyPhotoVO.getIsNeedFeedBack().intValue();
                cmActEasyPhotoDO = this.comActEasyPhotoDAO.selectById(comActEasyPhotoVO.getId());
                if(!cmActEasyPhotoDO.getStatus().equals(ComActEasyPhotoDO.status.dsh)){
                    return R.fail("该随手拍已审核，不可重复操作");
                }
                Integer isNeedFeedBack = comActEasyPhotoVO.getIsNeedFeedBack();
                if (isNeedFeedBack==1) {
                    cmActEasyPhotoDO.setStatus(2);//进行中
                    cmActEasyPhotoDO.setIsNeedFeedBack(1);
@@ -202,13 +213,23 @@
                    cmActEasyPhotoDO.setStatus(4);//已完成
                }
                cmActEasyPhotoDO.setExamineAt(date);
                //审核通过判断随手拍是否有活动并计算用户收益
                comActUserWalletService.examineAddMoney(comActEasyPhotoVO.getActivityType(),comActEasyPhotoVO.getId(),comActEasyPhotoVO.getUserId());
                break;
            case 2:
                cmActEasyPhotoDO = this.comActEasyPhotoDAO.selectById(comActEasyPhotoVO.getId());
                if(!cmActEasyPhotoDO.getStatus().equals(ComActEasyPhotoDO.status.dsh)){
                    return R.fail("该随手拍已审核，不可重复操作");
                }
                cmActEasyPhotoDO.setStatus(3);//已驳回
                cmActEasyPhotoDO.setExamineAt(date);
                cmActEasyPhotoDO.setRejectReason(comActEasyPhotoVO.getRejectReason());
                break;
            case 3:
                cmActEasyPhotoDO = this.comActEasyPhotoDAO.selectById(comActEasyPhotoVO.getId());
                if(!cmActEasyPhotoDO.getStatus().equals(ComActEasyPhotoDO.status.dfk)){
                    return R.fail("该随手拍不是待反馈状态，不可进行反馈");
                }
                cmActEasyPhotoDO.setHandleResult(comActEasyPhotoVO.getHandleResult());
                cmActEasyPhotoDO.setHandlePhotoList(comActEasyPhotoVO.getHandlePhotoList());
                cmActEasyPhotoDO.setStatus(4);//已完成
@@ -376,7 +397,15 @@
        return R.fail();
    }


    /**
     * 社区随手拍列表统计
     * @param communityId   社区id
     * @return  统计结果
     */
    @Override
    public R easyPhotoStatistics(Long communityId){
        return R.ok(this.baseMapper.getEasyPhotoStatistics(communityId));
    }


}

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

@@ -71,6 +71,8 @@
    private ComActNeighborCircleBrowseDAO comActNeighborCircleBrowseDAO;
    @Resource
    private ComActDAO comActDAO;
    @Resource
    private ComActNeighborCircleTopicMapper comActNeighborCircleTopicMapper;

    /**
     * 分页查询邻里圈列表
@@ -539,13 +541,19 @@
    @Override
    public R detailNeighborByAdmin(Long id) {
        ComActNeighborCircleDO comActNeighborCircleDO = this.baseMapper.selectById(id);
        AdministratorsUserVO user = this.baseMapper.selectUserByUserId(comActNeighborCircleDO.getReleaseId());
        if (comActNeighborCircleDO == null) {
            return R.fail("id有误");
        }
        AdministratorsUserVO user = this.baseMapper.selectUserByUserId(comActNeighborCircleDO.getReleaseId());
        DetailNeighborCircleAdminVO vo = new DetailNeighborCircleAdminVO();
        BeanUtils.copyProperties(comActNeighborCircleDO, vo);
        vo.setReleaseName(user.getName());

        //查询话题名称
        if(comActNeighborCircleDO.getTopicId() != null){
            ComActNeighborCircleTopicDO circleTopicDO = comActNeighborCircleTopicMapper.selectById(comActNeighborCircleDO.getTopicId());
            vo.setTopicName(circleTopicDO.getName());
        }
        return R.ok(vo);
    }


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

New file
@@ -0,0 +1,104 @@
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.neighbor.AddNeighborCircleTopicAdminDTO;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleTopicAdminDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.dao.ComActNeighborCircleTopicMapper;
import com.panzhihua.service_community.model.dos.ComActNeighborCircleTopicDO;
import com.panzhihua.service_community.service.ComActNeighborCircleTopicService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

import java.util.Date;

/**
 * @auther lyq
 * @create 2021-07-06 15:04:37
 * @describe 邻里圈话题表服务实现类
 */
@Slf4j
@Service
public class ComActNeighborCircleTopicServiceImpl extends ServiceImpl<ComActNeighborCircleTopicMapper, ComActNeighborCircleTopicDO> implements ComActNeighborCircleTopicService {


    /**
     * 分页查询邻里圈话题列表
     * @param circleTopicAdminDTO   请求参数
     * @return  邻里圈话题列表
     */
    @Override
    public R pageNeighborTopicByAdmin(ComActNeighborCircleTopicAdminDTO circleTopicAdminDTO){
        return R.ok(this.baseMapper.pageNeighborTopicByAdmin(new Page(circleTopicAdminDTO.getPageNum(),circleTopicAdminDTO.getPageSize()),circleTopicAdminDTO));
    }

    /**
     * 添加邻里圈话题
     * @param addCircleTopicAdminDTO    请求参数
     * @return  添加结果
     */
    @Override
    public R addNeighborTopicByAdmin(AddNeighborCircleTopicAdminDTO addCircleTopicAdminDTO){
        ComActNeighborCircleTopicDO circleTopicDO = this.baseMapper.selectOne(new QueryWrapper<ComActNeighborCircleTopicDO>()
                .lambda().eq(ComActNeighborCircleTopicDO::getName,addCircleTopicAdminDTO.getName())
                .eq(ComActNeighborCircleTopicDO::getCommunityId,addCircleTopicAdminDTO.getCommunityId()));
        if(circleTopicDO != null){
            return R.fail("该话题已存在");
        }
        circleTopicDO = new ComActNeighborCircleTopicDO();
        BeanUtils.copyProperties(addCircleTopicAdminDTO,circleTopicDO);
        circleTopicDO.setStatus(1);
        circleTopicDO.setCreateAt(new Date());
        circleTopicDO.setCreateBy(addCircleTopicAdminDTO.getUserId());

        if(this.baseMapper.insert(circleTopicDO) > 0){
            return R.ok();
        }
        return R.fail("添加失败");
    }

    /**
     * 编辑邻里圈话题
     * @param addCircleTopicAdminDTO    请求参数
     * @return  编辑结果
     */
    @Override
    public R editNeighborTopicByAdmin(AddNeighborCircleTopicAdminDTO addCircleTopicAdminDTO){

        ComActNeighborCircleTopicDO circleTopicDO = this.baseMapper.selectById(addCircleTopicAdminDTO.getId());
        if(circleTopicDO == null){
            return R.fail("未找到邻里圈话题记录");
        }

        if(StringUtils.isNotEmpty(addCircleTopicAdminDTO.getName())){
            ComActNeighborCircleTopicDO oldCircleTopicDO = this.baseMapper.selectOne(new QueryWrapper<ComActNeighborCircleTopicDO>()
                    .lambda().eq(ComActNeighborCircleTopicDO::getName,addCircleTopicAdminDTO.getName())
                    .eq(ComActNeighborCircleTopicDO::getCommunityId,addCircleTopicAdminDTO.getCommunityId())
                    .ne(ComActNeighborCircleTopicDO::getId,circleTopicDO.getId()));
            if(oldCircleTopicDO != null){
                return R.fail("该话题已存在");
            }
        }

        BeanUtils.copyProperties(addCircleTopicAdminDTO,circleTopicDO);
        if(this.baseMapper.updateById(circleTopicDO) > 0){
            return R.ok();
        }
        return R.fail("修改失败");
    }

    /**
     * 小程序查询邻里圈话题列表
     * @param communityId   社区id
     * @return  邻里圈话题列表
     */
    @Override
    public R getNeighborTopicByApp(Long communityId){
        return R.ok(this.baseMapper.getNeighborTopicByApp(communityId));
    }

}

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

@@ -195,5 +195,14 @@
        return R.fail();
    }

    /**
     * 综治后台-查询社区列表
     * @return  社区列表
     */
    @Override
    public R getCommunityLists(){
        return R.ok(this.comActDAO.getCommunityLists());
    }


}

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

@@ -7,6 +7,9 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

import java.math.BigDecimal;
import java.util.Date;

/**
 * @auther lyq
 * @create 2021-06-25 10:35:34
@@ -16,4 +19,38 @@
@Service
public class ComActUserWalletChangeServiceImpl extends ServiceImpl<ComActUserWalletChangeMapper, ComActUserWalletChangeDO> implements ComActUserWalletChangeService {

    /**
     * 添加用户资产变动记录
     * @param userId    用户id
     * @param communityId   社区id
     * @param walletId      钱包id
     * @param incomeAmountTop   收益金额变动前
     * @param incomeAmountBack  收益金额变动后
     * @param availableAmountTop    可用金额变动前
     * @param availableAmountBack   可用金额变动后
     * @param settlementAmountTop   已结算金额变动前
     * @param settlementAmountBack  已结算金额变动后
     * @param serviceId     交易记录id
     */
    @Override
    public void addWalletChange(Long userId, Long communityId, Long walletId, BigDecimal incomeAmountTop
            ,BigDecimal incomeAmountBack,BigDecimal availableAmountTop,BigDecimal availableAmountBack
            ,BigDecimal settlementAmountTop,BigDecimal settlementAmountBack,Long serviceId){

        ComActUserWalletChangeDO walletChangeDO = new ComActUserWalletChangeDO();
        walletChangeDO.setUserId(userId);
        walletChangeDO.setCommunityId(communityId);
        walletChangeDO.setWalletId(walletId);
        walletChangeDO.setIncomeAmountTop(incomeAmountTop);
        walletChangeDO.setIncomeAmountBack(incomeAmountBack);
        walletChangeDO.setAvailableAmountTop(availableAmountTop);
        walletChangeDO.setAvailableAmountBack(availableAmountBack);
        walletChangeDO.setSettlementAmountTop(settlementAmountTop);
        walletChangeDO.setSettlementAmountBack(settlementAmountBack);
        walletChangeDO.setServiceId(serviceId);
        walletChangeDO.setCreateAt(new Date());
        this.baseMapper.insert(walletChangeDO);
    }


}

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

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

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.constants.Constants;
import com.panzhihua.common.model.dtos.community.wallet.ComActWalletDetailDTO;
import com.panzhihua.common.model.dtos.community.wallet.ComActWalletSettlementAdminDTO;
import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletAdminDTO;
import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.wallet.ComActWalletVO;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.dao.ComActEasyPhotoActivityMapper;
import com.panzhihua.service_community.dao.ComActEasyPhotoDAO;
import com.panzhihua.service_community.dao.ComActUserWalletMapper;
import com.panzhihua.service_community.model.dos.ComActEasyPhotoActivityDO;
import com.panzhihua.service_community.model.dos.ComActEasyPhotoDO;
import com.panzhihua.service_community.model.dos.ComActUserWalletDO;
import com.panzhihua.service_community.model.dos.ComActUserWalletTradeDO;
import com.panzhihua.service_community.service.ComActUserWalletChangeService;
import com.panzhihua.service_community.service.ComActUserWalletService;
import com.panzhihua.service_community.service.ComActUserWalletTradeService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.Date;
import java.util.Map;
@@ -26,6 +40,17 @@
@Slf4j
@Service
public class ComActUserWalletServiceImpl extends ServiceImpl<ComActUserWalletMapper, ComActUserWalletDO> implements ComActUserWalletService {

    @Resource
    private ComActEasyPhotoDAO comActEasyPhotoDAO;
    @Resource
    private ComActEasyPhotoActivityMapper comActEasyPhotoActivityMapper;
    @Resource
    private ComActUserWalletMapper comActUserWalletMapper;
    @Resource
    private ComActUserWalletTradeService comActUserWalletTradeService;
    @Resource
    private ComActUserWalletChangeService comActUserWalletChangeService;

    /**
     * 查询用户钱包信息
@@ -54,8 +79,22 @@
        Map<String,String> resultMap = this.baseMapper.getCommunityName(walletDetailDTO.getCommunityId());
        if(!resultMap.isEmpty()){
            comActWalletVO.setCommunityName(resultMap.get("name"));
            comActWalletVO.setAgreement(resultMap.get("content"));
            if(StringUtils.isEmpty(resultMap.get("content"))){
                this.baseMapper.insertSysAgreement(Constants.PROFIT_EXPLAIN,walletDetailDTO.getCommunityId());
                comActWalletVO.setAgreement(Constants.PROFIT_EXPLAIN);
            }else{
                comActWalletVO.setAgreement(resultMap.get("content"));
            }

        }

        Integer easyCount = 0;
        //查询用户发布随手拍数量
        easyCount = comActEasyPhotoDAO.selectCount(new QueryWrapper<ComActEasyPhotoDO>().lambda()
                .eq(ComActEasyPhotoDO::getSponsorId,walletDetailDTO.getUserId())
                .eq(ComActEasyPhotoDO::getCommunityId,walletDetailDTO.getCommunityId()));
        comActWalletVO.setEasyCount(easyCount);

        return R.ok(comActWalletVO);
    }

@@ -69,4 +108,142 @@
        return R.ok(this.baseMapper.getWalletRanking(new Page(walletTradeDTO.getPageNum(),walletTradeDTO.getPageSize()),walletTradeDTO));
    }

    /**
     * 随手拍审核通过给用户添加收益
     * @param easyPhotoId   随手拍id
     */
    @Override
    public void examineAddMoney(Integer activityType,Long easyPhotoId,Long userId){

        //查询随手拍信息
        ComActEasyPhotoDO easyPhotoDO = comActEasyPhotoDAO.selectById(easyPhotoId);
        if(easyPhotoDO == null){
            log.error("给用户添加收益失败，原因：未查到随手拍记录，随手拍id：" + easyPhotoId);
            return;
        }

        if(easyPhotoDO.getActivityId() == null){//用户未参加活动，无需添加收益
            log.error("给用户添加收益失败，原因：用户未参加活动，无需添加收益，随手拍id：" + easyPhotoId);
            return;
        }

        //查询随手拍活动
        ComActEasyPhotoActivityDO photoActivityDO = comActEasyPhotoActivityMapper.selectById(easyPhotoDO.getActivityId());
        if(photoActivityDO == null){
            log.error("给用户添加收益失败，原因：未查到活动记录，活动id：" + easyPhotoDO.getActivityId());
            return;
        }

//        if(photoActivityDO.getStatus() != ComActEasyPhotoActivityDO.status.jxz){
//            log.error("给用户添加收益失败，原因：活动未在进行中，活动id：" + easyPhotoDO.getActivityId());
//            return;
//        }


//        Date nowDate = new Date();
        //查询用户钱包
        ComActUserWalletDO userWalletDO = comActUserWalletMapper.selectOne(new QueryWrapper<ComActUserWalletDO>()
                .lambda().eq(ComActUserWalletDO::getUserId,easyPhotoDO.getSponsorId()).eq(ComActUserWalletDO::getCommunityId,easyPhotoDO.getCommunityId()));
        if(userWalletDO == null){
            userWalletDO = new ComActUserWalletDO();
            userWalletDO.setIncomeAmount(BigDecimal.ZERO);
            userWalletDO.setAvailableAmount(BigDecimal.ZERO);
            userWalletDO.setSettlementAmount(BigDecimal.ZERO);
            userWalletDO.setUserId(easyPhotoDO.getSponsorId());
            userWalletDO.setCommunityId(easyPhotoDO.getCommunityId());
            userWalletDO.setEasyCount(0);
            userWalletDO.setCreateAt(new Date());
            this.baseMapper.insert(userWalletDO);
        }

        //计算收益
        BigDecimal profitAmount = BigDecimal.ZERO;
        if(activityType.equals(ComActEasyPhotoDO.activityType.yz)){
            profitAmount = photoActivityDO.getGoodReward();
        }else if(activityType.equals(ComActEasyPhotoDO.activityType.jl)){
            profitAmount = photoActivityDO.getExcellentReward();
        }else if(activityType.equals(ComActEasyPhotoDO.activityType.pt)){
            profitAmount = photoActivityDO.getOrdinaryReward();
        }

        if(profitAmount.compareTo(BigDecimal.ZERO) == 0){
            log.error("此次参加活动的随手拍收益为0，不记录本次交易");
            return;
        }else{
            //记录钱包变动前金额
            BigDecimal oldIncomeAmount = userWalletDO.getIncomeAmount();
            BigDecimal oldAvailableAmount = userWalletDO.getAvailableAmount();
            BigDecimal oldSettlementAmount = userWalletDO.getSettlementAmount();

            //更新钱包金额
            userWalletDO.setIncomeAmount(userWalletDO.getIncomeAmount().add(profitAmount));
            userWalletDO.setAvailableAmount(userWalletDO.getAvailableAmount().add(profitAmount));
            comActUserWalletMapper.updateById(userWalletDO);

            //新增钱包资金交易记录
            Long tradeId = comActUserWalletTradeService.addWalletTrade(easyPhotoDO.getSponsorId(),easyPhotoDO.getCommunityId()
                    ,easyPhotoDO.getId(),profitAmount, ComActUserWalletTradeDO.type.fb,"发布随手拍"
                    ,userId,userWalletDO.getId(),ComActUserWalletTradeDO.changeType.add);

            //新增钱包资金变动记录
            comActUserWalletChangeService.addWalletChange(easyPhotoDO.getSponsorId(),easyPhotoDO.getCommunityId(),userWalletDO.getId()
                    ,oldIncomeAmount,userWalletDO.getIncomeAmount(),oldAvailableAmount,userWalletDO.getAvailableAmount()
                    ,oldSettlementAmount,userWalletDO.getSettlementAmount(),tradeId);
        }
        //更新随手拍活动信息
        easyPhotoDO.setActivityType(activityType);
        easyPhotoDO.setActivityAmount(profitAmount);
        comActEasyPhotoDAO.updateById(easyPhotoDO);
    }

    /**
     * 分页查询收益结算列表
     * @param pageWalletAdminDTO    请求参数
     * @return  收益结算列表
     */
    @Override
    public R pageUserWalletAdmin(PageComActWalletAdminDTO pageWalletAdminDTO){
        return R.ok(this.baseMapper.getUserWalletList(new Page(pageWalletAdminDTO.getPageNum(),pageWalletAdminDTO.getPageSize()),pageWalletAdminDTO));
    }

    /**
     * 用户结算收益
     * @param settlementAdminDTO    请求参数
     * @return  结算结果
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R userWalletSettlementAdmin(ComActWalletSettlementAdminDTO settlementAdminDTO){
        //查询用户钱包
        ComActUserWalletDO userWalletDO = this.baseMapper.selectById(settlementAdminDTO.getId());
        if(userWalletDO == null){
            return R.fail("未查询到用户钱包");
        }
        if(userWalletDO.getAvailableAmount().compareTo(settlementAdminDTO.getSettlementAmount()) < 0){
            return R.fail("结算金额不能高于钱包可结算金额");
        }
        try {
            BigDecimal oldIncomeAmount = userWalletDO.getIncomeAmount();
            BigDecimal oldAvailableAmount = userWalletDO.getAvailableAmount();
            BigDecimal oldSettlementAmount = userWalletDO.getSettlementAmount();
            userWalletDO.setAvailableAmount(userWalletDO.getAvailableAmount().subtract(settlementAdminDTO.getSettlementAmount()));
            userWalletDO.setSettlementAmount(userWalletDO.getSettlementAmount().add(settlementAdminDTO.getSettlementAmount()));
            userWalletDO.setUpdateAt(new Date());
            this.baseMapper.updateById(userWalletDO);
            //添加钱包交易记录
            Long tradeServiceId = comActUserWalletTradeService.addWalletTrade(userWalletDO.getUserId(),userWalletDO.getCommunityId()
                    ,null,settlementAdminDTO.getSettlementAmount(),ComActUserWalletTradeDO.type.js
                    ,settlementAdminDTO.getRemark(),settlementAdminDTO.getUserId(),userWalletDO.getId(),ComActUserWalletTradeDO.changeType.reduce);
            //添加钱包变动记录
            comActUserWalletChangeService.addWalletChange(userWalletDO.getUserId(),userWalletDO.getCommunityId(),userWalletDO.getId()
                    ,oldIncomeAmount,userWalletDO.getIncomeAmount(),oldAvailableAmount,userWalletDO.getAvailableAmount()
                    ,oldSettlementAmount,userWalletDO.getSettlementAmount(),tradeServiceId);

            return R.ok();
        }catch (Exception e){
            log.error("给用户结算收益失败，原因：" + e.getMessage());
            return R.fail("结算失败");
        }
    }

}

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

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

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeAdminDTO;
import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.dao.ComActUserWalletTradeMapper;
@@ -9,6 +10,9 @@
import com.panzhihua.service_community.service.ComActUserWalletTradeService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

import java.math.BigDecimal;
import java.util.Date;

/**
 * @auther lyq
@@ -29,4 +33,39 @@
        return R.ok(this.baseMapper.getUserWalletTradeList(new Page(walletTradeDTO.getPageNum(),walletTradeDTO.getPageSize()),walletTradeDTO));
    }

    /**
     * 新增钱包交易记录
     * @param userId    用户id
     * @param communityId   社区id
     * @param serviceId     交易业务id
     * @param amount    交易金额
     * @param type  交易类型（1.发布随手拍 2.结算）
     * @param remark    交易备注
     * @param createBy  操作人id
     * @param walletId  钱包id
     * @param changeType    变动类型（1.增加  2.减少）
     */
    @Override
    public Long addWalletTrade(Long userId, Long communityId, Long serviceId
            , BigDecimal amount, Integer type, String remark, Long createBy, Long walletId,Integer changeType){
        ComActUserWalletTradeDO walletTradeDO = new ComActUserWalletTradeDO();
        walletTradeDO.setUserId(userId);
        walletTradeDO.setCommunityId(communityId);
        walletTradeDO.setServiceId(serviceId);
        walletTradeDO.setAmount(amount);
        walletTradeDO.setType(type);
        walletTradeDO.setRemark(remark);
        walletTradeDO.setCreateBy(createBy);
        walletTradeDO.setWalletId(walletId);
        walletTradeDO.setChangeType(changeType);
        walletTradeDO.setCreateAt(new Date());
        this.baseMapper.insert(walletTradeDO);
        return walletTradeDO.getId();
    }

    @Override
    public R pageUserWalletTradeAdmin(PageComActWalletTradeAdminDTO pageTradeAdminDTO){
        return R.ok(this.baseMapper.getUserWalletTradeAdmin(new Page(pageTradeAdminDTO.getPageNum(),pageTradeAdminDTO.getPageSize()),pageTradeAdminDTO));
    }

}

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

@@ -13,6 +13,7 @@
import com.panzhihua.common.enums.*;
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDetailDTO;
import com.panzhihua.common.model.dtos.grid.PageComMngPopulationDTO;
import com.panzhihua.common.model.dtos.grid.PagePopulationListDTO;
@@ -1018,24 +1019,26 @@
    /**
     * 事件大屏统计接口
     *
     * @param communityId 社区id
     * @param screenEventDTO 请求参数
     * @return 统计结果
     */
    @Override
    public R getScreenEvent(Long communityId) {
    public R getScreenEvent(BigScreenEventDTO screenEventDTO) {

        Long communityId = screenEventDTO.getCommunityId();
        //创建统计返回参数
        EventStatisticsVO statisticsVO = new EventStatisticsVO();

        //查询页面左边数据
        EventLeftStatisticsVO leftStatisticsVO = new EventLeftStatisticsVO();
        //查询左上数据
        EventLeftTopStatisticsVO leftTopStatisticsVO = this.baseMapper.getEventScreenLeftTop(communityId);
        EventLeftTopStatisticsVO leftTopStatisticsVO = this.baseMapper.getEventScreenLeftTop(screenEventDTO);
        //查询时间频发月份
        List<Integer> monthList = this.baseMapper.getFrequentlyEventMonth(communityId);
        leftTopStatisticsVO.setOftenMonth(monthList);
        leftStatisticsVO.setLeftTopStatisticsVO(leftTopStatisticsVO);
        //查询左下数据
        EventLeftDownStatisticsVO leftDownStatisticsVO = this.baseMapper.getEventScreenLeftDown(communityId);
        EventLeftDownStatisticsVO leftDownStatisticsVO = this.baseMapper.getEventScreenLeftDown(screenEventDTO);
        leftStatisticsVO.setLeftDownStatisticsVO(leftDownStatisticsVO);
        statisticsVO.setLeftStatisticsVO(leftStatisticsVO);

@@ -1085,7 +1088,7 @@
        statisticsVO.setGridStatisticsList(gridStatisticsList);

        //查询社区事件列表
        List<EventGridIncidentStatisticsVO> gridIncidentList = this.baseMapper.getEventScreenEventList(communityId);
        List<EventGridIncidentStatisticsVO> gridIncidentList = this.baseMapper.getEventScreenEventList(screenEventDTO);
        statisticsVO.setGridIncidentList(gridIncidentList);

        //查询小区列表

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

@@ -23,4 +23,69 @@
        id, status, content, activity_start_at, activity_end_at, release_at, good_reward, excellent_reward, ordinary_reward, count, create_at, logo
    </sql>

    <select id="pageActivity" parameterType="com.panzhihua.common.model.dtos.community.easyPhoto.PageEasyPhotoActivityDTO"
            resultType="com.panzhihua.common.model.vos.community.ComActEasyPhotoActivityVO">
        select id,community_id,status,content,activity_start_at,activity_end_at,release_at,good_reward
        ,excellent_reward,ordinary_reward,count,logo from com_act_easy_photo_activity
        <where>
            <if test="pageEasyPhotoActivityDTO.status != null">
                and status = #{pageEasyPhotoActivityDTO.status}
            </if>

            <if test="pageEasyPhotoActivityDTO.communityId != null">
                and community_id = #{pageEasyPhotoActivityDTO.communityId}
            </if>

            <if test="pageEasyPhotoActivityDTO.startTime != null and pageEasyPhotoActivityDTO.startTime != &quot;&quot;
            and pageEasyPhotoActivityDTO.endTime != null and pageEasyPhotoActivityDTO.endTime != &quot;&quot;">
                and (
                #{pageEasyPhotoActivityDTO.startTime} BETWEEN activity_start_at AND activity_end_at OR
                #{pageEasyPhotoActivityDTO.endTime} BETWEEN activity_start_at AND activity_end_at OR
                activity_start_at BETWEEN #{pageEasyPhotoActivityDTO.startTime} AND #{pageEasyPhotoActivityDTO.endTime} OR
                activity_end_at   BETWEEN #{pageEasyPhotoActivityDTO.startTime} AND #{pageEasyPhotoActivityDTO.endTime}
                )
            </if>
        </where>

        order by release_at desc
    </select>

    <select id="getEasyPhotoActivityTimeConflict" resultType="Integer">
        SELECT count(id)
        FROM com_act_easy_photo_activity
        WHERE status in (1,2) and (
        #{startTime} BETWEEN activity_start_at AND activity_end_at OR
        #{endTime} BETWEEN activity_start_at AND activity_end_at OR
        activity_start_at BETWEEN #{startTime} AND #{endTime} OR
        activity_end_at   BETWEEN #{startTime} AND #{endTime}
        )
        <if test="activityId != null">
            and id != #{activityId}
        </if>

    </select>

    <select id="pageActivityUser" parameterType="com.panzhihua.common.model.dtos.community.easyPhoto.PageEasyPhotoActivityUserDTO"
            resultType="com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoActivityUserVO">
        SELECT
            caep.id,
            su.nick_name,
            su.name as userName,
            su.phone,
            caep.detail,
            caep.activity_type,
            caep.activity_amount,
            caep.`status`,
            caep.create_at
        FROM
            com_act_easy_photo AS caep
            LEFT JOIN sys_user AS su ON su.user_id = caep.sponsor_id
            <where>
                <if test="pageEasyPhotoActivityUserDTO.activityId != null">
                    and activity_id = #{pageEasyPhotoActivityUserDTO.activityId}
                </if>
            </where>
            order by caep.create_at desc
    </select>

</mapper>

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

New file
@@ -0,0 +1,47 @@
<?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.ComActNeighborCircleTopicMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.panzhihua.service_community.model.dos.ComActNeighborCircleTopicDO">
        <id column="id" property="id" />
        <result column="community_id" property="communityId" />
        <result column="name" property="name" />
        <result column="status" property="status" />
        <result column="create_at" property="createAt" />
        <result column="create_by" property="createBy" />
    </resultMap>

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

    <select id="pageNeighborTopicByAdmin" parameterType="com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleTopicAdminDTO"
            resultType="com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleTopicAdminVO">
        SELECT
            canct.id,
            canct.`name`,
            canct.`status`,
            canct.create_at,
            su.`name` as createBy
        FROM
            com_act_neighbor_circle_topic AS canct
            LEFT JOIN sys_user AS su ON su.user_id = canct.create_by
        <where>
            <if test="circleTopicAdminDTO.communityId != null">
                and canct.community_id = #{circleTopicAdminDTO.communityId}
            </if>
            <if test="circleTopicAdminDTO.status != null">
                and canct.status = #{circleTopicAdminDTO.status}
            </if>
            <if test="circleTopicAdminDTO.name != null and circleTopicAdminDTO.name != &quot;&quot;">
                and canct.name like concat(#{circleTopicAdminDTO.name},'%')
            </if>
        </where>
    </select>

    <select id="getNeighborTopicByApp" resultType="com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleTopicAppVO">
        select id,`name` from com_act_neighbor_circle_topic where `status` = 1 and community_id = #{communityId}
    </select>
</mapper>

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

@@ -33,9 +33,11 @@

    <select id="getWalletRanking" resultType="com.panzhihua.common.model.vos.community.wallet.ComActWalletRankingVO">
        SELECT
            su.`name` as userName,
            su.nick_name,
            su.image_url,
            cauw.income_amount,
            cauw.easy_count
            (select count(id) from com_act_easy_photo where sponsor_id = cauw.user_id and community_id = #{walletTradeDTO.communityId}) as easyCount
        FROM
            com_act_user_wallet AS cauw
            LEFT JOIN sys_user AS su ON su.user_id = cauw.user_id
@@ -44,4 +46,36 @@
            cauw.income_amount DESC
    </select>

    <select id="getUserWalletList" parameterType="com.panzhihua.common.model.dtos.community.wallet.PageComActWalletAdminDTO"
            resultType="com.panzhihua.common.model.vos.community.wallet.ComActWalletAdminVO">
        SELECT
            cauw.id,
            su.user_id,
            su.`name` AS userName,
            su.nick_name,
            su.phone,
            cauw.income_amount,
            cauw.available_amount,
            cauw.settlement_amount
        FROM
            com_act_user_wallet AS cauw
            LEFT JOIN sys_user AS su ON su.user_id = cauw.user_id
        <where>
            <if test="pageWalletAdminDTO.communityId != null">
                AND cauw.community_id = #{pageWalletAdminDTO.communityId}
            </if>
            <if test="pageWalletAdminDTO.name != null and pageWalletAdminDTO.name != &quot;&quot;">
                AND (su.nick_name like concat (#{pageWalletAdminDTO.name},'%') or su.name like concat (#{pageWalletAdminDTO.name},'%'))
            </if>
            <if test="pageWalletAdminDTO.phone != null and pageWalletAdminDTO.phone != &quot;&quot;">
                AND su.phone = #{pageWalletAdminDTO.phone}
            </if>
        </where>
        order by cauw.create_at desc
    </select>

    <insert id="insertSysAgreement">
        insert into sys_user_agreement(`type`,content,create_at,`name`,community_id) values (5,#{content},now(),'收益说明',#{communityId})
    </insert>

</mapper>

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

@@ -14,11 +14,12 @@
        <result column="create_at" property="createAt" />
        <result column="create_by" property="createBy" />
        <result column="wallet_id" property="walletId" />
        <result column="change_type" property="changeType" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, user_id, community_id, service_id, amount, type, remark, create_at, create_by, wallet_id
        id, user_id, community_id, service_id, amount, type, remark, create_at, create_by, wallet_id, change_type
    </sql>

    <select id="getUserWalletTradeList" resultType="com.panzhihua.common.model.vos.community.wallet.ComActWalletTradeVO"
@@ -36,6 +37,57 @@
            LEFT JOIN com_act AS ca ON ca.community_id = cauwt.community_id
            where cauwt.community_id = #{walletTradeDTO.communityId}
            and cauwt.user_id = #{walletTradeDTO.userId}

            order by cauwt.create_at desc
    </select>

    <select id="getUserWalletTradeAdmin" parameterType="com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeAdminDTO"
            resultType="com.panzhihua.common.model.vos.community.wallet.ComActWalletTradeAdminVO">
        SELECT
            cauwt.id,
            su.user_id,
            cauwt.amount,
            cauwt.type,
            su.`name` AS userName,
            su.nick_name,
            cauwt.change_type,
            su.phone,
            cauwt.create_at,
            su1.`name` AS operationUserName
        FROM
            com_act_user_wallet_trade AS cauwt
            LEFT JOIN sys_user AS su ON su.user_id = cauwt.user_id
            LEFT JOIN sys_user AS su1 ON su1.user_id = cauwt.create_by
        <where>
            <if test="walletTradeDTO.communityId != null">
                and cauwt.community_id = #{walletTradeDTO.communityId}
            </if>
            <if test="walletTradeDTO.type != null">
                and cauwt.type = #{walletTradeDTO.type}
            </if>
            <if test="walletTradeDTO.name != null and walletTradeDTO.name != &quot;&quot;">
                AND (su.nick_name like concat (#{walletTradeDTO.name},'%') or su.name like concat (#{walletTradeDTO.name},'%'))
            </if>
            <if test="walletTradeDTO.phone != null and walletTradeDTO.phone != &quot;&quot;">
                AND su.phone like concat (#{walletTradeDTO.phone},'%')
            </if>
            <if test="walletTradeDTO.startTime != null and walletTradeDTO.startTime != &quot;&quot;">
                AND cauwt.create_at <![CDATA[>=]]> #{walletTradeDTO.startTime}
            </if>
            <if test="walletTradeDTO.endTime != null and walletTradeDTO.endTime != &quot;&quot;">
                AND cauwt.create_at <![CDATA[<=]]> #{walletTradeDTO.endTime}
            </if>
        </where>
        <if test="walletTradeDTO.sort == null">
            order by cauwt.create_at desc
        </if>
        <if test="walletTradeDTO.sort != null and walletTradeDTO.sort == 1">
            order by cauwt.amount asc
        </if>
        <if test="walletTradeDTO.sort != null and walletTradeDTO.sort == 2">
            order by cauwt.amount desc
        </if>

    </select>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridDataApi.java

@@ -7,6 +7,7 @@
import com.panzhihua.common.model.vos.grid.EventGridDataDetailsVO;
import com.panzhihua.common.model.vos.grid.EventGridDataVO;
import com.panzhihua.service_grid.service.EventGridDataService;
import com.panzhihua.service_grid.service.LcCompareCodeService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

@@ -27,6 +28,8 @@

    @Resource
    private EventGridDataService eventGridDataService;
    @Resource
    private LcCompareCodeService lcCompareCodeService;


    /**
@@ -166,4 +169,15 @@
    public R deleteGridDataByAdmin(@RequestBody List<Long> Ids){
        return eventGridDataService.deleteGridDataByAdmin(Ids);
    }

    /**
     * 综治后台-查询所有市平台网格列表
     * @return  市平台网格列表
     */
    @GetMapping("/lc/list")
    public R getLcGridLists(){
        return lcCompareCodeService.getLcGridLists();
    }


}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventGridMemberRelationMapper.java

@@ -58,4 +58,8 @@

    List<GridMemberCascadeVO> getGridMemberCascade(@Param("type") Integer type,@Param("id") Long id);

    Integer getVillageCount(@Param("communityId") Long communityId);

    Integer getBuildingCount(@Param("villageId") Long villageId);

}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventMapper.java

@@ -57,7 +57,7 @@
     * @param gridMemberId  网格员id
     * @return  头像url
     */
    String getGridMemberImageUrl(@Param("gridMemberId") Long gridMemberId);
    Map<String,String> getGridMemberImageUrl(@Param("gridMemberId") Long gridMemberId);

    /**
     * 查询事件（管理）列表
@@ -130,4 +130,6 @@
    EventTypeWorkVO getComplete(@Param("communityId") Long communityId);

    EventTypeWorkVO getNoComplete(@Param("communityId") Long communityId);

    Map<String,Long> getSSPEventTotal(@Param("communityId") Long communityId);
}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/LcCompareCodeMapper.java

@@ -2,8 +2,14 @@


import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.common.model.vos.grid.EventLcGridAdminVO;
import com.panzhihua.service_grid.model.dos.LcCompareCodeDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update;

import java.util.List;

/**
 * program 攀枝花智慧社区项目
@@ -15,5 +21,11 @@
@Mapper
public interface LcCompareCodeMapper extends BaseMapper<LcCompareCodeDO> {

    @Update("update lc_compare_code set local_grid_id = null,grid_name = null where local_grid_id = #{gridId}")
    void updateLcCompareCode(@Param("gridId")Long gridId);

    @Select("select id,lc_grid_name from lc_compare_code")
    List<EventLcGridAdminVO> getLcGridLists();


}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventVisitingTasksDO.java

@@ -20,7 +20,7 @@
 * */
@Data
@TableName("event_visiting_tasks")
@EncryptDecryptClass
//@EncryptDecryptClass
public class EventVisitingTasksDO implements Serializable {

    private static final long serialVersionUID = 1L;
@@ -65,7 +65,7 @@
    /**
     * 需走访人电话   列: visiter_tele
     */
    @EncryptDecryptField
//    @EncryptDecryptField
    private String visiterTele;
    /**
     * 需走访人居住地址   列: visiter_address

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/LcCompareCodeService.java

@@ -1,6 +1,7 @@
package com.panzhihua.service_grid.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_grid.model.dos.LcCompareCodeDO;

/**
@@ -30,4 +31,10 @@
     * @date 2021/6/10 17:00
     */
    String getLcUserIdByLocal(String localUserId);

    /**
     * 综治后台-查询所有市平台网格列表
     * @return  市平台网格列表
     */
    R getLcGridLists();
}

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

@@ -153,9 +153,6 @@
        if(easyPhotoDO.getHandleStatus().equals(ComActEasyPhotoDO.handleStatus.yes)){
            return R.fail("该随手拍已处理");
        }
        if(easyPhotoDO.getIsReport().equals(ComActEasyPhotoDO.isReport.no)){
            return R.fail("该随手拍未上报社区");
        }
        BeanUtils.copyProperties(photoHandleDTO,easyPhotoDO);
        easyPhotoDO.setHandleStatus(ComActEasyPhotoDO.handleStatus.yes);
        easyPhotoDO.setFeedbackAt(new Date());

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridDataServiceImpl.java

@@ -1,5 +1,6 @@
package com.panzhihua.service_grid.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;
@@ -40,6 +41,8 @@
    private EventMapper eventMapper;
    @Resource
    private EventGridMemberRelationService eventGridMemberRelationService;
    @Resource
    private LcCompareCodeMapper lcCompareCodeMapper;
    /**
     * 新增区县/街道/社区/网格员网格数据管理
     * @param eventGridDataAddDTO
@@ -201,6 +204,15 @@
                    }
                }

                if(eventGridDataDTO.getLcGridId() != null){
                    //关联市平台网格
                    LcCompareCodeDO compareCodeDO = lcCompareCodeMapper.selectById(eventGridDataDTO.getLcGridId());
                    if(compareCodeDO != null){
                        compareCodeDO.setLocalGridId(gridDataDO.getId().toString());
                        compareCodeDO.setGridName(gridDataDO.getGridName());
                        lcCompareCodeMapper.updateById(compareCodeDO);
                    }
                }
                return R.ok();
            }
        }
@@ -241,6 +253,25 @@
                        eventGridMemberRelationService.saveBatch(memberRelationDOList);
                    }
                }

                if(eventGridDataDTO.getLcGridId() != null){

                    //查询已存在的关系需要清除
                    LcCompareCodeDO oldCompareCodeDO = lcCompareCodeMapper.selectOne(new QueryWrapper<LcCompareCodeDO>()
                            .lambda().eq(LcCompareCodeDO::getLocalGridId,gridDataDO.getId()));
                    if(oldCompareCodeDO != null){
                        lcCompareCodeMapper.updateLcCompareCode(gridDataDO.getId());
                    }

                    //关联市平台网格
                    LcCompareCodeDO compareCodeDO = lcCompareCodeMapper.selectById(eventGridDataDTO.getLcGridId());
                    if(compareCodeDO != null){
                        compareCodeDO.setLocalGridId(gridDataDO.getId().toString());
                        compareCodeDO.setGridName(gridDataDO.getGridName());
                        lcCompareCodeMapper.updateById(compareCodeDO);
                    }
                }

                return R.ok();
            }
        }

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberRelationServiceImpl.java

@@ -134,7 +134,30 @@
        if(memberCascadeAddDTO.getType() == null){
            return R.fail("参数错误");
        }
        return R.ok(this.baseMapper.getGridMemberCascade(memberCascadeAddDTO.getType(),memberCascadeAddDTO.getSuperiorId()));
        List<GridMemberCascadeVO> memberCascadeList = this.baseMapper.getGridMemberCascade(memberCascadeAddDTO.getType(),memberCascadeAddDTO.getSuperiorId());

        List<GridMemberCascadeVO> result = new ArrayList<>();
        if(!memberCascadeList.isEmpty()){
            memberCascadeList.forEach(cascade -> {
                if(memberCascadeAddDTO.getType().equals(1)){//过滤无小区的社区
                    Integer count = this.baseMapper.getVillageCount(cascade.getId());
                    if(count > 0){
                        result.add(cascade);
                    }
                }else if(memberCascadeAddDTO.getType().equals(2)){//过滤无楼栋的小区
                    Integer count = this.baseMapper.getBuildingCount(cascade.getId());
                    if(count > 0){
                        result.add(cascade);
                    }
                }else{
                    if(!cascade.getName().contains("栋")){
                        cascade.setName(cascade.getName() + "栋");
                    }
                    result.add(cascade);
                }
            });
        }
        return R.ok(result);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberWarnLogServiceImpl.java

@@ -179,7 +179,20 @@
                                eventGridMemberGpsLogMapper.updateById(memberGpsLog);
                                //修改用户工作状态
                                this.baseMapper.setUserWorkStatus(memberGpsLog.getGridMemberId(),workStatus);
                                break;
                            }else{
                                memberGpsLog.setPositionStation(EventGridMemberGpsLogDO.positionStation.abnormal);

                                //新增网格员预警信息
                                EventGridMemberWarnLogDO memberWarnLogDO = new EventGridMemberWarnLogDO();
                                BeanUtils.copyProperties(memberGpsLog,memberWarnLogDO);
                                memberWarnLogDO.setId(null);
                                memberWarnLogDO.setContent("工作时间未在网格内预警");
                                memberWarnLogDO.setHappenAt(memberGpsLog.getCreateAt());
                                this.baseMapper.insert(memberWarnLogDO);

                                eventGridMemberGpsLogMapper.updateById(memberGpsLog);
                                //修改用户工作状态
                                this.baseMapper.setUserWorkStatus(memberGpsLog.getGridMemberId(),2);
                            }
                        }
                    }

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java

@@ -121,9 +121,10 @@
                eventVO.setVideos(videoList);

                //查询网格员头像
                String imageUrl = eventMapper.getGridMemberImageUrl(eventVO.getGridMemberId());
                if (StringUtils.isNotEmpty(imageUrl)) {
                    eventVO.setGridMemberImageUrl(imageUrl);
                Map<String,String> userMap = eventMapper.getGridMemberImageUrl(eventVO.getGridMemberId());
                if (StringUtils.isNotEmpty(userMap)) {
                    eventVO.setGridMemberName(userMap.get("nick_name"));
                    eventVO.setGridMemberImageUrl(userMap.get("image_url"));
                }
            });
            return R.ok(ipage);
@@ -263,7 +264,7 @@
            }

            //当事件为特殊人群上报时，需要查询事件与人口关联关系
            if(eventDetailsVO.getEventType().equals(6)){
            if(eventDetailsVO.getEventType() != null && eventDetailsVO.getEventType().equals(6)){
                List<EventSpecialPopulationDetailsVO> specialPopulationList = eventSpecialCrowdRecordMapper.getSpecialPopulationIds(eventDetailsVO.getId());
                if(!specialPopulationList.isEmpty()){
                    specialPopulationList.forEach(special -> {
@@ -1264,9 +1265,10 @@
                eventVO.setPics(picList);
                eventVO.setVideos(videoList);
                //查询网格员头像
                String imageUrl = eventMapper.getGridMemberImageUrl(eventVO.getGridMemberId());
                if (StringUtils.isNotEmpty(imageUrl)) {
                    eventVO.setGridMemberImageUrl(imageUrl);
                Map<String,String> userMap = eventMapper.getGridMemberImageUrl(eventVO.getGridMemberId());
                if (StringUtils.isNotEmpty(userMap)) {
                    eventVO.setGridMemberName(userMap.get("nick_name"));
                    eventVO.setGridMemberImageUrl(userMap.get("image_url"));
                }
            });
            return R.ok(ipage);
@@ -1325,9 +1327,10 @@
                eventVO.setVideos(videoList);

                //查询网格员头像
                String imageUrl = eventMapper.getGridMemberImageUrl(eventVO.getGridMemberId());
                if (StringUtils.isNotEmpty(imageUrl)) {
                    eventVO.setGridMemberImageUrl(imageUrl);
                Map<String,String> userMap = eventMapper.getGridMemberImageUrl(eventVO.getGridMemberId());
                if (StringUtils.isNotEmpty(userMap)) {
                    eventVO.setGridMemberName(userMap.get("nick_name"));
                    eventVO.setGridMemberImageUrl(userMap.get("image_url"));
                }
            });
            return R.ok(ipage);
@@ -1936,6 +1939,16 @@
            statisticsDetailVO.setNoEventZFTotal(0);
        }

        //查询网格
        EventGridDataDO gridDataDO = eventGridDataMapper.selectById(statisticsDTO.getGridId());
        if(gridDataDO != null){
            Map<String,Long> sspCountMap = this.baseMapper.getSSPEventTotal(gridDataDO.getGridCommunityId());
            if(!sspCountMap.isEmpty()){
                statisticsDetailVO.setEventSSPTotal(sspCountMap.get("eventSSPTotal")!=null?sspCountMap.get("eventSSPTotal").intValue():0);
                statisticsDetailVO.setNoEventSSPTotal(sspCountMap.get("noEventSSPTotal")!=null?sspCountMap.get("noEventSSPTotal").intValue():0);
            }
        }

        //统计数据
        Integer sum = statisticsDetailVO.getEventTFTotal() + statisticsDetailVO.getEventMDTotal() + statisticsDetailVO.getEventZATotal()
                + statisticsDetailVO.getEventBWDTotal() + statisticsDetailVO.getEventTSTotal() + statisticsDetailVO.getEventGGTotal()

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java

@@ -231,6 +231,10 @@
        if(eventVisitingTasksDO!=null) {
            EventVisitingTasksDetailsVO eventVisitingTasksDetailsVO = new EventVisitingTasksDetailsVO();
            BeanUtils.copyProperties(eventVisitingTasksDO, eventVisitingTasksDetailsVO);
            if(StringUtils.isNotEmpty(eventVisitingTasksDO.getVisiterTele())){
                eventVisitingTasksDetailsVO.setVisiterPhone(AESUtil.decrypt128(eventVisitingTasksDO.getVisiterTele(),aesKey));
                eventVisitingTasksDetailsVO.setVisiterTele(AESUtil.decrypt128(eventVisitingTasksDO.getVisiterTele(),aesKey));
            }
            JSONObject jsonObject = JSONObject.parseObject(eventVisitingTasksDO.getTableContentJson());
            eventVisitingTasksDetailsVO.setTableContentJson(JSONObject.parseObject(eventVisitingTasksDO.getTableContentJson()));
            if(jsonObject != null && jsonObject.get("check") != null){
@@ -262,7 +266,7 @@
            if(StringUtils.isEmpty(idstr)){
                continue;
            }
            String error = addVisitingTask(Long.valueOf(idstr),communityId,userId);
            String error = addVisitingTask(Long.valueOf(idstr),idDTO.getGridId(),userId);
            if(!StringUtils.isEmpty(error)){
                rt.append(error);
            }
@@ -279,7 +283,7 @@
        return page.getRecords();
    }

    private String addVisitingTask(Long id, Long communityId,Long userId) throws Exception{
    private String addVisitingTask(Long id, Long gridId,Long userId) throws Exception{

        Map<String,Object> map = eventVisitingTasksMapper.findPopulationById(id);
        if(CollectionUtils.isEmpty(map)){
@@ -291,6 +295,7 @@
            return "被访问人["+map.get("name")+"]只能同时存在一条待走访任务;";
        }
        EventVisitingTasksDO visitingTasksDO = new EventVisitingTasksDO();
        visitingTasksDO.setGridId(gridId);
//        visitingTasksDO.setGridMemberStreet(Long.valueOf(gridMap.get("street_id").toString()));
//        visitingTasksDO.setGridMemberCommunity(communityId);
//        visitingTasksDO.setGridMember(Long.valueOf(gridMap.get("user_id").toString()));
@@ -403,7 +408,7 @@
        start.setGridMember(Long.valueOf(map.get("user_id").toString()));
        start.setGridMemberName(map.get("name").toString());
        start.setGridMenberTele(map.get("phone") ==null?"":map.get("phone").toString());
        start.setEventStatus(EventTasksStatusEnum.JXZ.getCode());
        start.setEventStatus(EventTasksStatusEnum.YJJ.getCode());
        int rt = eventVisitingTasksMapper.start(start);
        if(rt > 0){
            return R.ok();
@@ -431,11 +436,8 @@

        EventVisitingTasksDO complete = new EventVisitingTasksDO();
        BeanUtils.copyProperties(taskCompleteDTO,complete);
        if(taskCompleteDTO.getException() == 0){
            complete.setEventStatus(EventTasksStatusEnum.ZJJJ.getCode());
        }else{
            complete.setEventStatus(EventTasksStatusEnum.YC.getCode());
        }
        complete.setEventStatus(EventTasksStatusEnum.YJJ.getCode());

        complete.setSubmitDate(DateUtil.parse(taskCompleteDTO.getSubmitDate(), DatePattern.NORM_DATETIME_FORMAT));
        if(StringUtils.isNotEmpty(eventVisitingTasksDO.getTableContentJson())){
            JSONObject json = JSONObject.parseObject(eventVisitingTasksDO.getTableContentJson());
@@ -468,7 +470,7 @@
        complete.setGridMemberName(map.get("name").toString());
        complete.setGridMenberTele(map.get("phone") ==null?"":map.get("phone").toString());

        int rt = eventVisitingTasksMapper.complete(complete);
        int rt = eventVisitingTasksMapper.updateById(complete);
        if(rt > 0){
            return R.ok();
        }

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/LcCompareCodeServiceImpl.java

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

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_grid.dao.LcCompareCodeMapper;
import com.panzhihua.service_grid.dao.LcCompareMemberCodeMapper;
import com.panzhihua.service_grid.model.dos.LcCompareCodeDO;
@@ -51,4 +52,13 @@
        }
        return null;
    }

    /**
     * 综治后台-查询所有市平台网格列表
     * @return  市平台网格列表
     */
    @Override
    public R getLcGridLists(){
        return R.ok(this.baseMapper.getLcGridLists());
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventGridDataMapper.xml

@@ -44,6 +44,8 @@
        egd.data,
        egd.create_at,
        egd.create_by,
        (select lc_grid_name from lc_compare_code where local_grid_id = egd.id) as lcGirdName,
        (select local_grid_id from lc_compare_code where local_grid_id = egd.id) as lcGirdId,
        ca.`name` AS communityName
        FROM
        event_grid_data AS egd
@@ -273,8 +275,7 @@
        FROM
            event_visiting_tasks
        WHERE
            event_status = 1
            OR event_status = 3
            grid_id = #{eventGridTodoDataDTO.gridId} and (event_status = 1 OR event_status = 3)
    </select>

    <select id="getComActByActId" resultType="com.panzhihua.common.model.vos.grid.ComGridActVO">

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventGridMemberRelationMapper.xml

@@ -333,4 +333,12 @@
        </if>
    </select>

    <select id="getVillageCount" resultType="Integer">
        select count(village_id) from com_mng_village where community_id = #{communityId}
    </select>

    <select id="getBuildingCount" resultType="Integer">
        select count(id) from com_mng_building where village_id = #{villageId}
    </select>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMapper.xml

@@ -72,6 +72,9 @@
            <if test="pageEventDTO.eventDealStatus!=null">
                AND event_deal_status = #{pageEventDTO.eventDealStatus}
            </if>
            <if test="pageEventDTO.isAll!=null and pageEventDTO.isAll = 1">
                AND event_deal_status in (1,2,4)
            </if>
            <if test="pageEventDTO.revokeType!=null">
                AND ( revoke_type = #{pageEventDTO.revokeType} OR revoke_type is null )
            </if>
@@ -226,9 +229,7 @@
                AND update_at <![CDATA[<=]]> #{pageEventDTO.updateAtEnd}
           </if>
        </where>
        <if test="pageEventDTO.sortColumns!=null">
            ORDER BY ${pageEventDTO.sortColumns} ${pageEventDTO.sortType}
        </if>
        order by event_deal_status asc,create_at desc
    </select>
    <select id="findPublicityByPage" resultType="com.panzhihua.common.model.vos.grid.EventVO"
            parameterType="com.panzhihua.common.model.dtos.grid.PagePublicityEventDTO">
@@ -432,8 +433,8 @@
            AND grid_id = #{gridId}
    </select>

    <select id="getGridMemberImageUrl" resultType="String">
        select image_url from sys_user where user_id = #{gridMemberId}
    <select id="getGridMemberImageUrl" resultType="Map">
        select image_url,nick_name from sys_user where user_id = #{gridMemberId}
    </select>
    <select id="findToManageByPage" resultType="com.panzhihua.common.model.vos.grid.EventVO"
            parameterType="com.panzhihua.common.model.dtos.grid.PageEventManageDTO">
@@ -1269,4 +1270,15 @@
            AND egd.grid_community_id = #{communityId}
    </select>

    <select id="getSSPEventTotal" resultType="Map">
        SELECT
            count( id ) as noEventSSPTotal,
            ( SELECT count( id ) FROM com_act_easy_photo WHERE handle_status = 2 and del_tag = 0 AND community_id = #{communityId} ) AS eventSSPTotal
        FROM
            com_act_easy_photo
        WHERE
            handle_status = 1 and del_tag = 0
            AND community_id = #{communityId}
    </select>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventVisitingTasksMapper.xml

@@ -69,7 +69,7 @@
            and vt.event_status = #{query.status}
        </if>
        <if test="query.tag != null and query.tag != ''">
            p.label like concat('%',#{query.tag},'%')
            and p.label like concat(#{query.tag},'%')
        </if>
        <if test="query.isExp != null and query.isExp != ''">
            and vt.event_status = 7
@@ -83,25 +83,23 @@
        order by vt.id desc
    </select>

    <select id="appFindListByPage" parameterType="com.panzhihua.common.model.query.visit.EventTasksQuery" resultType="com.panzhihua.common.model.vos.visit.EventVisitingTasksVO">
        select vt.id,vt.create_at,vt.create_by,vt.visiter_id,vt.visiter_name,vt.visiter_tele,vt.visiter_sex,vt.visiter_address,vt.dell_user_id,vt.dell_user_name,vt.submit_date,vt.cancel_time,vt.event_status,
        TIMESTAMPDIFF(YEAR, p.birthday, CURDATE()) AS age,p.card_no_str,p.label,u.name as creator,p.nation_code
    <select id="appFindListByPage" parameterType="com.panzhihua.common.model.query.visit.EventTasksQuery"
            resultType="com.panzhihua.common.model.vos.visit.EventVisitingTasksVO">
        select vt.id,vt.create_at,vt.create_by,vt.visiter_id,vt.visiter_name,vt.visiter_tele,vt.visiter_sex
        ,vt.visiter_address,vt.dell_user_id,vt.dell_user_name,vt.submit_date,vt.cancel_time,vt.event_status,p.nation,p.political_outlook,
        TIMESTAMPDIFF(YEAR, p.birthday, CURDATE()) AS age,p.label,u.name as creator,p.nation_code,p.card_no as cardNoStr
        FROM event_visiting_tasks vt
        LEFT JOIN com_mng_population p ON p.id = vt.visiter_id
        LEFT JOIN com_mng_building mb ON(p.floor = mb.name AND p.village_id = mb.village_id)
        LEFT JOIN event_grid_building_relation gbr ON mb.id = gbr.build_id
        LEFT JOIN event_grid_data gd ON gd.id = gbr.grid_id
        LEFT JOIN event_grid_member_relation gmr ON gmr.grid_id = gd.id
        LEFT JOIN sys_user u ON u.user_id = gmr.grid_member_id
        LEFT JOIN sys_user u ON u.user_id = vt.create_by
        where 1=1
        <if test = "query.userId != null">
            and u.user_id = #{query.userId}
        <if test = "query.gridId != null">
            and vt.grid_id = #{query.gridId}
        </if>
        <if test = "query.status == 1">
            and (vt.event_status = 1 or vt.event_status = 6)
            and (vt.event_status = 1 or vt.event_status = 3)
        </if>
        <if test = "query.status == 2">
            and (vt.event_status = 3 or vt.event_status = 7)
            and vt.event_status = 2
        </if>
        <if test = "query.status == 0">
            and (vt.event_status = 1 or vt.event_status = 3 or vt.event_status = 6 or vt.event_status = 6)
@@ -124,6 +122,9 @@
        <if test = "query.exception != null">
            and vt.exception = #{query.exception}
        </if>
        <if test = "query.status != null and query.status == 2">
            and vt.event_status = 2
        </if>
        <if test = "query.eventStatus == 3 or query.eventStatus == 7">
            and vt.event_status = #{query.eventStatus}
        </if>

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

@@ -968,5 +968,14 @@
        return userService.noTips(userId);
    }

    /**
     * 查询社区的收益说明
     * @param communityId   社区id
     * @return  收益说明
     */
    @PostMapping("listagreements")
    public R listAgreements(@RequestParam("communityId") Long communityId) {
        return userService.listAgreements(communityId);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/EventGridMemberBuildingRelationMapper.java

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

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.common.model.vos.grid.admin.GridMemberBuildingVO;
import com.panzhihua.service_user.model.dos.EventGridMemberBuildingRelationDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * @auther lyq
@@ -12,4 +16,6 @@
@Mapper
public interface EventGridMemberBuildingRelationMapper extends BaseMapper<EventGridMemberBuildingRelationDO> {

    List<GridMemberBuildingVO> getGridMemberBuildingRelation(@Param("gridMemberId") Long gridMemberId);

}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java

@@ -23,14 +23,12 @@
import com.panzhihua.common.model.vos.user.UpdateUserArchivesVO;
import com.panzhihua.service_user.model.dos.SysUserDO;
import com.panzhihua.service_user.model.dtos.DataKanbanDTO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update;
import org.apache.ibatis.annotations.*;
import org.springframework.web.bind.annotation.RequestParam;

import java.util.Date;
import java.util.List;
import java.util.Map;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -412,7 +410,19 @@
            "</script>")
    void passResetUser(@Param("gridMemberDTO") EventGridMemberPassResetDTO gridMemberDTO);

//    @Update("update lc_compare_code_member set local_grid_member_id = #{userId},grid_member_name = #{userName} where id = #{lcMemberId}")
//    void addLcMember(@Param("lcMemberId") Long lcMemberId,@Param("userId") Long userId,@Param("userName") Long userName);
    @Update("update lc_compare_code_member set local_grid_member_id = #{userId},grid_member_name = #{userName} where id = #{lcMemberId}")
    void addLcMember(@Param("lcMemberId") Long lcMemberId,@Param("userId") Long userId,@Param("userName") String userName);

    @Update("update lc_compare_code_member set local_grid_member_id = null,grid_member_name = null where local_grid_member_id = #{gridMemberId}")
    void delLcMember(@Param("gridMemberId") Long gridMemberId);

    @Select("select id,village_id,act_id from com_mng_building where id = #{buildingId}")
    Map<String,Long> getBuilding(@Param("buildingId") Long buildingId);

    @Delete("delete from event_grid_member_building_relation where grid_member_id = #{gridMemberId}")
    void delGridMemberRelation(@Param("gridMemberId") Long gridMemberId);

    @Select("select id from lc_compare_code_member where local_grid_member_id = #{gridMemberId}")
    Long getLcMemberId(@Param("gridMemberId") Long gridMemberId);

}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java

@@ -460,4 +460,11 @@
    R gridMemberEditStatus(EventGridMemberEditStatusDTO gridMemberEditDTO);

    R noTips(Long userId);

    /**
     * 查询社区的收益说明
     * @param communityId   社区id
     * @return  收益说明
     */
    R listAgreements(Long communityId);
}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -17,6 +17,8 @@
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO;
import com.panzhihua.common.model.vos.grid.EventGridMemberRelationVO;
import com.panzhihua.common.model.vos.grid.GridMemberVO;
import com.panzhihua.common.model.vos.grid.admin.GridMemberBuildingVO;
import com.panzhihua.common.model.vos.partybuilding.ActivityManagerVO;
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
import com.panzhihua.common.model.vos.user.*;
@@ -28,6 +30,7 @@
import com.panzhihua.service_user.dao.*;
import com.panzhihua.service_user.model.dos.*;
import com.panzhihua.service_user.model.dtos.DataKanbanDTO;
import com.panzhihua.service_user.service.EventGridMemberBuildingRelationService;
import com.panzhihua.service_user.service.UserService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.time.DateFormatUtils;
@@ -81,6 +84,10 @@
    private SysMenuDAO sysMenuDAO;
    @Resource
    private SysUserInputDAO sysUserInputDAO;
    @Resource
    private EventGridMemberBuildingRelationService buildingRelationService;
    @Resource
    private EventGridMemberBuildingRelationMapper eventGridMemberBuildingRelationMapper;
//    @Resource
//    private GridService gridService;

@@ -1903,11 +1910,6 @@
        menuRoleVO.setRoleId(roleId);
        this.putMenuRole(menuRoleVO);

        //关联市平台网格员
//        if(eventGridMemberAddDTO.getLcMemberId() != null){
//
//        }

        //参数校验
        SysUserDO oldUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getType,6)
                .eq(SysUserDO::getNickName,eventGridMemberAddDTO.getNickName()));
@@ -1933,6 +1935,31 @@
            sysUserRoleDO.setUserId(sysUserDO.getUserId());
            sysUserRoleDO.setRoleId(roleId);
            sysUserRoleDAO.insert(sysUserRoleDO);

            //关联市平台网格员
            if(eventGridMemberAddDTO.getLcMemberId() != null){
                this.userDao.addLcMember(eventGridMemberAddDTO.getLcMemberId(),sysUserDO.getUserId(),sysUserDO.getNickName());
            }

            //网格员关联楼栋
            if(eventGridMemberAddDTO.getBuildingIds() != null && !eventGridMemberAddDTO.getBuildingIds().isEmpty()){
                List<EventGridMemberBuildingRelationDO> buildingRelationList = new ArrayList<>();
                eventGridMemberAddDTO.getBuildingIds().forEach(buildingId -> {
                    Map<String,Long> resultMap = this.userDao.getBuilding(buildingId);
                    if(resultMap != null){
                        EventGridMemberBuildingRelationDO buildingRelationDO = new EventGridMemberBuildingRelationDO();
                        buildingRelationDO.setBuildingId(buildingId);
                        buildingRelationDO.setGridMemberId(sysUserDO.getUserId());
                        buildingRelationDO.setVillageId(Long.parseLong(resultMap.get("village_id").toString()));
                        buildingRelationDO.setCommunityId(Long.parseLong(resultMap.get("act_id").toString()));
                        buildingRelationDO.setCreateAt(new Date());
                        buildingRelationList.add(buildingRelationDO);
                    }
                });
                if(!buildingRelationList.isEmpty()){
                    buildingRelationService.saveBatch(buildingRelationList);
                }
            }
        } catch (Exception e) {
            e.printStackTrace();
            log.error("新增后台用户报错【{}】", e.getMessage());
@@ -1956,7 +1983,26 @@
     */
    @Override
    public R getGridMemberList(PageEventGridMemberRelationDTO memberRelationDTO){
        return R.ok(userDao.getGridMemberList(new Page(memberRelationDTO.getPageNum(),memberRelationDTO.getPageSize()),memberRelationDTO));
        IPage<GridMemberVO> gridMemberPage = userDao.getGridMemberList(new Page(memberRelationDTO.getPageNum()
                ,memberRelationDTO.getPageSize()),memberRelationDTO);
        if(!gridMemberPage.getRecords().isEmpty()){
            gridMemberPage.getRecords().forEach(gridMember -> {
                //查询网格员关联市平台网格员id
                gridMember.setLcMemberId(this.userDao.getLcMemberId(gridMember.getUserId()));

                //查询网格员关联楼栋信息
                List<GridMemberBuildingVO> memberBuildingList = eventGridMemberBuildingRelationMapper.getGridMemberBuildingRelation(gridMember.getUserId());
                if(!memberBuildingList.isEmpty()){
                    memberBuildingList.forEach(memberBuilding -> {
                        if(!memberBuilding.getBuildingName().contains("栋")){
                            memberBuilding.setBuildingName(memberBuilding.getBuildingName() + "栋");
                        }
                    });
                    gridMember.setMemberBuildingList(memberBuildingList);
                }
            });
        }
        return R.ok(gridMemberPage);
    }

    /**
@@ -1965,6 +2011,7 @@
     * @return  修改结果
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R editGridUser(EventGridMemberEditAdminDTO gridMemberDTO){

        if(gridMemberDTO.getGridMemberId() == null){
@@ -1988,6 +2035,37 @@
        int insert = 0;
        try {
            insert = userDao.updateById(sysUserDO);

            //清除原本关联网格员信息
            this.userDao.delLcMember(sysUserDO.getUserId());
            //关联市平台网格员
            if(gridMemberDTO.getLcMemberId() != null){
                //关联现有的网格员信息
                this.userDao.addLcMember(gridMemberDTO.getLcMemberId(),sysUserDO.getUserId(),sysUserDO.getNickName());
            }
            //清除原网格员与楼栋关联关系
            this.userDao.delGridMemberRelation(sysUserDO.getUserId());

            //新增网格员关联楼栋
            if(gridMemberDTO.getBuildingIds() != null && !gridMemberDTO.getBuildingIds().isEmpty()){
                List<EventGridMemberBuildingRelationDO> buildingRelationList = new ArrayList<>();
                gridMemberDTO.getBuildingIds().forEach(buildingId -> {
                    Map<String,Long> resultMap = this.userDao.getBuilding(buildingId);
                    if(resultMap != null){
                        EventGridMemberBuildingRelationDO buildingRelationDO = new EventGridMemberBuildingRelationDO();
                        buildingRelationDO.setBuildingId(buildingId);
                        buildingRelationDO.setGridMemberId(sysUserDO.getUserId());
                        buildingRelationDO.setVillageId(Long.parseLong(resultMap.get("village_id").toString()));
                        buildingRelationDO.setCommunityId(Long.parseLong(resultMap.get("act_id").toString()));
                        buildingRelationDO.setCreateAt(new Date());
                        buildingRelationList.add(buildingRelationDO);
                    }
                });
                if(!buildingRelationList.isEmpty()){
                    buildingRelationService.saveBatch(buildingRelationList);
                }
            }

        } catch (Exception e) {
            e.printStackTrace();
            log.error("修改网格员用户报错【{}】", e.getMessage());
@@ -2044,6 +2122,7 @@
        return R.ok();
    }

    @Override
    public R noTips(Long userId){
        SysUserDO userDO = this.userDao.selectById(userId);
        if(userDO != null){
@@ -2054,4 +2133,33 @@
        }
        return R.fail();
    }

    /**
     * 查询社区的收益说明
     * @param communityId   社区id
     * @return  收益说明
     */
    @Override
    public R listAgreements(Long communityId){

        List<SysUserAgreementDO> sysUserAgreementDOS = sysUserAgreementDAO.selectList(new LambdaQueryWrapper<SysUserAgreementDO>()
                .eq(SysUserAgreementDO::getCommunityId,communityId).eq(SysUserAgreementDO::getType,5));
        if (sysUserAgreementDOS.isEmpty()) {
            SysUserAgreementDO agreementDO = new SysUserAgreementDO();
            agreementDO.setCommunityId(communityId);
            agreementDO.setName("收益说明");
            agreementDO.setType(5);
            agreementDO.setCreateAt(new Date());
            agreementDO.setContent(Constants.PROFIT_EXPLAIN);
            sysUserAgreementDAO.insert(agreementDO);
            sysUserAgreementDOS.add(agreementDO);
        }
        List<SysUserAgreementVO> sysUserAgreementVOS = new ArrayList<>();
        sysUserAgreementDOS.forEach(sysUserAgreementDO -> {
            SysUserAgreementVO sysUserAgreementVO = new SysUserAgreementVO();
            BeanUtils.copyProperties(sysUserAgreementDO, sysUserAgreementVO);
            sysUserAgreementVOS.add(sysUserAgreementVO);
        });
        return R.ok(sysUserAgreementVOS);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/EventGridMemberBuildingRelationDOMapper.xml

@@ -17,4 +17,21 @@
        id, grid_member_id, community_id, village_id, building_id, create_at
    </sql>

    <select id="getGridMemberBuildingRelation" resultType="com.panzhihua.common.model.vos.grid.admin.GridMemberBuildingVO">
        SELECT
            egmbr.community_id,
            ca.`name` as communityName,
            egmbr.village_id,
            cmv.`name` as villageName,
            egmbr.building_id,
            cmb.`name` as buildingName
        FROM
            event_grid_member_building_relation as egmbr
            left join com_act as ca on ca.community_id = egmbr.community_id
            left join com_mng_village as cmv on cmv.village_id = egmbr.village_id
            left join com_mng_building as cmb on cmb.id = egmbr.building_id
        WHERE
            egmbr.grid_member_id = #{gridMemberId}
    </select>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/java/com/panzhihua/timejob/jobhandler/EasyPhotoActivityJobHandler.java

New file
@@ -0,0 +1,26 @@
package com.panzhihua.timejob.jobhandler;

import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.service.community.CommunityService;
import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.handler.annotation.XxlJob;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

import javax.annotation.Resource;

@Slf4j
@Component
public class EasyPhotoActivityJobHandler {

    @Resource
    private CommunityService communityService;

    @XxlJob("timedTaskEasyPhotoActivityJobHandler")
    public ReturnT<String> timedTaskEasyPhotoActivityJobHandler(String param) throws Exception {
        log.info("定时任务扫描随手拍活动是否开始，激活状态");
        R r=communityService.timedTaskEasyPhotoActivity();
        log.info("执行结果【{}】",r.toString());
        return ReturnT.SUCCESS;
    }
}