金汇社区模块 办事指南 社区活动

lidongdong

2023-10-13 9b46a6f934d9ec7bacccae019bd21b25978174ad

金汇社区模块  办事指南   社区活动

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

@@ -3,9 +3,14 @@

import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.PageActWorkGuideDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActActRegistVO;
import com.panzhihua.common.model.vos.community.ComActActivityVO;
import com.panzhihua.common.model.vos.community.SignactivityVO;
import com.panzhihua.common.model.vos.jinhui.JinhuiCoinGeneralTableVO;
import com.panzhihua.common.model.vos.jinhui.JinhuiGoldCoinRecordVO;
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.jinhui.JinhuiCommunityService;
@@ -22,8 +27,8 @@

@Slf4j
@RestController
@RequestMapping("/JinHui/")
@Api(tags = {"金汇社区api"})
@RequestMapping("/jin_hui/")
@Api(tags = {"小程序-金汇社区api"})
public class JinHuiCommnuityApi  extends BaseController
{

@@ -49,13 +54,21 @@
    }


    @ApiOperation(value = "用户签到")
    @PostMapping("activitySignIn")
    public R jinhuiactivitySignIn(@RequestBody @Validated(AddGroup.class) ComActActRegistVO comActActRegistVO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        comActActRegistVO.setUserId(loginUserInfo.getUserId());
        return communityService.jinhuiActivitySignIn(comActActRegistVO);
    }

    @ApiOperation(value = "报名/取消报名社区活动")
    @PutMapping("signactivity")
    public R signActivity(@RequestBody @Validated(AddGroup.class) SignactivityVO signactivityVO) {
        Long userId = this.getUserId();
        Long activityId = signactivityVO.getActivityId();
        signactivityVO.setUserId(userId);
        R r = jinhuiCommunityService.signActivity(signactivityVO);
        R r = communityService.jinhuiSignActivity(signactivityVO);
        if (R.isOk(r) && signactivityVO.getType().intValue() == 1) {
            R r2 = communityService.detailActivity(activityId, userId, null, null);
            ComActActivityVO comActActivityVO =
@@ -82,5 +95,65 @@
    }


    @ApiOperation(value = "获取个人金汇币总币", response = JinhuiCoinGeneralTableVO.class)
    @GetMapping("goldCoin/getDetails" )
    public R coinTableGetDetails()
    {
        return jinhuiCommunityService.coinTableGetDetails( this.getUserId()+"");
    }


    @ApiOperation(value = "获取个人金汇币明细", response = JinhuiGoldCoinRecordVO.class)
    @GetMapping("/record/getList")
    public R recordGetList(@RequestParam("pageNum")  int pageNum,
                           @RequestParam("pageSize")  int pageSize)
    {
        return jinhuiCommunityService.recordGetList(pageNum,pageSize,this.getUserId()+"");
    }

    @ApiOperation(value = "获取个人金汇币明细详情", response = JinhuiGoldCoinRecordVO.class)
    @GetMapping("/jinhuiRecord/getDetails")
    public R recordGetDetails(@RequestParam("id") String id)
    {
        return jinhuiCommunityService.recordGetDetails(id);
    }

    @ApiOperation(value = "删除金汇币记录")
    @PostMapping("/record/expurgateData")
    public R recordExpurgateData(@RequestParam("id") String id)
    {
        return jinhuiCommunityService.recordExpurgateData(id);
    }



    /**
     * 办事指南_详情
     *
     * @param workGuideId
     * @return 详情
     */
    @ApiOperation(value = "办事指南_详情")
    @GetMapping("/detailworkguide")
    public R detailWorkGuide(@RequestParam("workGuideId") String workGuideId,
                             @RequestParam("communityId") String communityId)
    {
        return jinhuiCommunityService.detailWorkGuide(workGuideId,communityId);
    }

    /**
     * 办事指南_分页
     *
     * @param pageActWorkGuideDTO
     *            查询参数
     * @return 分页集合
     */
    @ApiOperation(value = "办事指南_分页")
    @PostMapping("/pageworkguide")
    public R pageWorkGuide(@RequestBody PageActWorkGuideDTO pageActWorkGuideDTO)
    {
        return jinhuiCommunityService.pageWorkGuide(pageActWorkGuideDTO);
    }


}

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

@@ -11823,6 +11823,27 @@



    /**
     * 报名/取消报名社区活动
     * 金汇社区专用
     * @param signactivityVO
     *            报名参数
     * @return 报名 取消报名 结果
     */
    @PostMapping("jinhuiSignActivity")
    public R jinhuiSignActivity(@RequestBody SignactivityVO signactivityVO);



    /**
     * 用户签到
     * 金汇社区专用
     * @param comActActRegistVO 签到参数
     * @return 签到结果
     */
    @PostMapping("jinhuiActivitySignIn")
    public R jinhuiActivitySignIn(@RequestBody ComActActRegistVO comActActRegistVO);



}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/jinhui/JinhuiCommunityService.java

@@ -1,22 +1,197 @@
package com.panzhihua.common.service.jinhui;

import com.panzhihua.common.model.dtos.community.ComActWorkGuideDTO;
import com.panzhihua.common.model.dtos.community.PageActWorkGuideDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActActRegistVO;
import com.panzhihua.common.model.vos.community.ComActWorkGuideClassifyVO;
import com.panzhihua.common.model.vos.community.SignactivityVO;
import io.swagger.annotations.ApiOperation;
import com.panzhihua.common.model.vos.jinhui.JinhuiCoinGeneralTableVO;
import com.panzhihua.common.model.vos.jinhui.JinhuiGoldCoinRecordVO;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;

/**
 * 川工之家
 * 金汇社区
 */
@FeignClient(name = "huacheng-jinhui-community")
public interface JinhuiCommunityService
{
    /****************************************************************************************************
     *
     *
     *                                   金汇币总币
     *
     *
     *****************************************************************************************************/

    @ApiOperation(value = "金汇社区报名/取消活动接口")
    @PostMapping("/jinhuiActivity/signActivity")
    public R signActivity(@RequestBody SignactivityVO signactivityVO);

    @GetMapping("/jinhuiCoinTable/getList")
    public R coinTableGetList(@RequestParam("pageNum")  int pageNum,
                              @RequestParam("pageSize")  int pageSize,
                              @RequestParam("type")   String type);

    @GetMapping("/jinhuiCoinTable/getDetails")
    public R coinTableGetDetails(@RequestParam("userId") String userId);
    /**
     * 新增
     * @param
     * @return
     */
    @PostMapping("/jinhuiCoinTable/addData")
    public R coinTableAddData(@RequestBody JinhuiCoinGeneralTableVO jinhuiGoldCoinRecordVO);

    @PostMapping("/jinhuiCoinTable/editData")
    public R coinTableEditData(@RequestBody JinhuiCoinGeneralTableVO jinhuiGoldCoinRecordVO);

    @PostMapping("/jinhuiCoinTable/expurgateData")
    public R coinTableExpurgateData(@RequestParam("id") String id);






    /****************************************************************************************************
     *
     *
     *                                   金汇币记录
     *
     *
     *****************************************************************************************************/

    @GetMapping("/jinhuiRecord/getList")
    public R recordGetList(@RequestParam("pageNum")  int pageNum,
                           @RequestParam("pageSize")  int pageSize,
                           @RequestParam("userId")   String userId);

    @GetMapping("/jinhuiRecord/getDetails")
    public R recordGetDetails(@RequestParam("id") String id);
    /**
     * 新增
     * @param
     * @return
     */
    @PostMapping("/jinhuiRecord/addData")
    public R recordAddData(@RequestBody JinhuiGoldCoinRecordVO jinhuiGoldCoinRecordVO);

    @PostMapping("/jinhuiRecord/editData")
    public R recordEditData(@RequestBody JinhuiGoldCoinRecordVO jinhuiGoldCoinRecordVO);

    @PostMapping("/jinhuiRecord/expurgateData")
    public R recordExpurgateData(@RequestParam("id") String id);



    /**
     * 办事指南_新增
     *
     * @param workGuideDTO
     *            新增信息
     * @return 新增结果
     */
    @PostMapping("/JinhuiWorkGuide/addworkguide")
    @Transactional(rollbackFor = Exception.class)
    public R addWorkGuide(@RequestBody ComActWorkGuideDTO workGuideDTO, @RequestParam("userId") Long userId);

    /**
     * 办事指南_编辑
     *
     * @param workGuideDTO
     * @return 编辑结果
     */
    @PostMapping("/JinhuiWorkGuide/editworkguide")
    @Transactional(rollbackFor = Exception.class)
    public R putWorkGuide(@RequestBody ComActWorkGuideDTO workGuideDTO, @RequestParam("userId") Long userId) ;

    /**
     * 办事指南_详情
     *
     * @param workGuideId
     * @return 详情
     */
    @GetMapping("/JinhuiWorkGuide/detailworkguide")
    public R detailWorkGuide(@RequestParam("workGuideId") String workGuideId,
                             @RequestParam("communityId") String communityId) ;

    /**
     * 办事指南_分页
     *
     * @param pageActWorkGuideDTO
     *            查询参数
     * @return 分页集合
     */
    @PostMapping("/JinhuiWorkGuide/pageworkguide")
    public R pageWorkGuide(@RequestBody PageActWorkGuideDTO pageActWorkGuideDTO) ;

    /**
     * 办事指南_删除
     *
     * @param workGuideId
     *            办事指南id
     * @return 删除结果
     */
    @PostMapping("/JinhuiWorkGuide/delectworkguide")
    R delectWorkGuide(@RequestParam("workGuideId") Long workGuideId) ;

    /**
     * 分页查询办事执念-分类管理 addWorkGuideClassify  分页查询办事执念-分类管理
     * @param    comActWorkGuideClassifyVO   查询参数
     * @return    R   返回结果
     * @author txb
     * @date 2021/8/31 15:03
     */
    @PostMapping("/JinhuiWorkGuide/workGuide/classify/apage")
    public R pageWorkGuideClassify(@RequestBody ComActWorkGuideClassifyVO comActWorkGuideClassifyVO) ;

    /**
     * 办事执念-分类管理新增或修改  addWorkGuideClassify  办事执念-分类管理新增或修改
     * @param    comActWorkGuideClassifyVO   新增或修改参数
     * @return    R   返回结果
     * @author txb
     * @date 2021/8/31 15:03
     */
    @PostMapping("/JinhuiWorkGuide/workGuide/classify/add")
    public R addWorkGuideClassify(@RequestBody ComActWorkGuideClassifyVO comActWorkGuideClassifyVO) ;

    /**
     * 办事执念-分类管理删除  addWorkGuideClassify  办事执念-分类管理删除
     * @param    workGuideClassifyId    办事执念-分类管理id
     * @return    R   返回结果
     * @author txb
     * @date 2021/8/31 15:03
     */
    @GetMapping("/JinhuiWorkGuide/workGuide/classify/delete")
    public R deleteWorkGuideClassify(@RequestParam("workGuideClassifyId") Long workGuideClassifyId) ;

    /**
     * 办事指南-分类管理列表查询  getWorkGuideClassifyList  办事指南-分类管理列表查询
     * @return    R   返回结果
     * @author txb
     * @date 2021/8/31 15:03
     */
    @GetMapping("/JinhuiWorkGuide/workGuide/classify/getList")
    public R getWorkGuideClassifyList(@RequestParam("areaCode")String areaCode) ;

    /**
     * 办事指南列表-按分类查询
     * @param pageActWorkGuideDTO   请求参数
     * @return  办事指南分类列表
     */
    @PostMapping("/JinhuiWorkGuide/listworkguide")
    public R listWorkGuide(@RequestBody PageActWorkGuideDTO pageActWorkGuideDTO) ;

    /**
     * 根据办事指南分类id查询办事指南列表
     * @param classifyId   办事指南分类id
     * @return  办事指南列表数据
     */
    @GetMapping("/JinhuiWorkGuide/listworkguide/classify")
    public R listWorkGuideByClassifyId(@RequestParam("classifyId") Long classifyId) ;




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

@@ -2824,4 +2824,34 @@
        return comActEasyPhotoService.selectStatisticsPhoto();
    }


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



    /**
     * 用户签到
     * 金汇社区专用
     * @param comActActRegistVO 签到参数
     * @return 签到结果
     */
    @PostMapping("jinhuiActivitySignIn")
    public R jinhuiActivitySignIn(@RequestBody ComActActRegistVO comActActRegistVO)
    {
        return comActActivityService.jinhuiActivitySignIn(comActActRegistVO);
    }



}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/JinhuiCoinGeneralTable.java

New file
@@ -0,0 +1,49 @@
package com.panzhihua.service_community.entity;


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

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

@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@ApiModel("金汇社区用户金汇币总表")
public class JinhuiCoinGeneralTable implements Serializable {
    private static final long serialVersionUID = -70884515430727555L;


    @ApiModelProperty(value = "主键")
    private String id;

    @ApiModelProperty(value = "用户id")
    private String userId;

    @ApiModelProperty(value = "金币总额")
    private String goldCoin="0";

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


    @ApiModelProperty(value = "更新时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date updateTime;

    @ApiModelProperty(value = "社区id")
    private String communityId;





}

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

@@ -337,4 +337,35 @@
     * @return
     */
    R pageActivityBigScreen(PageBaseDTO pageBaseDTO);





    /**
     * 报名/取消报名社区活动
     * 金汇社区专用
     * @param signactivityVO
     *            报名参数
     * @return 报名 取消报名 结果
     */
    R jinhuiSignActivity(SignactivityVO signactivityVO);



    /**
     * 用户签到
     * 金汇社区专用
     * @param comActActRegistVO 签到参数
     * @return 签到结果
     */
    R jinhuiActivitySignIn(ComActActRegistVO comActActRegistVO);








}

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

@@ -24,6 +24,7 @@
import com.panzhihua.common.constants.HttpStatus;
import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.dtos.community.ActivityInviteDTO;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.dao.ComActNeighborCircleDAO;
import com.panzhihua.service_community.dao.ComActNeighborCircleTopicWestMapper;
import com.panzhihua.service_community.dao.ComPbMemberDAO;
@@ -1310,4 +1311,287 @@
    public R pageActivityBigScreen(PageBaseDTO pageBaseDTO) {
        return R.ok(comActActivityDAO.pageActivityBigScreen(new Page<>(pageBaseDTO.getPageNum(),pageBaseDTO.getPageSize())));
    }

    @Override
    public R jinhuiSignActivity(SignactivityVO signactivityVO) {
        Long activityId = signactivityVO.getActivityId();
        Integer type = signactivityVO.getType();
        Long userId = signactivityVO.getUserId();
        Integer isVolunteer = 0;
        // 查询社区活动
        ComActActivityDO actActivityDO = this.baseMapper.selectById(activityId);
        if (isNull(actActivityDO)) {
            return R.fail("活动不存在");
        }
        if(actActivityDO.getSignUpBegin().after(new Date())){
            return R.fail("未到报名时间");
        }
        int num = 0;
        ComActActSignDO comActActSignDO = comActActSignDAO.selectOne(new QueryWrapper<ComActActSignDO>()
                .lambda().eq(ComActActSignDO::getActivityId, activityId).eq(ComActActSignDO::getUserId, userId));
        Integer signIdentity = signactivityVO.getSignIdentity();
        if (1 == type) {
            if (nonNull(comActActSignDO) && comActActSignDO.getStatus().equals(1)) {
                return R.fail("已经报名过了，请勿重复提交");
            }
            Integer activityType = actActivityDO.getType();
            Boolean isInvite = false;
            if (activityType == 1) {
                if (signIdentity == 1) {
                    //以居民身份参与活动
                    Integer residentMax = actActivityDO.getParticipantMax();
                    if (residentMax == null) {
                        return R.fail("活动暂未对居民开放");
                    }
                    // 查询当前活动下参与居民
                    Integer residentCount = comActActSignDAO.selectCount(new QueryWrapper<ComActActSignDO>().lambda()
                            .eq(ComActActSignDO::getActivityId, activityId).eq(ComActActSignDO::getSignIdentity, 1).eq(ComActActSignDO::getStatus, 1));
                    if (residentMax != -1 && residentMax <= residentCount) {
                        return R.fail("报名人数已满");
                    }
                } else if (signIdentity == 2) {
                    //以党员身份参与活动
                    Integer partyMemberMax = actActivityDO.getPartyMemberMax();
                    if (partyMemberMax == null) {
                        return R.fail("活动暂未对党员开放");
                    }
                    ComActActivityInvite activityInvite = comActActivityInviteService.getBaseMapper().selectOne(new LambdaQueryWrapper<ComActActivityInvite>()
                            .eq(ComActActivityInvite::getActivityId, activityId).eq(ComActActivityInvite::getUserId, userId));
                    if (isNull(activityInvite)) {
                        int count = pbMemberDAO.checkIsPbMember(userId);
                        if (count < 1) {
                            return R.fail(HttpStatus.NOT_ACCEPTABLE, "您还不是党员");
                        }
                        // 查询当前活动下参与志愿者
                        Integer partyMemberCount = comActActSignDAO.selectCount(new QueryWrapper<ComActActSignDO>().lambda()
                                .eq(ComActActSignDO::getActivityId, activityId).eq(ComActActSignDO::getSignIdentity, 2)
                                .eq(ComActActSignDO::getStatus, 1).eq(ComActActSignDO::getIsInvite, false));
                        if (partyMemberMax != -1 && partyMemberMax <= partyMemberCount) {
                            return R.fail("报名人数已满");
                        }
                    } else {
                        isInvite = true;
                    }
                } else {
                    //以志愿者身份参与活动
                    Integer volunteerMax = actActivityDO.getVolunteerMax();
                    if (volunteerMax == null) {
                        return R.fail("活动暂未对志愿者开放");
                    }
                    int count = pbMemberDAO.checkIsVolunteer(userId);
                    if (count < 1) {
                        return R.fail(HttpStatus.NOT_ACCEPTABLE, "您还不是志愿者");
                    }
                    // 查询当前活动下参与志愿者
                    Integer volunteerCount = comActActSignDAO.selectCount(new QueryWrapper<ComActActSignDO>().lambda()
                            .eq(ComActActSignDO::getActivityId, activityId).eq(ComActActSignDO::getSignIdentity, 3).eq(ComActActSignDO::getStatus, 1));
                    if (volunteerMax != -1 && volunteerMax <= volunteerCount) {
                        return R.fail("报名人数已满");
                    }
                }
            }
            if (nonNull(comActActSignDO)) {
                comActActSignDO.setStatus(1);
                comActActSignDO.setCreateAt(new Date());
                comActActSignDO.setReason(null);
                comActActSignDO.setSignIdentity(signIdentity);
                comActActSignDO.setTimes(comActActSignDO.getTimes()+1);
                comActActSignDO.setIsInvite(isInvite);
                comActActSignDO.setCheckUnitId(signactivityVO.getCheckUnitId());
                num = comActActSignDAO.updateById(comActActSignDO);
            } else {
                comActActSignDO = new ComActActSignDO();
                comActActSignDO.setActivityId(activityId);
                comActActSignDO.setUserId(userId);
                comActActSignDO.setSignIdentity(signIdentity);
                comActActSignDO.setTimes(1);
                comActActSignDO.setIsInvite(isInvite);
                comActActSignDO.setCheckUnitId(signactivityVO.getCheckUnitId());
                num = comActActSignDAO.insert(comActActSignDO);
            }
        } else {
            Integer regTimes = comActActRegistDAO.selectCount(new QueryWrapper<ComActActRegistDO>().lambda()
                    .eq(ComActActRegistDO::getActivityId, activityId).eq(ComActActRegistDO::getUserId, userId).eq(ComActActRegistDO::getType, 1));
            Integer canCancel = actActivityDO.getCanCancel();
            if (nonNull(canCancel) && canCancel.equals(2)) {
                return R.fail("该活动暂不支持取消");
            }
            if (regTimes > 0) {
                return R.fail("您已参与活动，不可取消");
            }
            if (isNull(signactivityVO.getReason())) {
                return R.fail("缺少取消原因");
            }
            if (isNull(comActActSignDO)) {
                return R.fail("未报名");
            }
            comActActSignDO.setStatus(0);
            comActActSignDO.setReason(signactivityVO.getReason());
            num = comActActSignDAO.updateById(comActActSignDO);
            //计算用户金汇币
            if (num > 0)
            {
                if(!StringUtils.isEmpty(actActivityDO.getJinhuiCoinPunishment()) && !StringUtils.equals(actActivityDO.getJinhuiCoinPunishment(),"0"))
                {
                    //查询个人金汇币总额
//                    R<JinhuiCoinGeneralTable>  jinhuiCoinGeneralTable=jinhuiCommunityService.coinTableGetDetails(userId+"");
//                    if(jinhuiCoinGeneralTable!=null)
//                    {
//                        if (!StringUtils.isEmpty(jinhuiCoinGeneralTable.getData().getGoldCoin()))
//                        {
//                            JinhuiCoinGeneralTableVO jinhuiVO=new JinhuiCoinGeneralTableVO();
//                            jinhuiVO.setId(jinhuiCoinGeneralTable.getData().getId());
//
//                            int punishmentGold=Integer.valueOf(actActivityDO.getJinhuiCoinPunishment());
//                            int allGold=Integer.valueOf(jinhuiCoinGeneralTable.getData().getGoldCoin());
//                            if(punishmentGold>=allGold)
//                            {
//                                jinhuiVO.setGoldCoin("0");
//                            }
//                            else
//                            {
//                                allGold=allGold-punishmentGold;
//                                jinhuiVO.setGoldCoin(allGold+"");
//                            }
//                            jinhuiCommunityService.coinTableEditData(jinhuiVO);
//                        }
//                    }

//                    JinhuiGoldCoinRecordVO jVo=new JinhuiGoldCoinRecordVO();
//                    jVo.setCommunityId(actActivityDO.getCommunityId()+"");
//                    jVo.setTitle("取消志愿者活动");
//                    jVo.setUserId(userId+"");
//                    jVo.setRemark("取消志愿者活动");
//                    jVo.setType("2");
//                    jVo.setGoldCoin(actActivityDO.getJinhuiCoinPunishment());
//                    jinhuiCommunityService.recordAddData(jVo);


                }
            }
        }
        if (num > 0) {
            return R.ok(isVolunteer);
        }
        return R.fail();
    }

    @Override
    public R jinhuiActivitySignIn(ComActActRegistVO comActActRegistVO) {
        Long activityId = comActActRegistVO.getActivityId();
        Long userId = comActActRegistVO.getUserId();
        if (isNull(activityId)) {
            return R.fail("签到所属活动id不能为空！");
        }
        ComActActivityDO comActActivityDO = comActActivityDAO.selectById(activityId);
        if (isNull(comActActivityDO)) {
            return R.fail("活动不存在！");
        }

        ComActActSignDO comActActSignDO = comActActSignDAO
                .selectOne(new QueryWrapper<ComActActSignDO>().lambda().eq(ComActActSignDO::getActivityId, activityId)
                        .eq(ComActActSignDO::getUserId, userId).eq(ComActActSignDO::getStatus, 1));
        if (isNull(comActActSignDO)) {
            return R.fail("活动未报名");
        }

        Date beginAt = comActActivityDO.getBeginAt();
        Date endAt = comActActivityDO.getEndAt();
        Date nowDate = new Date();
        if (nowDate.before(beginAt) || nowDate.after(endAt)) {
            return R.fail("不在活动时间范围内");
        }
        //奖励的金汇币
        Integer rewardIntegral = Integer.valueOf(comActActivityDO.getJinhuiCoinAward());
        boolean isHave = rewardIntegral > 0;
        ComActActRegistDO comActActRegistDO = new ComActActRegistDO();
        if (comActActRegistVO.getSignType() != null && comActActRegistVO.getSignType() == 2) {
            ComActActRegistDO comActActActRegistDO = comActActRegistDAO.selectOne(new QueryWrapper<ComActActRegistDO>()
                    .lambda().eq(ComActActRegistDO::getActivityId, activityId).eq(ComActActRegistDO::getUserId, userId)
                    .eq(ComActActRegistDO::getCodeId, comActActRegistVO.getCodeId()));
            if (comActActActRegistDO == null) {
                return R.fail("未签到无法签退");
            }
            if (comActActActRegistDO.getEndTime() != null) {
                return R.fail("无法重复签退");
            }
            int retrieveIntegral = 0;
            comActActRegistDO.setId(comActActActRegistDO.getId());
            comActActRegistDO.setEndTime(nowDate);
            comActActRegistDO.setAward(retrieveIntegral);
            int result = comActActRegistDAO.updateById(comActActRegistDO);
            if (result > 0) {
                if (isHave) {
//                    AddComActIntegralUserDTO addComActIntegralUserDTO = new AddComActIntegralUserDTO();
//                    addComActIntegralUserDTO.setUserId(userId);
//                    addComActIntegralUserDTO.setIntegralType(integralType);
//                    addComActIntegralUserDTO.setIntegral(retrieveIntegral);
//                    addComActIntegralUserDTO.setSignIdentity(comActActSignDO.getSignIdentity());
//                    addComActIntegralUserDTO.setCommunityId(comActActivityDO.getCommunityId());
//                    addComActIntegralUserDTO.setServiceId(activityId);
//                    addComActIntegralUserDTO.setRemark(remark);
//                    comActIntegralUserTradeService.addIntegralTradeAdmin(addComActIntegralUserDTO);

                    //查询个人金汇币总额
//                    R<JinhuiCoinGeneralTable> jinhuiCoinGeneralTable=jinhuiCommunityService.coinTableGetDetails(userId+"");
//                    if(jinhuiCoinGeneralTable!=null)
//                    {
//                        if (!StringUtils.isEmpty(jinhuiCoinGeneralTable.getData().getGoldCoin()))
//                        {
//                            JinhuiCoinGeneralTableVO jinhuiVO=new JinhuiCoinGeneralTableVO();
//                            jinhuiVO.setId(jinhuiCoinGeneralTable.getData().getId());
//
//                            int allGold=Integer.valueOf(jinhuiCoinGeneralTable.getData().getGoldCoin());
//                            allGold=allGold+rewardIntegral;
//                            jinhuiVO.setGoldCoin(allGold+"");
//                            jinhuiCommunityService.coinTableEditData(jinhuiVO);
//                        }
//                    }
//
//                    JinhuiGoldCoinRecordVO jVo=new JinhuiGoldCoinRecordVO();
//                    jVo.setCommunityId(comActActivityDO.getCommunityId()+"");
//                    jVo.setTitle("志愿者活动奖励");
//                    jVo.setUserId(userId+"");
//                    jVo.setRemark("志愿者活动奖励");
//                    jVo.setType("1");
//                    jVo.setGoldCoin(rewardIntegral+"");
//                    jinhuiCommunityService.recordAddData(jVo);
                    return R.ok();
                } else {
                    return R.ok();
                }
            }
        } else {
            int signDayCount = comActActRegistDAO.selectCount(new QueryWrapper<ComActActRegistDO>().lambda()
                    .eq(ComActActRegistDO::getActivityId, activityId).eq(ComActActRegistDO::getUserId, userId)
                    .eq(ComActActRegistDO::getCodeId, comActActRegistVO.getCodeId()));
            int signAllCount = comActActRegistDAO.selectCount(new QueryWrapper<ComActActRegistDO>().lambda()
                    .eq(ComActActRegistDO::getActivityId, activityId).eq(ComActActRegistDO::getUserId, userId));
            if (signDayCount > 0) {
                return R.fail("请扫描新的签到码");
            }
            if (isHave) {
                int limit = comActActivityDO.getLimit().intValue();
                if (limit != -1 && signAllCount >= limit) {
                    return R.fail("签到次数上限");
                }
            }
            comActActRegistDO.setActivityId(activityId);
            comActActRegistDO.setStartTime(new Date());
            comActActRegistDO.setType(comActActivityDO.getType());
            comActActRegistDO.setUserId(userId);
            comActActRegistDO.setSignIdentity(comActActSignDO.getSignIdentity());
            comActActRegistDO.setCreateAt(nowDate);
            comActActRegistDO.setCodeId(comActActRegistVO.getCodeId());
            comActActRegistDO.setAward(0);
            comActActRegistDO.setPosition(comActActRegistVO.getPosition());
            comActActRegistDO.setCheckUnitId(comActActSignDO.getCheckUnitId());
            comActActRegistDO.setTimes(signAllCount + 1);
            int result = comActActRegistDAO.insert(comActActRegistDO);
            if (result > 0) {
                return R.ok();
            }
        }
        return R.fail("网络错误，请重试");
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/pom.xml

@@ -116,12 +116,6 @@
            <artifactId>javase</artifactId>
            <version>3.3.3</version>
        </dependency>
        <dependency>
            <groupId>com.panzhihua</groupId>
            <artifactId>service_community</artifactId>
            <version>0.0.1-SNAPSHOT</version>
            <scope>compile</scope>
        </dependency>
    </dependencies>



 springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/api/JinhuiWorkGuideApi.java

New file
@@ -0,0 +1,157 @@
package com.panzhihua.service_jinhui_community.api;

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.ComActWorkGuideDTO;
import com.panzhihua.common.model.dtos.community.PageActWorkGuideDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActWorkGuideClassifyVO;
import com.panzhihua.service_jinhui_community.service.JinhuiComActWorkGuideClassifyService;
import com.panzhihua.service_jinhui_community.service.JinhuiComActWorkGuideService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

/**
 * @auther llming
 * @describe 办事指南
 */
@Slf4j
@RestController
@RequestMapping("/JinhuiWorkGuide/")
public class JinhuiWorkGuideApi extends BaseController {
    @Resource
    private JinhuiComActWorkGuideService workGuideService;
    @Resource
    private JinhuiComActWorkGuideClassifyService comActWorkGuideClassifyService;

    /**
     * 办事指南_新增
     * 
     * @param workGuideDTO
     *            新增信息
     * @return 新增结果
     */
    @PostMapping("addworkguide")
    @Transactional(rollbackFor = Exception.class)
    public R addWorkGuide(@RequestBody ComActWorkGuideDTO workGuideDTO, @RequestParam("userId") Long userId) {
        return workGuideService.addWorkGuide(workGuideDTO, userId);
    }

    /**
     * 办事指南_编辑
     * 
     * @param workGuideDTO
     * @return 编辑结果
     */
    @PostMapping("editworkguide")
    @Transactional(rollbackFor = Exception.class)
    public R putWorkGuide(@RequestBody ComActWorkGuideDTO workGuideDTO, @RequestParam("userId") Long userId) {
        return workGuideService.editWorkGuide(workGuideDTO, userId);
    }

    /**
     * 办事指南_详情
     * 
     * @param workGuideId
     * @return 详情
     */
    @GetMapping("detailworkguide")
    public R detailWorkGuide(@RequestParam("workGuideId") String workGuideId,
        @RequestParam("communityId") String communityId) {
        return workGuideService.detailWorkGuide(workGuideId, communityId);
    }

    /**
     * 办事指南_分页
     * 
     * @param pageActWorkGuideDTO
     *            查询参数
     * @return 分页集合
     */
    @PostMapping("pageworkguide")
    public R pageWorkGuide(@RequestBody PageActWorkGuideDTO pageActWorkGuideDTO) {
        return workGuideService.pageWorkGuide(pageActWorkGuideDTO);
    }

    /**
     * 办事指南_删除
     * 
     * @param workGuideId
     *            办事指南id
     * @return 删除结果
     */
    @PostMapping("delectworkguide")
    R delectWorkGuide(@RequestParam("workGuideId") Long workGuideId) {
        return workGuideService.delectWorkGuide(workGuideId);
    }

    /**
     * 分页查询办事执念-分类管理 addWorkGuideClassify  分页查询办事执念-分类管理
     * @param    comActWorkGuideClassifyVO   查询参数
     * @return    R   返回结果
     * @author txb
     * @date 2021/8/31 15:03
     */
    @PostMapping("workGuide/classify/apage")
    public R pageWorkGuideClassify(@RequestBody ComActWorkGuideClassifyVO comActWorkGuideClassifyVO) {
        return comActWorkGuideClassifyService.pageWorkGuideClassify(comActWorkGuideClassifyVO);
    }

    /**
     * 办事执念-分类管理新增或修改  addWorkGuideClassify  办事执念-分类管理新增或修改
     * @param    comActWorkGuideClassifyVO   新增或修改参数
     * @return    R   返回结果
     * @author txb
     * @date 2021/8/31 15:03
     */
    @PostMapping("workGuide/classify/add")
    public R addWorkGuideClassify(@RequestBody ComActWorkGuideClassifyVO comActWorkGuideClassifyVO) {
        return comActWorkGuideClassifyService.addWorkGuideClassify(comActWorkGuideClassifyVO);
    }

    /**
     * 办事执念-分类管理删除  addWorkGuideClassify  办事执念-分类管理删除
     * @param    workGuideClassifyId    办事执念-分类管理id
     * @return    R   返回结果
     * @author txb
     * @date 2021/8/31 15:03
     */
    @GetMapping("workGuide/classify/delete")
    public R deleteWorkGuideClassify(@RequestParam("workGuideClassifyId") Long workGuideClassifyId) {
        return comActWorkGuideClassifyService.deleteWorkGuideClassify(workGuideClassifyId);
    }

    /**
     * 办事指南-分类管理列表查询  getWorkGuideClassifyList  办事指南-分类管理列表查询
     * @return    R   返回结果
     * @author txb
     * @date 2021/8/31 15:03
     */
    @GetMapping("workGuide/classify/getList")
    public R getWorkGuideClassifyList(@RequestParam("areaCode")String areaCode) {
        return comActWorkGuideClassifyService.getWorkGuideClassifyList(areaCode);
    }

    /**
     * 办事指南列表-按分类查询
     * @param pageActWorkGuideDTO   请求参数
     * @return  办事指南分类列表
     */
    @PostMapping("listworkguide")
    public R listWorkGuide(@RequestBody PageActWorkGuideDTO pageActWorkGuideDTO) {
        return workGuideService.listWorkGuide(pageActWorkGuideDTO);
    }

    /**
     * 根据办事指南分类id查询办事指南列表
     * @param classifyId   办事指南分类id
     * @return  办事指南列表数据
     */
    @GetMapping("listworkguide/classify")
    public R listWorkGuideByClassifyId(@RequestParam("classifyId") Long classifyId) {
        return workGuideService.listWorkGuideByClassifyId(classifyId);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/api/jinhuiActivityApi.java

File was deleted

 springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/api/jinhuiCoinTableApi.java

New file
@@ -0,0 +1,75 @@
package com.panzhihua.service_jinhui_community.api;

import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.jinhui.JinhuiCoinGeneralTableVO;
import com.panzhihua.common.model.vos.jinhui.JinhuiGoldCoinRecordVO;
import com.panzhihua.service_jinhui_community.service.JinhuiCoinGeneralTableService;
import com.panzhihua.service_jinhui_community.service.JinhuiGoldCoinRecordService;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;


/**
 * @auther llming
 * @describe 金汇币明细
 */
@Slf4j
@RestController
@RequestMapping("/jinhuiCoinTable")
public class jinhuiCoinTableApi
{

    @Resource
    private JinhuiCoinGeneralTableService recordService;


    @ApiOperation(value = "金汇币总币")
    @GetMapping("/getList")
    public R coinTableGetList(@RequestParam("pageNum")  int pageNum,
                   @RequestParam("pageSize")  int pageSize,
                   @RequestParam("type")   String type)
    {
        return recordService.getList(pageNum,pageSize,type);
    }

    @ApiOperation(value = "金汇币总币单个详情")
    @GetMapping("/getDetails")
    public R coinTableGetDetails(@RequestParam("userId") String userId)
    {
        return R.ok(recordService.getDetails(userId));
    }
    /**
     * 新增
     * @param
     * @return
     */
    @ApiOperation(value = "金汇币总币添加")
    @PostMapping("/addData")
    public R coinTableAddData(@RequestBody JinhuiCoinGeneralTableVO jinhuiGoldCoinRecordVO)
    {
        return recordService.addData(jinhuiGoldCoinRecordVO);
    }

    @ApiOperation(value = "金汇币总币编辑")
    @PostMapping("/editData")
    public R coinTableEditData(@RequestBody JinhuiCoinGeneralTableVO jinhuiGoldCoinRecordVO)
    {
        return recordService.editData(jinhuiGoldCoinRecordVO);
    }

    @ApiOperation(value = "金汇币总币删除")
    @PostMapping("/expurgateData")
    public R coinTableExpurgateData(@RequestParam("id") String id)
    {
        return recordService.expurgateData(id);
    }






}

 springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/api/jinhuiRecordApi.java

New file
@@ -0,0 +1,73 @@
package com.panzhihua.service_jinhui_community.api;

import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.jinhui.JinhuiGoldCoinRecordVO;
import com.panzhihua.service_jinhui_community.service.JinhuiGoldCoinRecordService;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;


/**
 * @auther llming
 * @describe 金汇币明细
 */
@Slf4j
@RestController
@RequestMapping("/jinhuiRecord")
public class jinhuiRecordApi
{

    @Resource
    private JinhuiGoldCoinRecordService recordService;


    @ApiOperation(value = "金汇币记录明细")
    @GetMapping("/getList")
    public R recordGetList(@RequestParam("pageNum")  int pageNum,
                           @RequestParam("pageSize")  int pageSize,
                           @RequestParam("userId")   String userId)
    {
        return recordService.getList(pageNum,pageSize,userId);
    }

    @ApiOperation(value = "金汇币记录单个详情")
    @GetMapping("/getDetails")
    public R recordGetDetails(@RequestParam("id") String id)
    {
        return R.ok(recordService.getDetails(id));
    }
    /**
     * 新增
     * @param
     * @return
     */
    @ApiOperation(value = "金汇币记录单个详情")
    @PostMapping("/addData")
    public R recordAddData(@RequestBody JinhuiGoldCoinRecordVO jinhuiGoldCoinRecordVO)
    {
        return recordService.addData(jinhuiGoldCoinRecordVO);
    }

    @ApiOperation(value = "金汇币记录单个详情")
    @PostMapping("/editData")
    public R recordEditData(@RequestBody JinhuiGoldCoinRecordVO jinhuiGoldCoinRecordVO)
    {
        return recordService.editData(jinhuiGoldCoinRecordVO);
    }

    @ApiOperation(value = "金汇币记录单个详情")
    @PostMapping("/expurgateData")
    public R recordExpurgateData(@RequestParam("id") String id)
    {
        return recordService.expurgateData(id);
    }






}

 springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/config/MyMetaObjectHandler.java

File was deleted

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

New file
@@ -0,0 +1,177 @@
package com.panzhihua.service_jinhui_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.PageComActDTO;
import com.panzhihua.common.model.dtos.community.switchs.SearchCommunityDTO;
import com.panzhihua.common.model.vos.community.ComActPasswordVo;
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.community.ComPopulationActVO;
import com.panzhihua.common.model.vos.community.switchs.CommunitySwitchAllAppletsVO;
import com.panzhihua.common.model.vos.community.switchs.StreetAllAppletsVO;
import com.panzhihua.common.model.vos.grid.EventGridCommunityAdminVO;
import com.panzhihua.service_jinhui_community.model.dos.ComActDO;
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: springcloud_k8s_panzhihuazhihuishequ
 * @description: 社区
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-07 14:13
 **/
@Mapper
public interface ComActDAO extends BaseMapper<ComActDO> {
    // @Select("<script> " +
    // " <where>" +
    // "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
    // " </if> " +
    // "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
    // " </if> " +
    // "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
    // " </if> " +
    // " </where>" +
    // "</script>")

    @Select("<script> " + "SELECT\n" + "c.community_id,\n" + "c.`name`,\n"
        + "ST_Distance_Sphere ( Point ( #{lng}, #{lat} ), Point ( c.lng, c.lat ) ) AS distance \n" + "FROM\n"
        + "com_act c \n" + " <where>" + "<if test='areaCode != null and areaCode.trim() != &quot;&quot;'>"
        + "c.area_code = #{areaCode} \n" + " </if> " + " </where>" + "ORDER BY\n" + "distance ASC"
        + "<if test='lng != null and lng.trim() != &quot;&quot;'>" + " limit 100 " + " </if> " + "</script>")
    List<ComActVO> listCommunity(ComActVO comActVO);

    @Select("select district_name from com_mng_struct_area_district where district_adcode=#{areaCode}")
    String selectAreaName(String areaCode);

    @Select("<script> " + "SELECT\n" + "a.* \n" + "FROM\n" + "com_act a \n" + " <where>"
        + "<if test='pageComActDTO.name != null and pageComActDTO.name.trim() != &quot;&quot;'>"
        + "and a.name LIKE concat( #{pageComActDTO.name}, '%' ) \n" + " </if> "
        + "<if test='pageComActDTO.areaCode != null and pageComActDTO.areaCode.trim() != &quot;&quot;'>"
        + "AND a.area_code = #{pageComActDTO.areaCode} \n" + " </if> "
        + "<if test='pageComActDTO.createAtBegin != null '>"
            + "AND a.create_at BETWEEN "
        + "#{pageComActDTO.createAtBegin} \n" + "AND #{pageComActDTO.createAtEnd}" + " </if> " + " </where>"
        + " order by a.create_at desc" + "</script>")
    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`,lng,lat from com_act where state = 0 and app_id =#{appId}")
    List<EventGridCommunityAdminVO> getCommunityLists(@Param("appId") String appId);

    @Select("select ca.`name`,cmsap.province_name,cmsac.city_name,cmsad.district_name,ca.street_id,ca.community_id,cs.`name` as streetName from com_act as ca \n"
        + "left join com_mng_struct_area_province as cmsap on cmsap.province_adcode = ca.province_code\n"
        + "left join com_mng_struct_area_city as cmsac on cmsac.city_adcode = ca.city_code\n"
        + "left join com_mng_struct_area_district as cmsad on cmsad.district_adcode = ca.area_code\n"
        + "left join com_street as cs on cs.street_id = ca.street_id\n" + "where ca.community_id = ${communityId}")
    ComPopulationActVO getPopulationActById(@Param("communityId") Long communityId);

    @Select("select `name`,street_id from com_street where app_id = #{appId}")
    List<StreetAllAppletsVO> getStreetList(String appId);

    @Select("select ca.`name`,ca.street_id,ca.community_id,cs.`name` as streetName from com_act as ca left join com_street as cs on cs.street_id = ca.street_id where ca.state = 0 and ca.street_id = #{streetId}")
    List<CommunitySwitchAllAppletsVO> getCommunityListByStreetId(@Param("streetId") Long streetId);

    @Select("<script> select ca.`name`,ca.street_id,ca.community_id,cs.`name` as streetName " +
            "from com_act as ca " +
            "left join com_street as cs on cs.street_id = ca.street_id " +
            "where ca.state = 0 and ca.name like concat('%',#{name},'%') <if test='appId !=null and appId !=&quot;&quot;'> and cs.app_id = #{appId} </if> </script> ")
    List<CommunitySwitchAllAppletsVO> getCommunityListByName(@Param("name") String name,@Param("appId") String appId);

    @Select("SELECT   c.community_id,    c.`name`,    c.street_id,    cs.`name` as streetName," +
            "round( ST_Distance_Sphere ( Point ( #{communityDTO.longitude}, #{communityDTO.latitude} ), Point ( c.lng, c.lat ) )/ 1000, 2 ) AS distance  " +
            "FROM    com_act c     left join com_street as cs on cs.street_id = c.street_id  " +
            "where cs.area_code = #{communityDTO.areaCode} " +
            "HAVING distance >= 0 and distance <= #{communityDTO.distance}   ORDER BY    distance ASC")
    List<CommunitySwitchAllAppletsVO> getCommunityListByNearby(@Param("communityDTO") SearchCommunityDTO communityDTO);

    @Select("<script> select community_id,name,lng,lat from com_act  where state = 0 <if test='areaCode !=null and areaCode !=&quot;&quot;'> and area_code = #{areaCode} </if> </script>")
    List<EventGridCommunityAdminVO> getWestCommunityLists(@Param("areaCode") String areCode);

    @Select("select account,plaintext_password as password from com_act where community_id = #{communityId}")
    ComActPasswordVo getCommunityPassword(@Param("communityId") Long communityId);

    @Select("select name from com_pb_check_unit where id=#{id}")
    String getUnitName(@Param("id") Long unitId);

    @Select("select count(id) from com_pb_check_unit")
    Integer getUnitCount();

    @Select("select count(id) from com_pb_member where audit_result=1")
    Integer selectUnitCount();

    @Select("select count(id) from com_pb_check_unit")
    Integer selectMemberCount();

    @Select("select name from com_pb_check_unit where id=#{id}")
    String selectUnitName(@Param("id") Long id);

    @Select("select community_id from com_act where street_id=#{id}")
    List<Long> selectCommunityByStreetId(Long id);
    @Select("SELECT  caa.community_id FROM com_act caa WHERE caa.`name` = ( select ca.`name` FROM com_act ca WHERE ca.community_id =#{id})")
    List<Long> selectIds(@Param("id") Long id);


    /**
     * 统计全部社区/村落数量
     * @return
     */
    @Select("SELECT count(1) FROM `com_act` WHERE app_id = 'wx118de8a734d269f0' and community_id not in ( 11 ,22)")
    Integer countCommunity();

    /**
     * 统计实有人口数
     * @return
     */
    @Select(" SELECT count(1) FROM com_mng_population WHERE death = 0")
    Integer countPopulation();

    /**
     * 统计实有房屋数
     * @return
     */
    @Select(" SELECT count(1) FROM com_mng_population_house")
    Integer countPopulationHouse();


    /**
     * 统计报道在职干部 西区+花城
     * @return
     */
    @Select("  SELECT sum(a.member) FROM (SELECT count(1) member FROM com_pb_member union all  SELECT count(1) member FROM com_pb_member_west) a")
    Integer countPbMember();
    /**
     * 统计报到单位
     * @return
     */
    @Select("  SELECT count(1) FROM com_pb_check_unit")
    Integer countPbUnit();

    /**
     * 统计商家
     * @return
     */
    @Select(" SELECT count(1) FROM com_convenient_merchants WHERE is_del = 0")
    Integer countMerchants();

    /**
     * 统计自愿者
     * @return
     */
    @Select("SELECT count(1) FROM sys_user WHERE is_volunteer = 1")
    Integer countVolunteer();

    /**
     * 统计社会组织
     * @return
     */
    @Select("SELECT count(1) FROM com_act_social_org")
    Integer countSocialOrg();
}

 springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiComActWorkGuideClassifyDao.java

New file
@@ -0,0 +1,33 @@
package com.panzhihua.service_jinhui_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.community.ComActWorkGuideAppletsVO;
import com.panzhihua.common.model.vos.community.ComActWorkGuideClassifyVO;
import com.panzhihua.service_jinhui_community.entity.JinhuiComActWorkGuideClassify;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * title: ComActWorkGuideClassifyDAO  社区》办事指南》分类管理mapper类
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 社区》办事指南》分类管理mapper类
 *
 * @author txb
 * @date 2021/8/31 14:21
 */
@Mapper
public interface JinhuiComActWorkGuideClassifyDao extends BaseMapper<JinhuiComActWorkGuideClassify> {
    IPage<ComActWorkGuideClassifyVO> pageWorkGuideClassify(Page page,
                                                           @Param("comActWorkGuideClassifyVO") ComActWorkGuideClassifyVO comActWorkGuideClassifyVO);

    /**
     * 查询办事指南分类列表
     * @return  办事指南分类列表
     */
    List<ComActWorkGuideAppletsVO> listWorkGuideClassify(String areaCode);

}

 springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiComActWorkGuideDAO.java

New file
@@ -0,0 +1,29 @@
package com.panzhihua.service_jinhui_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.PageActWorkGuideDTO;
import com.panzhihua.common.model.vos.community.ComActWorkGuideDetailAppletsVO;
import com.panzhihua.common.model.vos.community.ComActWorkGuideVO;
import com.panzhihua.service_jinhui_community.entity.JinhuiComActWorkGuide;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * @description: 办事指南
 **/
@Mapper
public interface JinhuiComActWorkGuideDAO extends BaseMapper<JinhuiComActWorkGuide> {
    IPage<ComActWorkGuideVO> pageWorkGuide(Page page, @Param("pageActWorkGuideDTO") PageActWorkGuideDTO pageActWorkGuideDTO);

    /**
     * 根据办事指南分类id查询办事指南
     * @param classifyId    办事指南分类id
     * @param pageSize    默认展示条数
     * @return  办事指南列表
     */
    List<ComActWorkGuideDetailAppletsVO> getWorkGuideListByClassifyId(@Param("classifyId") Long classifyId,@Param("pageSize") Long pageSize);
}

 springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiComActWorkGuideMaterialDao.java

New file
@@ -0,0 +1,11 @@
package com.panzhihua.service_jinhui_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.service_jinhui_community.entity.JinhuiComActWorkGuideMaterial;
import org.apache.ibatis.annotations.Mapper;

/**
 * @description: 办事指南材料
 **/
@Mapper
public interface JinhuiComActWorkGuideMaterialDao extends BaseMapper<JinhuiComActWorkGuideMaterial> {}

 springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiGoldCoinRecordDao.java

@@ -18,11 +18,11 @@
     * @param
     * @return
     */
    IPage<JinhuiGoldCoinRecord> getList(Page page,@Param("type") String type);
    IPage<JinhuiGoldCoinRecord> getList(Page page,@Param("userId") String userId);



    JinhuiGoldCoinRecord getDetails(@Param("userId") String userId);
    JinhuiGoldCoinRecord getDetails(@Param("id") String id);

    /**
     * 新增

 springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiComActWorkGuide.java

New file
@@ -0,0 +1,75 @@
package com.panzhihua.service_jinhui_community.entity;

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

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

@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@ApiModel("金汇办事指南")
public class JinhuiComActWorkGuide implements Serializable {
    private static final long serialVersionUID = -70884515430727555L;

    @ApiModelProperty(value = "主键")
    private String id;


    @ApiModelProperty(value = "办事指南标题")
    private String title;

    @ApiModelProperty(value = "办事指南内容")
    private String content;


    @ApiModelProperty(value = "所属分类")
    private String classify;


    @ApiModelProperty(value = "办理时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date timeAt;

    @ApiModelProperty(value = "办理地点")
    private String address;

    @ApiModelProperty(value = "咨询电话")
    private String phone;


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

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

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

    @ApiModelProperty(value = "创建人")
    private String createBy;

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

    @ApiModelProperty(value = "修改人")
    private String updateBy;

    @ApiModelProperty(value = "区域编码")
    private String areaCode;

    @ApiModelProperty(value = "社区id")
    private String communityId;


}

 springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiComActWorkGuideClassify.java

New file
@@ -0,0 +1,53 @@
package com.panzhihua.service_jinhui_community.entity;

import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;

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

@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@ApiModel("金汇社区》办事指南》分类管理")
public class JinhuiComActWorkGuideClassify implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * 自增id
     */
    private String id;

    /**
     * 分类名称
     */
    private String classifyName;

    /**
     * 图标地址
     */
    private String pictureUrl;

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

    /**
     * 系统预置：1-是 0-否
     */
    private String sysFlag;

    private String areaCode;


    private String communityId;
}

 springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiComActWorkGuideMaterial.java

New file
@@ -0,0 +1,28 @@
package com.panzhihua.service_jinhui_community.entity;

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

import java.io.Serializable;
@Data
public class JinhuiComActWorkGuideMaterial  implements Serializable
{
    /** 自增 id */
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 申报材料名称
     */
    private String materialName;
    /**
     * 办事指南id
     */
    private String workGuideId;

    /**
     * 社区id
     */
    private String communityId;
}


 springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/model/dos/ComActDO.java

New file
@@ -0,0 +1,122 @@
package com.panzhihua.service_jinhui_community.model.dos;

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

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

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 社区表
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-07 14:12
 **/
@Data
@TableName(value = "com_act")
public class ComActDO implements Serializable {
    private static final long serialVersionUID = 1L;

    /**
     * community_id
     */
    @TableId(type = IdType.ASSIGN_ID)
    private Long communityId;

    /**
     * 社区名字
     */
    private String name;

    /**
     * 社区地址
     */
    private String address;

    /**
     * 经度
     */
    private String lng;

    /**
     * 维度
     */
    private String lat;

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

    /**
     * 省份地址编码
     */
    private String provinceCode;

    /**
     * 市级地址编码
     */
    private String cityCode;

    /**
     * 区级地址编码
     */
    private String areaCode;

    /**
     * 社区面积
     */
    private Double square;

    /**
     * 联系人
     */
    private String contacts;

    /**
     * 联系人电话
     */
    private String contactsPhone;

    /** 社区总人口 */
    private Integer totalUser;
    /** 社区书记-用户ID */
    private Long managerId;
    /** 社区书记_名称 */
    private String managerName;
    /** 社区介绍 */
    private String introduce;
    /** 层次递归字段（省>市>区县>街道>社区） */
    private String path;
    /**
     * 超管账号
     */
    private String account;

    /**
     * 账号密码
     */
    private String password;

    /**
     * 状态 0 启用 1 禁用
     */
    private Integer state;

    /**
     * 街道ID
     */
    private Long streetId;

    /**
     * 明文密码
     */
    private String plaintextPassword;

    private String appId;

    @TableField(exist = false)
    private String solvePhone;

}

 springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/JinhuiActActivityService.java

File was deleted

 springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/JinhuiComActWorkGuideClassifyService.java

New file
@@ -0,0 +1,53 @@
package com.panzhihua.service_jinhui_community.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActWorkGuideClassifyVO;
import com.panzhihua.service_jinhui_community.entity.JinhuiComActWorkGuideClassify;

/**
 * title: ComActWorkGuideClassifyService  社区》办事指南》分类管理服务类
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 社区》办事指南》分类管理服务类
 *
 * @author txb
 * @date 2021/8/31 14:21
 */
public interface JinhuiComActWorkGuideClassifyService extends IService<JinhuiComActWorkGuideClassify> {

    /**
     * 分页查询办事执念-分类管理 addWorkGuideClassify  分页查询办事执念-分类管理
     * @param    comActWorkGuideClassifyVO   查询参数
     * @return    R   返回结果
     * @author txb
     * @date 2021/8/31 15:03
     */
    R pageWorkGuideClassify(ComActWorkGuideClassifyVO comActWorkGuideClassifyVO);

    /**
     * 办事执念-分类管理新增或修改  addWorkGuideClassify  办事执念-分类管理新增或修改
     * @param    comActWorkGuideClassifyVO   新增或修改参数
     * @return    R   返回结果
     * @author txb
     * @date 2021/8/31 15:03
     */
    R addWorkGuideClassify(ComActWorkGuideClassifyVO comActWorkGuideClassifyVO);

    /**
     * 办事执念-分类管理删除  addWorkGuideClassify  办事执念-分类管理删除
     * @param    workGuideClassifyId    办事执念-分类管理id
     * @return    R   返回结果
     * @author txb
     * @date 2021/8/31 15:03
     */
    R deleteWorkGuideClassify(Long workGuideClassifyId);

    /**
     * 办事指南-分类管理列表查询  getWorkGuideClassifyList  办事指南-分类管理列表查询
     * @return    R   返回结果
     * @author txb
     * @date 2021/8/31 15:03
     */
    R getWorkGuideClassifyList(String areaCode);

}

 springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/JinhuiComActWorkGuideService.java

New file
@@ -0,0 +1,70 @@
package com.panzhihua.service_jinhui_community.service;

import com.panzhihua.common.model.dtos.community.ComActWorkGuideDTO;
import com.panzhihua.common.model.dtos.community.PageActWorkGuideDTO;
import com.panzhihua.common.model.vos.R;

/**
 * @auther llming
 * @describe 办事指南
 */
public interface JinhuiComActWorkGuideService {
    /**
     * 办事指南_新增
     * 
     * @param workGuideDTO
     *            办事指南信息
     * @return 新增结果
     */
    R addWorkGuide(ComActWorkGuideDTO workGuideDTO, Long userId);

    /**
     * 办事指南_编辑
     * 
     * @param workGuideDTO
     *            编辑内容
     * @return 编辑结果
     */
    R editWorkGuide(ComActWorkGuideDTO workGuideDTO, Long userId);

    /**
     * 办事指南_详情
     * 
     * @param workGuideId
     *            办事指南id
     * @return 社区详情
     */
    R detailWorkGuide(String workGuideId, String conmunityId);

    /**
     * 办事指南_分页
     * 
     * @param pageActWorkGuideDTO
     *            查询参数
     * @return 分页集合
     */
    R pageWorkGuide(PageActWorkGuideDTO pageActWorkGuideDTO);

    /**
     * 办事指南_删除
     * 
     * @param workGuideId
     *            办事指南id
     * @return 删除结果
     */
    R delectWorkGuide(Long workGuideId);

    /**
     * 办事指南列表-按分类查询
     * @param pageActWorkGuideDTO   请求参数
     * @return  办事指南分类列表
     */
    R listWorkGuide(PageActWorkGuideDTO pageActWorkGuideDTO);

    /**
     * 根据办事指南分类id查询办事指南列表
     * @param classifyId   办事指南分类id
     * @return  办事指南列表数据
     */
    R listWorkGuideByClassifyId(Long classifyId);
}

 springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/JinhuiGoldCoinRecordService.java

@@ -14,9 +14,9 @@
     * @param
     * @return
     */
    R getList(int pageNum,int pageSize,String type);
    R getList(int pageNum,int pageSize,String userId);

    JinhuiGoldCoinRecord getDetails(String userId);
    JinhuiGoldCoinRecord getDetails(String id);
    /**
     * 新增
     * @param

 springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiActActivityServiceImpl.java

File was deleted

 springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiComActWorkGuideClassifyServiceImpl.java

New file
@@ -0,0 +1,134 @@
package com.panzhihua.service_jinhui_community.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActWorkGuideClassifyVO;
import com.panzhihua.service_jinhui_community.dao.JinhuiComActWorkGuideClassifyDao;
import com.panzhihua.service_jinhui_community.dao.JinhuiComActWorkGuideDAO;
import com.panzhihua.service_jinhui_community.entity.JinhuiComActWorkGuide;
import com.panzhihua.service_jinhui_community.entity.JinhuiComActWorkGuideClassify;
import com.panzhihua.service_jinhui_community.service.JinhuiComActWorkGuideClassifyService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

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

/**
 * title: ComActWorkGuideClassifyServiceImpl  社区》办事指南》分类管理服务实现类
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 社区》办事指南》分类管理服务实现类
 *
 * @author txb
 * @date 2021/8/31 14:21
 */
@Slf4j
@Service
public class JinhuiComActWorkGuideClassifyServiceImpl extends ServiceImpl<JinhuiComActWorkGuideClassifyDao,
        JinhuiComActWorkGuideClassify> implements JinhuiComActWorkGuideClassifyService {

    @Resource
    private JinhuiComActWorkGuideClassifyDao comActWorkGuideClassifyDAO;
    @Resource
    private JinhuiComActWorkGuideDAO comActWorkGuideDAO;

    @Override
    public R pageWorkGuideClassify(ComActWorkGuideClassifyVO comActWorkGuideClassifyVO) {
        Page page = new Page<>();
        Long pageNum = comActWorkGuideClassifyVO.getPageNum();
        Long pageSize = comActWorkGuideClassifyVO.getPageSize();
        if (null == pageNum || 0 == pageNum) {
            pageNum = 1L;
        }
        if (null == pageSize || 0 == pageSize) {
            pageSize = 10L;
        }
        page.setSize(pageSize);
        page.setCurrent(pageNum);

        IPage<ComActWorkGuideClassifyVO> iPage = comActWorkGuideClassifyDAO.pageWorkGuideClassify(page, comActWorkGuideClassifyVO);
        return R.ok(iPage);
    }

    @Override
    public R addWorkGuideClassify(ComActWorkGuideClassifyVO comActWorkGuideClassifyVO) {
        if (null != comActWorkGuideClassifyVO.getId() && comActWorkGuideClassifyVO.getId() != 0) {
            // 修改
            JinhuiComActWorkGuideClassify comActWorkGuideClassifyDO = comActWorkGuideClassifyDAO.selectById(comActWorkGuideClassifyVO.getId());
            if (null == comActWorkGuideClassifyDO) {
                return R.fail("该办事指南分类不存在");
            }
            JinhuiComActWorkGuideClassify checkCreditCode = comActWorkGuideClassifyDAO.selectOne(
                    new QueryWrapper<JinhuiComActWorkGuideClassify>().lambda()
                            .eq(JinhuiComActWorkGuideClassify::getClassifyName, comActWorkGuideClassifyVO.getClassifyName())
                            .eq(JinhuiComActWorkGuideClassify::getAreaCode, comActWorkGuideClassifyVO.getAreaCode()));
            if (null != checkCreditCode && !comActWorkGuideClassifyDO.getId().equals(checkCreditCode.getId())) {
                return R.fail("该办事指南分类已存在，办事指南分类名称重复");
            }

            BeanUtils.copyProperties(comActWorkGuideClassifyVO, comActWorkGuideClassifyDO);
            int update = comActWorkGuideClassifyDAO.updateById(comActWorkGuideClassifyDO);
            if (update > 0) {
                return R.ok();
            }
        } else {
            // 新增
            Integer count = comActWorkGuideClassifyDAO.selectCount(
                    new QueryWrapper<JinhuiComActWorkGuideClassify>().lambda()
                            .eq(JinhuiComActWorkGuideClassify::getClassifyName, comActWorkGuideClassifyVO.getClassifyName())
                            .eq(JinhuiComActWorkGuideClassify::getAreaCode, comActWorkGuideClassifyVO.getAreaCode()));
            if (count > 0) {
                return R.fail("该办事指南分类已存在，办事指南分类名称重复");
            }
            JinhuiComActWorkGuideClassify comActWorkGuideClassifyDO = new JinhuiComActWorkGuideClassify();
            BeanUtils.copyProperties(comActWorkGuideClassifyVO, comActWorkGuideClassifyDO);
            int insert = comActWorkGuideClassifyDAO.insert(comActWorkGuideClassifyDO);
            if (insert > 0) {
                return R.ok();
            }
        }
        return R.fail("添加失败");
    }

    @Override
    public R deleteWorkGuideClassify(Long workGuideClassifyId) {
        // 查询特殊群体人员
        JinhuiComActWorkGuideClassify comActWorkGuideClassifyDO = comActWorkGuideClassifyDAO.selectById(workGuideClassifyId);
        if (comActWorkGuideClassifyDO == null) {
            return R.fail("办事指南分类不存在");
        }

        Integer count = comActWorkGuideDAO.selectCount(new QueryWrapper<JinhuiComActWorkGuide>()
                .lambda().eq(JinhuiComActWorkGuide::getClassify,workGuideClassifyId));
        if(count > 0){
            return R.fail("该分类下存在办事指南，不可删除");
        }

        int delete = comActWorkGuideClassifyDAO.deleteById(workGuideClassifyId);
        if (delete > 0) {
            return R.ok();
        }
        return R.fail("删除失败");
    }

    @Override
    public R getWorkGuideClassifyList(String areaCode) {
        List<JinhuiComActWorkGuideClassify> comActWorkGuideClassifyDOS = comActWorkGuideClassifyDAO
                .selectList(new QueryWrapper<JinhuiComActWorkGuideClassify>()
                        .lambda().eq(JinhuiComActWorkGuideClassify::getAreaCode,areaCode));
        List<ComActWorkGuideClassifyVO> comActWorkGuideClassifyVOList = new ArrayList<>();
        if (comActWorkGuideClassifyDOS != null && comActWorkGuideClassifyDOS.size() > 0) {
            comActWorkGuideClassifyDOS.forEach(comActWorkGuideClassifyDO -> {
                ComActWorkGuideClassifyVO comActWorkGuideClassifyVO = new ComActWorkGuideClassifyVO();
                BeanUtils.copyProperties(comActWorkGuideClassifyDO, comActWorkGuideClassifyVO);
                comActWorkGuideClassifyVOList.add(comActWorkGuideClassifyVO);
            });
        }
        return R.ok(comActWorkGuideClassifyVOList);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiComActWorkGuideServiceImpl.java

New file
@@ -0,0 +1,210 @@
package com.panzhihua.service_jinhui_community.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.community.ComActWorkGuideDTO;
import com.panzhihua.common.model.dtos.community.PageActWorkGuideDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActWorkGuideAppletsVO;
import com.panzhihua.common.model.vos.community.ComActWorkGuideDetailAppletsVO;
import com.panzhihua.common.model.vos.community.ComActWorkGuideMaterialVO;
import com.panzhihua.common.model.vos.community.ComActWorkGuideVO;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_jinhui_community.dao.ComActDAO;
import com.panzhihua.service_jinhui_community.dao.JinhuiComActWorkGuideClassifyDao;
import com.panzhihua.service_jinhui_community.dao.JinhuiComActWorkGuideDAO;
import com.panzhihua.service_jinhui_community.dao.JinhuiComActWorkGuideMaterialDao;
import com.panzhihua.service_jinhui_community.entity.JinhuiComActWorkGuide;
import com.panzhihua.service_jinhui_community.entity.JinhuiComActWorkGuideClassify;
import com.panzhihua.service_jinhui_community.entity.JinhuiComActWorkGuideMaterial;
import com.panzhihua.service_jinhui_community.model.dos.ComActDO;
import com.panzhihua.service_jinhui_community.service.JinhuiComActWorkGuideService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

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

/**
 * @auther llming
 * @describe 办事指南
 */
@Service
public class JinhuiComActWorkGuideServiceImpl extends ServiceImpl<JinhuiComActWorkGuideDAO, JinhuiComActWorkGuide>
    implements JinhuiComActWorkGuideService {
    static String AK = "W3x8DhCWKc2UFIwYgclpRBdL6BeGLLQt"; // 百度地图密钥

    @Resource
    JinhuiComActWorkGuideMaterialDao workGuideMaterialDAO;
    @Resource
    private JinhuiComActWorkGuideClassifyDao comActWorkGuideClassifyDAO;
    @Resource
    ComActDAO comActDAO;

    @Override
    public R addWorkGuide(ComActWorkGuideDTO workGuideDTO, Long userId) {
        JinhuiComActWorkGuide comActWorkGuideDO = new JinhuiComActWorkGuide();
        BeanUtils.copyProperties(workGuideDTO, comActWorkGuideDO);
        comActWorkGuideDO.setCreateBy(userId+"");
        this.baseMapper.insert(comActWorkGuideDO);
        // 保存办事指南材料
        workGuideDTO.getMaterials().forEach(material -> {
            JinhuiComActWorkGuideMaterial workGuideMaterialDO = new JinhuiComActWorkGuideMaterial();
            workGuideMaterialDO.setMaterialName(material.getMaterialName());
            workGuideMaterialDO.setWorkGuideId(comActWorkGuideDO.getId());
            workGuideMaterialDAO.insert(workGuideMaterialDO);
        });
        return R.ok();
    }

    @Override
    public R editWorkGuide(ComActWorkGuideDTO workGuideDTO, Long userId) {
        if (workGuideDTO.getId() == 0L) {
            return R.fail("Id有误！");
        }
        JinhuiComActWorkGuide workGuideDO = this.baseMapper.selectById(workGuideDTO.getId());
        if (workGuideDO == null) {
            return R.fail("Id有误！");
        }
        BeanUtils.copyProperties(workGuideDTO, workGuideDO);
        workGuideDO.setUpdateBy(userId+"");
        this.baseMapper.updateById(workGuideDO);
        if (workGuideDTO.getMaterials().size() == 0) {// 若编辑材料为null,执行删除操作
            workGuideMaterialDAO.delete(new LambdaQueryWrapper<JinhuiComActWorkGuideMaterial>()
                .eq(JinhuiComActWorkGuideMaterial::getWorkGuideId, workGuideDTO.getId()));
        } else {// 若材料不为空，但是少了数据条数，也要执行删除
            List<JinhuiComActWorkGuideMaterial> workGuideMaterialDOS =
                workGuideMaterialDAO.selectList(new LambdaQueryWrapper<JinhuiComActWorkGuideMaterial>()
                    .eq(JinhuiComActWorkGuideMaterial::getWorkGuideId, workGuideDTO.getId()));
            // 1、筛选vo里面和db里，需要删除的材料数据
            List<Long> voMaterialIds =
                workGuideDTO.getMaterials().stream().filter(materialVo -> materialVo.getId() != null)
                    .map(ComActWorkGuideMaterialVO::getId).collect(Collectors.toList());
            List<Long> deleteMaterialIds = workGuideMaterialDOS.stream()
                .filter(workGuideMaterialDO -> !voMaterialIds.contains(workGuideMaterialDO.getId()))
                .map(JinhuiComActWorkGuideMaterial::getId).collect(Collectors.toList());
            if (deleteMaterialIds.size() != 0) {
                workGuideMaterialDAO.deleteBatchIds(deleteMaterialIds);
            }
            workGuideDTO.getMaterials().forEach(materialsVO -> {
                if (materialsVO.getId() != null && materialsVO.getId() != 0L) {
                    JinhuiComActWorkGuideMaterial workGuideMaterialDO1 = workGuideMaterialDOS.stream()
                        .filter(workGuideMaterialDO -> workGuideMaterialDO.getId().equals(materialsVO.getId()))
                        .findFirst().orElse(null);
                    if (workGuideMaterialDO1 != null) {// 2、如果db有,执行编辑
                        workGuideMaterialDO1.setMaterialName(materialsVO.getMaterialName());
                        workGuideMaterialDAO.updateById(workGuideMaterialDO1);
                    }
                } else {// 3、如果db没有，执行新增
                    JinhuiComActWorkGuideMaterial newWorkGuideMaterialDO = new JinhuiComActWorkGuideMaterial();
                    newWorkGuideMaterialDO.setMaterialName(materialsVO.getMaterialName());
                    newWorkGuideMaterialDO.setWorkGuideId(workGuideDO.getId());
                    workGuideMaterialDAO.insert(newWorkGuideMaterialDO);
                }
            });
        }
        return R.ok();
    }

    @Override
    public R detailWorkGuide(String workGuideId, String communityId) {
        JinhuiComActWorkGuide workGuideDO = this.baseMapper.selectById(workGuideId);
        if (workGuideDO == null) {
            return R.fail("Id有误！");
        }
        ComActWorkGuideVO vo = new ComActWorkGuideVO();
        BeanUtils.copyProperties(workGuideDO, vo);

        if(!StringUtils.isEmpty(communityId))
        {
            ComActDO comActDO = comActDAO.selectById(communityId);
            if (comActDO != null) {
                vo.setAddress(comActDO.getAddress());
                vo.setPhone(comActDO.getContactsPhone());
                vo.setLon(comActDO.getLng());
                vo.setLat(comActDO.getLat());
            }

            List<JinhuiComActWorkGuideMaterial> workGuideMaterialDOS =
                    workGuideMaterialDAO.selectList(new LambdaQueryWrapper<JinhuiComActWorkGuideMaterial>()
                            .eq(JinhuiComActWorkGuideMaterial::getWorkGuideId, workGuideId));
            workGuideMaterialDOS.forEach(workGuideMaterialDO -> {
                ComActWorkGuideMaterialVO workGuideMaterialVO = new ComActWorkGuideMaterialVO();
                workGuideMaterialVO.setId(workGuideMaterialDO.getId());
                workGuideMaterialVO.setMaterialName(workGuideMaterialDO.getMaterialName());
                vo.getMaterials().add(workGuideMaterialVO);
            });
        }
        return R.ok(vo);
    }

    @Override
    public R pageWorkGuide(PageActWorkGuideDTO pageActWorkGuideDTO) {
        Page page = new Page<>();
        Long pageNum = pageActWorkGuideDTO.getPageNum();
        Long pageSize = pageActWorkGuideDTO.getPageSize();
        if (null == pageNum || 0 == pageNum) {
            pageNum = 1l;
        }
        if (null == pageSize || 0 == pageSize) {
            pageSize = 10l;
        }
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        IPage<ComActWorkGuideVO> iPage = this.baseMapper.pageWorkGuide(page, pageActWorkGuideDTO);
        if (!iPage.getRecords().isEmpty()) {
            iPage.getRecords().forEach(comActWorkGuideVO -> {
                JinhuiComActWorkGuideClassify comActWorkGuideClassifyDO = comActWorkGuideClassifyDAO.selectById(comActWorkGuideVO.getClassify());
                if (comActWorkGuideClassifyDO != null) {
                    comActWorkGuideVO.setClassifyName(comActWorkGuideClassifyDO.getClassifyName());
                }
            });
        }
        return R.ok(iPage);
    }

    @Override
    public R delectWorkGuide(Long workGuideId) {
        this.baseMapper.deleteById(workGuideId);
        workGuideMaterialDAO.delete(new LambdaQueryWrapper<JinhuiComActWorkGuideMaterial>()
            .eq(JinhuiComActWorkGuideMaterial::getWorkGuideId, workGuideId));
        return R.ok();
    }

    /**
     * 办事指南列表-按分类查询
     * @param pageActWorkGuideDTO   请求参数
     * @return  办事指南分类列表
     */
    @Override
    public R listWorkGuide(PageActWorkGuideDTO pageActWorkGuideDTO){
        //结果数据集合
        List<ComActWorkGuideAppletsVO> resultList = new ArrayList<>();

        List<ComActWorkGuideAppletsVO> workGuideClassifyList = comActWorkGuideClassifyDAO.listWorkGuideClassify(pageActWorkGuideDTO.getAreaCode());
        //通过办事指南分类查询分类下办事指南
        workGuideClassifyList.forEach(workGuideClassify -> {
            List<ComActWorkGuideDetailAppletsVO> workGuideList = this.baseMapper.getWorkGuideListByClassifyId(workGuideClassify.getId(),10L);
            if(workGuideList != null && workGuideList.size() > 0){
                workGuideClassify.setGuideDetailList(workGuideList);
                //分类下办事指南数据大于0加入到结果集中向小程序展示
                resultList.add(workGuideClassify);
            }
        });
        return R.ok(resultList);
    }

    /**
     * 根据办事指南分类id查询办事指南列表
     * @param classifyId   办事指南分类id
     * @return  办事指南列表数据
     */
    @Override
    public R listWorkGuideByClassifyId(Long classifyId){
        return R.ok(this.baseMapper.getWorkGuideListByClassifyId(classifyId,null));
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiGoldCoinRecordServiceImpl.java

@@ -3,13 +3,9 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.jinhui.JinhuiCoinGeneralTableVO;
import com.panzhihua.common.model.vos.jinhui.JinhuiGoldCoinRecordVO;
import com.panzhihua.service_jinhui_community.dao.JinhuiCoinGeneralTableDao;
import com.panzhihua.service_jinhui_community.dao.JinhuiGoldCoinRecordDao;
import com.panzhihua.service_jinhui_community.entity.JinhuiCoinGeneralTable;
import com.panzhihua.service_jinhui_community.entity.JinhuiGoldCoinRecord;
import com.panzhihua.service_jinhui_community.service.JinhuiCoinGeneralTableService;
import com.panzhihua.service_jinhui_community.service.JinhuiGoldCoinRecordService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -22,15 +18,15 @@
{

    @Override
    public R getList(int pageNum,int pageSize,String type)
    public R getList(int pageNum,int pageSize,String userId)
    {
        Page page = new Page<>(pageNum,pageSize);
        return R.ok(baseMapper.getList(page,type));
        Page page = new Page<JinhuiGoldCoinRecord>(pageNum,pageSize);
        return R.ok(baseMapper.getList(page,userId));
    }

    @Override
    public JinhuiGoldCoinRecord getDetails(String userId) {
        return baseMapper.getDetails(userId);
    public JinhuiGoldCoinRecord getDetails(String id) {
        return baseMapper.getDetails(id);
    }



 springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiComActWorkGuideClassifyMapper.xml

New file
@@ -0,0 +1,60 @@
<?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_jinhui_community.dao.JinhuiComActWorkGuideClassifyDao">

    <resultMap type="com.panzhihua.service_jinhui_community.entity.JinhuiComActWorkGuideClassify" id="itemMap">
        <result property="id" column="id" />
        <result property="classifyName" column="classify_name" />
        <result property="pictureUrl" column="picture_url" />
        <result property="createAt" column="create_at" />
        <result property="sysFlag" column="sys_flag" />
        <result property="communityId" column="community_id" />
        <result property="areaCode" column="area_code" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, classify_name, picture_url, create_at, sys_flag,community_id
    </sql>

    <select id="pageWorkGuideClassify" resultType="com.panzhihua.common.model.vos.community.ComActWorkGuideClassifyVO">
        select
        id,
        classify_name,
        picture_url,
        create_at,
        community_id,
        sys_flag
        from com_act_work_guide_classify
        <where>
            <if test="comActWorkGuideClassifyVO.classifyName != null and comActWorkGuideClassifyVO.classifyName !=''">
                AND classify_name like concat ('%', #{comActWorkGuideClassifyVO.classifyName}, '%')
            </if>
            <if test="comActWorkGuideClassifyVO.areaCode != null and comActWorkGuideClassifyVO.areaCode !=''">
                AND area_code = #{comActWorkGuideClassifyVO.areaCode}
            </if>
        </where>
        order by create_at desc
    </select>

    <select id="listWorkGuideClassify" resultType="com.panzhihua.common.model.vos.community.ComActWorkGuideAppletsVO">
        SELECT cawgc.id, cawgc.classify_name, cawgc.picture_url,( SELECT count( id ) FROM com_act_work_guide WHERE classify = cawgc.id ) AS `count`
        FROM
        com_act_work_guide_classify AS cawgc
        <where>
            <if test="areaCode!=null">
                and cawgc.area_code = #{area_code}
            </if>
        </where>
        order by `count` asc
    </select>









</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiComActWorkGuideMapper.xml

New file
@@ -0,0 +1,77 @@
<?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_jinhui_community.dao.JinhuiComActWorkGuideDAO">

    <!-- 通用查询映射结果 -->
    <resultMap id="itemMap" type="com.panzhihua.service_jinhui_community.entity.JinhuiComActWorkGuide">
        <id column="id" property="id" />
        <result column="title" property="title" />
        <result column="content" property="content" />
        <result column="classify" property="classify" />
        <result column="time_at" property="timeAt" />
        <result column="address" property="address" />
        <result column="phone" property="phone" />
        <result column="lon" property="lon" />
        <result column="lat" property="lat" />
        <result column="create_at" property="createAt" />
        <result column="create_by" property="createBy" />
        <result column="update_at" property="updateAt" />
        <result column="update_by" property="updateBy" />
        <result column="community_id" property="communityId" />
        <result column="area_code" property="areaCode" />
    </resultMap>


    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, title, content, classify, time_at, address, phone, lon, lat, create_at, create_by, update_at, update_by,community_id
    </sql>


    <!-- 分页查询 -->
    <select id="pageWorkGuide" resultMap="itemMap">
        select
            id,
            title,
            content,
            classify,
            time_at,
            address,
            phone,
            create_at,
            community_id
        from com_act_work_guide
        <where>
            <if test='pageActWorkGuideDTO.classify != null'>
                and classify = #{pageActWorkGuideDTO.classify}
            </if>
            <if test='pageActWorkGuideDTO.areaCode != null'>
                and area_code = #{pageActWorkGuideDTO.areaCode}
            </if>
            <if test='pageActWorkGuideDTO.title != null and pageActWorkGuideDTO.title.trim() != &quot;&quot;'>
                and title like concat('%',#{pageActWorkGuideDTO.title},'%')
            </if>
        </where>
        order by update_at desc
    </select>

    <select id="getWorkGuideListByClassifyId" resultType="com.panzhihua.common.model.vos.community.ComActWorkGuideDetailAppletsVO">
        select
            id,
            title,
            content,
            classify,
            time_at,
            address,
            phone,
            create_at,
            community_id
        from com_act_work_guide
        where classify = #{classifyId}
        order by create_at desc
        <if test="pageSize != null">
            limit #{pageSize}
        </if>
    </select>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiComActWorkGuideMaterialMapper.xml

New file
@@ -0,0 +1,12 @@
<?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_jinhui_community.dao.JinhuiComActWorkGuideMaterialDao">

    <resultMap type="com.panzhihua.service_jinhui_community.entity.JinhuiComActWorkGuideMaterial" id="itemMap">
        <result property="id" column="id" />
        <result property="materialName" column="material_name" />
        <result property="workGuideId" column="work_guide_id" />
        <result property="communityId" column="community_id" />
    </resultMap>

</mapper>

 springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiGoldCoinRecordMapper.xml

@@ -27,6 +27,12 @@
            remark,
            type
        from jinhui_gold_coin_record
        <where>
            1=1
            <if test="userId !=null and userId !='' ">
                user_id=#{userId}
            </if>
        </where>
        order by creation_time desc
    </select>

@@ -44,7 +50,7 @@
            type
        from jinhui_gold_coin_record
        where
            user_id=#{userId}
            id=#{id}
    </select>

    <insert id="addData">