Merge branch 'dev' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into p...

luoyuanqiao

2022-03-02 893f8cffb39a6c728d231f0f63895388e9a21ae1

Merge branch 'dev' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into partyBuilding_lyq


 Conflicts:

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

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

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

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

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

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

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


import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActColumnVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.StringUtils;
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;
import java.util.Date;

/**
 * 分类列表(ComActColumn)表控制层
 *
 * @author makejava
 * @since 2021-10-20 17:28:14
 */
@Slf4j
@Api(tags = {"分类管理"})
@RestController
@RequestMapping("comActColumn")
public class ComActColumnApi extends BaseController {
    /**
     * 服务对象
     */
    @Resource
    private CommunityService communityService;

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @ApiOperation(value = "分页查询所有数据",response = ComActColumnVO.class)
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        return this.communityService.comActColumnSelectAll(commonPage);
    }

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @ApiOperation("通过主键查询单条数据")
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Long id) {
        return this.communityService.comActColumnSelectOne(id);
    }

    /**
     * 新增数据
     *
     * @param comActColumnVO 实体对象
     * @return 新增结果
     */
    @ApiOperation("新增数据")
    @PostMapping
    public R insert(@RequestBody ComActColumnVO comActColumnVO) {
        comActColumnVO.setStatus(1);
        comActColumnVO.setCreateTime(new Date());
        if(StringUtils.isNotEmpty(this.getLoginUserInfo().getName())){
            comActColumnVO.setCreateBy(this.getLoginUserInfo().getName());
        }
        return communityService.comActColumnInsert(comActColumnVO);
    }

    /**
     * 修改数据
     *
     * @param comActColumnVO 实体对象
     * @return 修改结果
     */
    @ApiOperation("修改数据")
    @PostMapping("/update")
    public R update(@RequestBody ComActColumnVO comActColumnVO) {
        comActColumnVO.setUpdateTime(new Date());
        if(StringUtils.isNotEmpty(this.getLoginUserInfo().getName())){
            comActColumnVO.setUpdateBy(this.getLoginUserInfo().getName());
        }
        return this.communityService.comActColumnUpdate(comActColumnVO);
    }

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @ApiOperation("删除数据")
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return this.communityService.comActColumnDelete(id);
    }
}

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

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


import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.raffle.ComActRaffleVO;
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;

/**
 * 抽奖活动表(ComActRaffle)表控制层
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 抽奖活动表相关功能
 *
 * @author zzj
 * @since 2022-02-18 14:31:20
 */
@Slf4j
@Api(tags = {"抽奖活动"})
@RestController
@RequestMapping("comActRaffle")
public class ComActRaffleApi extends BaseController {
    /**
     * 服务对象
     */
    @Resource
    private CommunityService communityService;

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @ApiOperation(value = "分页查询",response = ComActRaffleVO.class)
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        commonPage.setCommunityId(this.getCommunityId());
        commonPage.setType(1);
        commonPage.setUserId(this.getUserId());
        return this.communityService.selectAllComActRaffle(commonPage);
    }

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @ApiOperation(value = "详情",response = ComActRaffleVO.class)
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Long id) {
        return this.communityService.selectOneComActRaffle(id,this.getUserId());
    }

    /**
     * 新增数据
     *
     * @param comActRaffleVO 实体对象
     * @return 新增结果
     */
    @ApiOperation(value = "新增数据")
    @PostMapping
    public R insert(@RequestBody ComActRaffleVO comActRaffleVO) {
        comActRaffleVO.setCommunityId(this.getCommunityId());
        comActRaffleVO.setCreateBy(this.getUserId());
        return this.communityService.insertComActRaffle(comActRaffleVO);
    }

    /**
     * 修改数据
     *
     * @param comActRaffleVO 实体对象
     * @return 修改结果
     */
    @ApiOperation(value = "修改数据")
    @PostMapping("/update")
    public R update(@RequestBody ComActRaffleVO comActRaffleVO) {
        return this.communityService.updateComActRaffle(comActRaffleVO);
    }

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @ApiOperation(value = "删除数据")
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return this.communityService.deleteComActRaffle(id);
    }
}

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

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


import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.raffle.ComActRaffleRecordVO;
import com.panzhihua.common.model.vos.community.warehouse.QRCodeVO;
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.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;

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

/**
 * 抽奖活动中奖记录表(ComActRaffleRecord)表控制层
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 抽奖活动中奖记录表相关功能
 *
 * @author zzj
 * @since 2022-02-18 14:32:02
 */
@Slf4j
@Api(tags = {"获奖记录"})
@RestController
@RequestMapping("comActRaffleRecord")
public class ComActRaffleRecordApi extends BaseController {
    /**
     * 服务对象
     */
    @Resource
    private CommunityService communityService;

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @ApiOperation(value = "分页查询",response = ComActRaffleRecordVO.class)
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        return this.communityService.selectAllComActRaffleRecord(commonPage);
    }
    @ApiOperation(value = "根据抽奖活动id获取奖品统计")
    @GetMapping("/queryPrize")
    public R queryPrize(@RequestParam("id")Long id){
        return this.communityService.queryPrize(id);
    }

    /**
     * 生成二维码
     * @param qrCodeVO
     * @return
     */
    @ApiOperation("生成二维码")
    @PostMapping("/getQRCode")
    public R getQRCode(@RequestBody QRCodeVO qrCodeVO){
        return this.communityService.getRaffleQRCode(qrCodeVO);
    }

    /**
     * 修改数据
     *
     * @param comActRaffleRecordVO 实体对象
     * @return 修改结果
     */
    @ApiOperation("核销接口")
    @PostMapping("/update")
    public R update(@RequestBody ComActRaffleRecordVO comActRaffleRecordVO) {
        comActRaffleRecordVO.setStaffId(this.getUserId());
        comActRaffleRecordVO.setStaffTime(new Date());
        comActRaffleRecordVO.setStatus(2);
        return this.communityService.updateRaffleRecord(comActRaffleRecordVO);
    }
    /**
     * 新增数据
     *
     * @param comActRaffleRecordVO 实体对象
     * @return 新增结果
     */
    @ApiOperation("参加活动")
    @PostMapping
    public R insert(@RequestBody ComActRaffleRecordVO comActRaffleRecordVO) {
        comActRaffleRecordVO.setCreateTime(new Date());
        comActRaffleRecordVO.setUserId(this.getUserId());
        comActRaffleRecordVO.setStatus(0);
        return communityService.insertRaffleRecord(comActRaffleRecordVO);
    }
    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @ApiOperation("详情")
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Long id) {
        return this.communityService.selectOneRaffleRecord(id);
    }
}

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

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


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

import javax.annotation.Resource;

/**
 * 社会组织成员表(ComActSocialMember)表控制层
 *
 * @author makejava
 * @since 2021-10-22 09:52:47
 */
@Slf4j
@Api(tags = {"社会组织成员"})
@RestController
@RequestMapping("comActSocialMember")
public class ComActSocialMemberApi extends BaseController {
    /**
     * 服务对象
     */
    @Resource
    private CommunityService communityService;

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @ApiOperation(value = "分页查询所有数据",response = ComActSocialMemberVO.class)
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        return this.communityService.comActSocialMemberSelectAll(commonPage);
    }

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @ApiOperation("详情")
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Long id) {
        return this.communityService.comActSocialMemberSelectOne(id);
    }

    /**
     * 新增数据
     *
     * @param comActSocialMember 实体对象
     * @return 新增结果
     */
    @ApiOperation("新增数据")
    @PostMapping
    public R insert(@RequestBody ComActSocialMemberVO comActSocialMember) {
        return this.communityService.comActSocialMemberInsert(comActSocialMember);
    }

    /**
     * 修改数据
     *
     * @param comActSocialMember 实体对象
     * @return 修改结果
     */
    @ApiOperation("修改数据")
    @PostMapping("/update")
    public R update(@RequestBody ComActSocialMemberVO comActSocialMember) {
        return this.communityService.comActSocialMemberUpdate(comActSocialMember);
    }

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @ApiOperation("删除数据")
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return this.communityService.comActSocialMemberDelete(id);
    }
}

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

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

import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActSocialOrgVO;
import com.panzhihua.common.model.vos.community.ComActVO;
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;

/**
 * @author zzj
 */
@Slf4j
@Api(tags = {"社会组织"})
@RestController
@RequestMapping("/comActSocialOrg")
public class ComActSocialOrgApi extends BaseController {
    @Resource
    private CommunityService communityService;

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @ApiOperation(value = "社会组织列表",response = ComActSocialOrgVO.class)
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        if(this.getCommunityId()!=null){
           R r=communityService.detailCommunity(this.getCommunityId());
           if(R.isOk(r)){
              ComActVO comActVO=JSONObject.parseObject(JSONObject.toJSONString(r.getData()), ComActVO.class);
            if(comActVO!=null){
                commonPage.setStreetId(comActVO.getStreetId());
            }
           }
        }
        return this.communityService.comActSocialOrgSelectAll(commonPage);
    }

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @ApiOperation("通过主键查询单条数据")
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Long id){
        return this.communityService.comActSocialOrgSelectOne(id);
    }
    /**
     * 新增数据
     *
     * @param comActSocialOrg 实体对象
     * @return 新增结果
     */
    @ApiOperation("新增社会组织")
    @PostMapping
    public R insert(@RequestBody ComActSocialOrgVO comActSocialOrg) {
        comActSocialOrg.setCommunityId(this.getCommunityId());
        return this.communityService.comActSocialOrgInsert(comActSocialOrg);
    }

    /**
     * 修改数据
     *
     * @param comActSocialOrg 实体对象
     * @return 修改结果
     */
    @ApiOperation("修改社会组织")
    @PostMapping("/update")
    public R update(@RequestBody ComActSocialOrgVO comActSocialOrg) {
        return this.communityService.comActSocialOrgUpdate(comActSocialOrg);
    }

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @ApiOperation("删除社会组织")
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return this.communityService.comActSocialOrgDelete(id);
    }
}

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

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


import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.social.SocialProjectVO;
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;

/**
 * 三社联动项目表(ComActSocialProject)表控制层
 *
 * @author zzj
 * @since 2021-12-22 14:02:48
 */
@Slf4j
@Api(tags = {"项目管理"})
@RestController
@RequestMapping("comActSocialProject")
public class ComActSocialProjectApi extends BaseController {
    /**
     * 服务对象
     */
    @Resource
    private CommunityService communityService;

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @ApiOperation(value = "分页查询接口",response =SocialProjectVO.class )
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        commonPage.setCommunityId(this.getCommunityId());
        commonPage.setParamId2(0);
        return communityService.selectAllComActSocialProject(commonPage);
    }

    /**
     * 平台详情接口
     *
     * @param id 主键
     * @return 单条数据
     */
    @ApiOperation(value = "平台详情接口",response =SocialProjectVO.class )
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Long id) {
        return communityService.getAppletComActSocialProject(id);
    }
    /**
     * 根据项目id分页获取关联项目
     */
    @ApiOperation(value = "根据项目id分页获取关联项目")
    @PostMapping("/getRelation")
    public R getRelation(@RequestBody CommonPage commonPage){
        return communityService.getRelationComActSocialProject(commonPage);
    }

    /**
     * 新增数据
     *
     * @param socialProjectVO 实体对象
     * @return 新增结果
     */
    @ApiOperation(value = "新增数据")
    @PostMapping
    public R insert(@RequestBody SocialProjectVO socialProjectVO) {
        return communityService.insertComActSocialProject(socialProjectVO);
    }

    /**
     * 修改数据
     *
     * @param socialProjectVO 实体对象
     * @return 修改结果
     */
    @ApiOperation(value = "修改数据")
    @PostMapping("/update")
    public R update(@RequestBody SocialProjectVO socialProjectVO) {
        return communityService.updateComActSocialProject(socialProjectVO);
    }

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @ApiOperation(value = "删除数据")
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return communityService.deleteComActSocialProject(id);
    }

}

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

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


import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.social.ComActSocialProjectMemberVO;
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;

/**
 * 项目人员(ComActSocialProjectMember)表控制层
 *
 * @author makejava
 * @since 2021-12-23 15:16:43
 */
@Slf4j
@Api(tags = {"项目成员管理"})
@RestController
@RequestMapping("comActSocialProjectMember")
public class ComActSocialProjectMemberApi {
    /**
     * 服务对象
     */
    @Resource
    private CommunityService communityService;

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @ApiOperation("分页查询所有数据")
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        return communityService.selectAllComActSocialProjectMember(commonPage);
    }

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @ApiOperation("通过主键查询单条数据")
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Long id) {
        return communityService.selectOneComActSocialProjectMember(id);
    }

    /**
     * 新增数据
     *
     * @param comActSocialProjectMemberVO 实体对象
     * @return 新增结果
     */
    @ApiOperation("新增数据")
    @PostMapping
    public R insert(@RequestBody ComActSocialProjectMemberVO comActSocialProjectMemberVO) {
        return communityService.insertComActSocialProjectMember(comActSocialProjectMemberVO);
    }

    /**
     * 修改数据
     *
     * @param comActSocialProjectMemberVO 实体对象
     * @return 修改结果
     */
    @ApiOperation("修改数据")
    @PostMapping("/update")
    public R update(@RequestBody ComActSocialProjectMemberVO comActSocialProjectMemberVO) {
        return communityService.updateComActSocialProjectMember(comActSocialProjectMemberVO);
    }

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @ApiOperation("删除")
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return communityService.deleteComActSocialProjectMember(id);
    }
}

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

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


import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.social.ComActSocialProjectPublicityVO;
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;
import java.util.List;

/**
 * 项目宣传表(ComActSocialProjectPublicity)表控制层
 *
 * @author makejava
 * @since 2021-12-23 14:30:55
 */
@Slf4j
@Api(tags = {"项目宣传管理"})
@RestController
@RequestMapping("comActSocialProjectPublicity")
public class ComActSocialProjectPublicityApi extends BaseController {
    /**
     * 服务对象
     */
    @Resource
    private CommunityService communityService;

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @ApiOperation(value = "分页查询",response = ComActSocialProjectPublicityVO.class)
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        commonPage.setCommunityId(this.getCommunityId());
        return communityService.selectAllComActSocialProjectPublicity(commonPage);
    }

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @ApiOperation("通过主键查询单条数据")
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Long id) {
        return communityService.selectOneComActSocialProjectPublicity(id);
    }

    /**
     * 新增数据
     *
     * @param comActSocialProjectPublicityVO 实体对象
     * @return 新增结果
     */
    @ApiOperation("新增数据")
    @PostMapping
    public R insert(@RequestBody ComActSocialProjectPublicityVO comActSocialProjectPublicityVO) {
        return communityService.insertComActSocialProjectPublicity(comActSocialProjectPublicityVO);
    }

    /**
     * 修改数据
     *
     * @param comActSocialProjectPublicityVO 实体对象
     * @return 修改结果
     */
    @ApiOperation("修改数据")
    @PostMapping("/update")
    public R update(@RequestBody ComActSocialProjectPublicityVO comActSocialProjectPublicityVO) {
        return communityService.updateComActSocialProjectPublicity(comActSocialProjectPublicityVO);
    }

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @ApiOperation("删除数据")
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return communityService.deleteComActSocialProjectPublicity(id);
    }
    /**
     * 多条删除数据
     *
     * @param ids 主键结合
     * @return 删除结果
     */
    @ApiOperation("多条删除数据")
    @PostMapping("delBatch")
    public R delBatch(@RequestBody List<Long> ids) {
        return communityService.delBatchComActSocialProjectPublicity(ids);
    }
}

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

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


import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.social.ComActSocialProjectScheduleVO;
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;

/**
 * 项目进度表(ComActSocialProjectSchedule)表控制层
 *
 * @author makejava
 * @since 2021-12-23 14:31:16
 */
@Slf4j
@Api(tags = {"项目进度管理"})
@RestController
@RequestMapping("comActSocialProjectSchedule")
public class ComActSocialProjectScheduleApi {
    /**
     * 服务对象
     */
    @Resource
    private CommunityService communityService;

    /**
     * 根据projectId查询所有进度
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @ApiOperation("分页查询")
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        return communityService.selectAllComActSocialProjectSchedule(commonPage);
    }

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @ApiOperation("通过主键查询单条数据")
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Long id) {
        return communityService.selectOneComActSocialProjectSchedule(id);
    }

    /**
     * 新增数据
     *
     * @param comActSocialProjectScheduleVO 实体对象
     * @return 新增结果
     */
    @ApiOperation("新增数据")
    @PostMapping
    public R insert(@RequestBody ComActSocialProjectScheduleVO comActSocialProjectScheduleVO) {
        return communityService.insertComActSocialProjectSchedule(comActSocialProjectScheduleVO);
    }

    /**
     * 修改数据
     *
     * @param comActSocialProjectScheduleVO 实体对象
     * @return 修改结果
     */
    @ApiOperation("修改数据")
    @PostMapping("/update")
    public R update(@RequestBody ComActSocialProjectScheduleVO comActSocialProjectScheduleVO) {
        return communityService.updateComActSocialProjectSchedule(comActSocialProjectScheduleVO);
    }

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @ApiOperation("删除数据")
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return communityService.deleteComActSocialProjectSchedule(id);
    }
}

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

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

import com.alibaba.excel.EasyExcel;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.listen.ComActSocialWorkerExcelListen;
import com.panzhihua.common.model.dtos.civil.*;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.civil.ComActSocialWorkerDetailsVO;
import com.panzhihua.common.model.vos.civil.ComActSocialWorkerVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.ClazzUtils;
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 org.springframework.web.multipart.MultipartFile;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.io.InputStream;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-06-03
 * */
@Slf4j
@RestController
@RequestMapping("/comactsocialworker")
@Api(tags = {"社工"})
public class ComActSocialWorkerApi extends BaseController {

    @Resource
    private CommunityService communityService;

//    @Value("${excel.comactsocialworkerUrl}")
//    private String comactsocialworkerUrl;
    /**
     * 新增社工
     * @param {classNameFirstLower}AddDTO 添加社工传递对象
     * @return 新增结果
     */
    @PostMapping()
    @ApiOperation(value = "新增社工", response = R.class)
    R add(@Validated @RequestBody ComActSocialWorkerAddDTO comActSocialWorkerAddDTO){
        ClazzUtils.setIfStringIsEmpty(comActSocialWorkerAddDTO);
        comActSocialWorkerAddDTO.setUserId(getUserId());
        comActSocialWorkerAddDTO.setCommunityId(getCommunityId());
        return communityService.addComactsocialworker(comActSocialWorkerAddDTO);
    }

    /**
     * 修改
     * @param comActSocialWorkerEditDTO 修改社工传递对象
     * @return 修改结果
     */
    @PutMapping()
    @ApiOperation(value = "编辑社工", response = R.class)
    R edit(@Validated @RequestBody ComActSocialWorkerEditDTO comActSocialWorkerEditDTO){
        comActSocialWorkerEditDTO.setUserId(getUserId());
        return communityService.editComactsocialworker(comActSocialWorkerEditDTO);
    }

    /**
     * 分页查找
     * @param pageComActSocialWorkerDTO 查找社工传递对象
     * @return 查找结果
     */
    @GetMapping()
    @ApiOperation(value = "查询社工", response= ComActSocialWorkerVO.class)
    R query(@Validated @ModelAttribute PageComActSocialWorkerDTO pageComActSocialWorkerDTO){
        ClazzUtils.setIfStringIsEmpty(pageComActSocialWorkerDTO);
        pageComActSocialWorkerDTO.setCommunityId(this.getCommunityId());
        return communityService.queryComactsocialworker(pageComActSocialWorkerDTO);
    }

    /**
     * 删除
     * @param comActSocialWorkerDeleteDTO 删除社工传递对象
     * @return 删除结果
     */
    @DeleteMapping()
    @ApiOperation(value = "删除社工", response = R.class)
    R delete(@Validated @RequestBody ComActSocialWorkerDeleteDTO  comActSocialWorkerDeleteDTO){
        ClazzUtils.setIfStringIsEmpty(comActSocialWorkerDeleteDTO);
        return communityService.deleteComactsocialworker(comActSocialWorkerDeleteDTO);
    }

    /**
     * 查询社工详细信息
     * @param id 社工 id
     * @return 查找结果
     */
    @GetMapping("/{id}")
    @ApiOperation(value = "查询社工详细信息")
    R<ComActSocialWorkerDetailsVO> details(@PathVariable("id") Long id){
        return communityService.comActSocialWorkerDetails(id);
    }

    /**
     * 导入社工名单
     * @return
     */
    @ApiOperation(value = "导入社工名单")
    @PostMapping(value = "/import", consumes = "multipart/*", headers = "content-type=multipart/form-data")
    public R downloadTemplate(@RequestParam MultipartFile file, HttpServletRequest request) {
        String fileName = file.getOriginalFilename();  //获取文件名
        log.info("传入文件名字【{}】",fileName);
        InputStream inputStream = null;
        try {
            inputStream = file.getInputStream();
            EasyExcel.read(inputStream, ComActSocialWorkerExcelVO.class, new ComActSocialWorkerExcelListen(communityService,this.getCommunityId())).sheet().doRead();
        } catch (IOException e) {
            e.printStackTrace();
            log.error("导入模板失败【{}】", e.getMessage());
            return R.fail("信息有误");
        }
        return R.ok();
    }


//    @GetMapping("/getTemplate")
//    @ApiOperation("获取模板")
//    public R getTemplate(){
//        return R.ok(comactsocialworkerUrl);
//    }
    @ApiOperation("根据社工获取活动")
    @PostMapping("/activityList")
    R activityList(@RequestBody CommonPage commonPage){
        return communityService.activityList(commonPage);
    }

}

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

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


import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.social.ComActSocialWorkerServiceVO;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

/**
 * 社工服务表(ComActSocialWorkerService)表控制层
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 社工服务表相关功能
 *
 * @author zzj
 * @since 2022-02-16 15:59:42
 */
@RestController
@RequestMapping("comActSocialWorkerService")
@Api(tags = {"社工服务"})
public class ComActSocialWorkerServiceApi extends BaseController {
    /**
     * 服务对象
     */
    @Resource
    private CommunityService communityService;

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @ApiOperation(value = "分页查询",response = ComActSocialWorkerServiceVO.class)
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        commonPage.setUserId(this.getUserId());
        return this.communityService.selectAllComActSocialWorkerService(commonPage);
    }

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @ApiOperation(value = "分页查询",response = ComActSocialWorkerServiceVO.class)
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Long id) {
        return this.communityService.selectOneComActSocialWorkerService(id);
    }


    /**
     * 修改数据
     *
     * @param comActSocialWorkerServiceVO 实体对象
     * @return 修改结果
     */
    @ApiOperation("修改数据")
    @PostMapping("/update")
    public R update(@RequestBody ComActSocialWorkerServiceVO comActSocialWorkerServiceVO) {
       return communityService.updateComActSocialWorkerService(comActSocialWorkerServiceVO);
    }
}

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

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

import static java.util.Objects.isNull;
import static java.util.Objects.nonNull;

import javax.annotation.Resource;
import javax.validation.Valid;

import com.panzhihua.common.model.dtos.community.fms.AddFmsServiceAdminDTO;
import com.panzhihua.common.model.dtos.community.fms.ApplyFmsServiceDTO;
import com.panzhihua.common.model.dtos.community.fms.ApprovalFmsServiceAdminDTO;
import com.panzhihua.common.model.dtos.community.fms.EvaluationFmsServiceDTO;
import com.panzhihua.common.model.dtos.community.fms.FeedbackFmsServiceDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.community.ComActActEvaluateVO;
import com.panzhihua.common.model.vos.community.fms.CascadeCommVO;
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.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.fms.PageFmsClassroomAdminDTO;
import com.panzhihua.common.model.dtos.community.fms.PageFmsEventAdminDTO;
import com.panzhihua.common.model.dtos.community.fms.PageFmsServiceAppletsDTO;
import com.panzhihua.common.model.dtos.community.fms.PageFmsTeamDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.fms.ComFmsClassroomVO;
import com.panzhihua.common.model.vos.community.fms.ComFmsServiceVO;
import com.panzhihua.common.model.vos.community.fms.ComFmsTeamTypeVO;
import com.panzhihua.common.model.vos.community.fms.ComFmsTeamVO;
import com.panzhihua.common.model.vos.grid.EventDetailsVO;
import com.panzhihua.common.model.vos.grid.EventVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.grid.GridService;

import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;

/**
 * @title: ComFmsApi
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 五微服务相关接口
 * @author: hans
 * @date: 2022/02/11 13:23
 */
@Slf4j
@Api(tags = {"五微服务"})
@RestController
@RequestMapping("/fms")
public class ComFmsApi extends BaseController {

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

    @ApiOperation(value = "获取团队类型列表", response = ComFmsTeamTypeVO.class)
    @ApiImplicitParam(name = "communityId", value = "社区id", required = true)
    @GetMapping("/teamType/list")
    public R listFmsTeamType(@RequestParam(value = "communityId", required = false) Long communityId) {
        LoginUserInfoVO userInfo = this.getLoginUserInfoSureNoLogin();
        if (isNull(userInfo) && isNull(communityId)) {
            return R.fail("社区id不能为空");
        }
        if (nonNull(userInfo)) {
            communityId = userInfo.getCommunityId();
        }
        return communityService.listFmsTeamType(communityId);
    }

    @ApiOperation(value = "分页/全部查询团队信息", response = ComFmsTeamVO.class)
    @PostMapping("/team/page")
    public R pageFmsTeam(@RequestBody PageFmsTeamDTO pageFmsTeamDTO) {
        LoginUserInfoVO userInfo = this.getLoginUserInfoSureNoLogin();
        if (isNull(userInfo) && isNull(pageFmsTeamDTO.getCommunityId())) {
            return R.fail("社区id不能为空");
        }
        if (nonNull(userInfo)) {
            pageFmsTeamDTO.setCommunityId(userInfo.getCommunityId());
        }
        return communityService.pageFmsTeamApplets(pageFmsTeamDTO);
    }

    @ApiOperation(value = "分页查询微讲堂", response = ComFmsClassroomVO.class)
    @PostMapping("/classroom/page")
    public R pageFmsClassroom(@RequestBody @Valid PageFmsClassroomAdminDTO adminDTO) {
        LoginUserInfoVO userInfo = this.getLoginUserInfoSureNoLogin();
        if (isNull(userInfo) && isNull(adminDTO.getCommunityId())) {
            return R.fail("社区id不能为空");
        }
        if (nonNull(userInfo)) {
            adminDTO.setCommunityId(userInfo.getCommunityId());
        }
        return communityService.pageFmsClassroomAdmin(adminDTO);
    }

    @ApiOperation(value = "获取微讲堂详情", response = ComFmsClassroomVO.class)
    @ApiImplicitParam(name = "id", value = "微讲堂id", required = true)
    @GetMapping("/classroom/detail")
    public R detailFmsClassroom(@RequestParam("id") Long id) {
        return communityService.detailFmsClassroomApplets(id);
    }

    @ApiOperation(value = "分页查询微调节/微防控", response = EventVO.class)
    @PostMapping("/event/page")
    public R pageFmsEvent(@RequestBody @Valid PageFmsEventAdminDTO adminDTO) {
        LoginUserInfoVO userInfo = this.getLoginUserInfoSureNoLogin();
        if (isNull(userInfo) && isNull(adminDTO.getCommunityId())) {
            return R.fail("社区id不能为空");
        }
        if (nonNull(userInfo)) {
            adminDTO.setCommunityId(userInfo.getCommunityId());
        }
        return communityService.pageFmsEventApplets(adminDTO);
    }

    @ApiOperation(value = "微调节/微防控事件详情", response = EventDetailsVO.class)
    @ApiImplicitParam(name = "eventId", value = "事件id", required = true)
    @GetMapping("/event/detail")
    public R detailFmsEvent(@RequestParam("eventId") Long eventId) {
        return gridService.eventDetails(eventId);
    }

    @ApiOperation(value = "分页查询微服务", response = ComFmsServiceVO.class)
    @PostMapping("/service/page")
    public R pageFmsService(@RequestBody @Valid PageFmsServiceAppletsDTO adminDTO) {
        LoginUserInfoVO userInfo = this.getLoginUserInfoSureNoLogin();
        if (isNull(userInfo) && isNull(adminDTO.getCommunityId())) {
            return R.fail("社区id不能为空");
        }
        if (nonNull(userInfo)) {
            adminDTO.setCommunityId(userInfo.getCommunityId());
        }
        return communityService.pageFmsServiceApplets(adminDTO);
    }

    @ApiOperation(value = "查看微服务详情", response = ComFmsServiceVO.class)
    @ApiImplicitParam(name = "serviceId", value = "服务id", required = true)
    @GetMapping("/service/detail")
    public R detailFmsService(@RequestParam("serviceId") Long serviceId) {
        LoginUserInfoVO userInfo = this.getLoginUserInfoSureNoLogin();
        Long userId = null;
        if (nonNull(userInfo)) {
            userId = userInfo.getUserId();
        }
        return communityService.detailFmsServiceApplets(serviceId, userId);
    }

    @ApiOperation("微服务申请")
    @PostMapping("/service/apply")
    public R applyFmsService(@RequestBody @Valid ApplyFmsServiceDTO adminDTO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        adminDTO.setUserInfo(loginUserInfo);
        return communityService.applyFmsService(adminDTO);
    }

    @ApiOperation(value = "分页查询我的微服务", response = ComFmsServiceVO.class)
    @PostMapping("/service/pageMy")
    public R pageMyFmsService(@RequestBody @Valid PageFmsServiceAppletsDTO adminDTO) {
        adminDTO.setCommunityId(this.getCommunityId());
        adminDTO.setUserId(this.getUserId());
        return communityService.pageMyFmsService(adminDTO);
    }

    @ApiOperation(value = "微服务评价")
    @PostMapping("/service/evaluate")
    public R evaluateFmsService(@RequestBody @Valid EvaluationFmsServiceDTO evaluationFmsServiceDTO) {
        evaluationFmsServiceDTO.setUserId(this.getUserId());
        return communityService.evaluateFmsService(evaluationFmsServiceDTO);
    }

    @ApiOperation(value = "微团队成员分页查询服务处理", response = ComFmsServiceVO.class)
    @PostMapping("/service/pageDeal")
    public R pageDealFmsService(@RequestBody @Valid PageFmsServiceAppletsDTO adminDTO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        adminDTO.setCommunityId(loginUserInfo.getCommunityId());
        adminDTO.setUserId(loginUserInfo.getUserId());
        adminDTO.setUserInfo(loginUserInfo);
        return communityService.pageDealFmsService(adminDTO);
    }

    @ApiOperation(value = "微团队成员服务反馈", response = ComFmsServiceVO.class)
    @PostMapping("/service/feedback")
    public R feedbackFmsService(@RequestBody @Valid FeedbackFmsServiceDTO adminDTO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        adminDTO.setUserId(loginUserInfo.getUserId());
        adminDTO.setUserInfo(loginUserInfo);
        return communityService.feedbackFmsService(adminDTO);
    }

    @ApiOperation("核实微服务")
    @PostMapping("/service/approval")
    public R approvalFmsService(@RequestBody @Valid ApprovalFmsServiceAdminDTO adminDTO) {
        if (adminDTO.getIsPass() && isNull(adminDTO.getMemberId())) {
            return R.fail("未分配服务人员");
        }
        adminDTO.setUpdatedBy(this.getUserId());
        return communityService.approvalFmsService(adminDTO);
    }

    @ApiOperation("后台新增微服务")
    @PostMapping("/service/add")
    public R addFmsService(@RequestBody @Valid AddFmsServiceAdminDTO adminDTO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        adminDTO.setCommunityId(loginUserInfo.getCommunityId());
        adminDTO.setCreatedBy(loginUserInfo.getUserId());
        adminDTO.setUpdatedBy(loginUserInfo.getUserId());
        return communityService.addFmsServiceAdmin(adminDTO);
    }

}

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

@@ -15,6 +15,7 @@

import com.panzhihua.applets.config.MinioUtil;
import com.panzhihua.common.controller.BaseController;
import net.coobird.thumbnailator.Thumbnails;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang3.RandomUtils;
import org.springframework.beans.factory.annotation.Value;
@@ -76,6 +77,8 @@
    private int port;
    @Value("${ftp.url}")
    private String url;
    @Value("${minio.url}")
    private String minUrl;
    @Resource
    private WxMaConfiguration wxMaConfiguration;
    @Resource
@@ -160,6 +163,24 @@
        }
    }

    @ApiOperation(value = "新上传照片压缩接口")
    @PostMapping(value = "/uploadimagescompress", consumes = "multipart/*", headers = "content-type=multipart/form-date")
    public R uploadImagesComPress(@RequestParam MultipartFile file, HttpServletRequest request) {
        try {
            String extension = FilenameUtils.getExtension(file.getOriginalFilename());
            String uuid=UUID.randomUUID().toString().replaceAll("-", "");
            String name = uuid  + "."+ extension;
            minioUtil.upload(file, name);
            Thumbnails.of(file.getInputStream()).scale(0.3).outputQuality(0.51).outputFormat("jpg").toFile(uuid+"_compress");
            File file1=new File(uuid+"_compress.jpg");
            String imageUrl = minioUtil.uploadFile(file1, uuid+"_compress.jpg");
            return R.ok(imageUrl);
        } catch (Exception e) {
            log.error("上传照片失败【{}】", e.getMessage());
            return R.fail();
        }
    }

    @ApiOperation(value = "发送验证码")
    @PostMapping(value = "smscode")
    public R smscode(@RequestBody UserPhoneVO userPhoneVO) {

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

@@ -4,7 +4,14 @@

import javax.annotation.Resource;

import com.panzhihua.common.model.dtos.common.PageComMngVolunteerOrgTeamDto;
import com.panzhihua.common.model.dtos.common.PageComMngVolunteerServiceTypeDto;
import com.panzhihua.common.model.dtos.common.PageComMngVolunteerSkillDto;
import com.panzhihua.common.model.vos.common.ComMngVolunteerOrgTeamVo;
import com.panzhihua.common.model.vos.common.ComMngVolunteerServiceTypeVo;
import com.panzhihua.common.model.vos.common.ComMngVolunteerSkillVo;
import com.panzhihua.common.model.vos.community.*;
import org.springframework.util.ObjectUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -282,6 +289,31 @@
        return communityService.detailVolunteer(id);
    }

    @ApiOperation(value = "查询志愿者组织列表", response = ComMngVolunteerOrgTeamVo.class)
    @GetMapping("/volunteer/org/list")
    public R listVolunteerOrgAdmin() {
        PageComMngVolunteerOrgTeamDto orgTeamDto = new PageComMngVolunteerOrgTeamDto();
        orgTeamDto.setParentId(0L);
        orgTeamDto.setCommunityId(this.getCommunityId());
        return communityService.listVolunteerOrgAdmin(orgTeamDto);
    }

    @ApiOperation(value = "查询志愿者服务类型列表", response = ComMngVolunteerServiceTypeVo.class)
    @GetMapping("/volunteer/service/type/list")
    public R listVolunteerServiceTypeAdmin() {
        PageComMngVolunteerServiceTypeDto serviceTypeDto = new PageComMngVolunteerServiceTypeDto();
        serviceTypeDto.setCommunityId(this.getCommunityId());
        return communityService.listServiceTypeAdmin(serviceTypeDto);
    }

    @ApiOperation(value = "查询志愿者技能列表", response = ComMngVolunteerSkillVo.class)
    @GetMapping("/volunteer/skill/list")
    public R listVolunteerSkillAdmin() {
        PageComMngVolunteerSkillDto volunteerSkillDto = new PageComMngVolunteerSkillDto();
        volunteerSkillDto.setCommunityId(this.getCommunityId());
        return communityService.listVolunteerSkillAdmin(volunteerSkillDto);
    }

    @ApiOperation(value = "车辆登记")
    @PostMapping("car/register")
    public R addComMngCar(@Validated(AddGroup.class) @RequestBody ComMngCarAppletDTO comMngCarAppletDTO) {
@@ -315,4 +347,13 @@
    public R detailCommunity() {
        return communityService.detailCommunity(this.getCommunityId());
    }

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

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

@@ -269,14 +269,13 @@
    }

    @ApiOperation(value = "我的活动", response = ComActActivityVO.class)
    @ApiImplicitParam(name = "status", value = "活动状态（4 进行中 5 已结束 6 已取消）", required = false)
    @GetMapping("listactivity")
    public R listActivity(@RequestParam(value = "status", required = false) Integer status) {
    public R listActivity(@RequestParam(value = "status", required = false) Integer status,@RequestParam(value = "type", required = false) Integer type) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        Long userId = loginUserInfo.getUserId();
        Long communityId = loginUserInfo.getCommunityId();
        List<ComActActivityVO> comActActivityVOS = new ArrayList<>();
        R r = communityService.listActivity(userId, status);
        R r = communityService.listActivity(userId, status,type);
        if (R.isOk(r)&&r.getData()!=null) {
            comActActivityVOS = (List<ComActActivityVO>)r.getData();
        }

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/MinioUtil.java

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

import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.*;
import java.net.URLEncoder;
import java.util.UUID;

@@ -72,6 +70,40 @@
        }
        return null;
    }
    /**
     * 文件上传
     *
     * @param file
     *            要上传的文件
     * @return
     */
    public String uploadFile(File file, String name) {
        if (null != file) {
            try {
                UUID uuid = UUID.randomUUID();
                StringBuilder s = new StringBuilder();
                s.append(uuid.toString().replace("-", "")).append("/");
                MinioClient minioClient = new MinioClient(minioProperties.getHost(), minioProperties.getAccessKey(),
                        minioProperties.getSecretKey());
                // bucket 不存在，创建
                if (!minioClient.bucketExists(minioProperties.getBucket())) {
                    minioClient.makeBucket(minioProperties.getBucket());
                }
                // 得到文件流
                InputStream input = new FileInputStream(file);
                // 文件名
                // String fileName = uuid + "/images." + FilenameUtils.getExtension(file.getOriginalFilename());
                String fileName = s.append(name).toString();
                minioClient.putObject(minioProperties.getBucket(), fileName, input, "");
                StringBuilder fileUrl = new StringBuilder(minioProperties.getUrl());
                String url = fileUrl.append(fileName).toString();
                return url;
            } catch (Exception e) {
                e.printStackTrace();
            }
        }
        return null;
    }

    /**
     * 文件下载

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

@@ -4,6 +4,7 @@

import javax.annotation.Resource;

import com.alibaba.fastjson.JSONObject;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -50,19 +51,7 @@
    @ApiOperation(value = "新增街道", response = ComStreetVO.class)
    @PostMapping("addstreet")
    public R pageStreet(@RequestBody ComStreetVO comStreetVO) {
        R r = communityService.addStreet(comStreetVO);
//        if (R.isOk(r)) {
//            AdministratorsUserVO administratorsUserVO = new AdministratorsUserVO();
//            administratorsUserVO.setAccount(comStreetVO.getAccount());
//            administratorsUserVO.setPassword(comStreetVO.getPassword());
//            administratorsUserVO.setType(4);
//            administratorsUserVO.setAreaId(null);
//            administratorsUserVO.setStatus(1);
//            administratorsUserVO.setRoleId(999999999l);
//            administratorsUserVO.setUserId(this.getUserId());
//            administratorsUserVO.setCommunityId(this.getCommunityId());
//            userService.addUserBackstage(administratorsUserVO);
//        }
        R<ComStreetVO> r = communityService.addStreet(comStreetVO);
        return r;
    }


 springcloud_k8s_panzhihuazhihuishequ/common/pom.xml

@@ -36,6 +36,11 @@
            <artifactId>tomcat-embed-core</artifactId>
        </dependency>
        <dependency>
            <groupId>net.coobird</groupId>
            <artifactId>thumbnailator</artifactId>
            <version>0.4.8</version>
        </dependency>
        <dependency>
            <groupId>org.apache.commons</groupId>
            <artifactId>commons-lang3</artifactId>
        </dependency>

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

@@ -137,6 +137,10 @@
     */
    public static final String CONVENIENT_MERCHANT_ROLE_KEY = "convenient_merchant_platform";
    /**
     * 街道超级管理员
     */
    public static final String STREET_ROLE_KEY="street_member";
    /**
     * 首页商城是否展示（1.是 2.否）
     */
    public static final Integer IS_SHOP_OPEN = 2;
@@ -190,12 +194,17 @@

    public static final String CLUSTER_MEMBER_ERROR_LIST = "CLUSTER_MEMBER_ERROR_LIST_";

    public static final String COM_MNG_VOLUNTEER_ERROR_LIST = "COM_MNG_VOLUNTEER_ERROR_LIST_";

    public static final String PB_CHECK_UNIT_ERROR_LIST = "PB_CHECK_UNIT_ERROR_LIST_";

    public static final String PB_MEMBER_ROLE_ERROR_LIST = "PB_MEMBER_ROLE_ERROR_LIST_";

    public static final String CLUSTER_MEMBER_DEFAULT_IMAGE_URL = "https://www.psciio.com/files/4822602b68af48bcbbea7842aa463227/a6a7882b3fd24d60ac6809fef42d879d.png";

    public static final String FMS_MEMBER_ERROR_LIST = "FMS_MEMBER_ERROR_LIST_";
    public static final String FMS_SERVICE_ERROR_LIST = "FMS_SERVICE_ERROR_LIST_";

    /**
     * 高德地图获取天气url
     */

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/controller/BaseController.java

@@ -19,6 +19,9 @@
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;

import static java.util.Objects.isNull;
import static org.apache.commons.lang3.StringUtils.isBlank;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 基础controller
@@ -113,14 +116,13 @@
            else {
                return "510423";
            }
        }
        else {
        } else {
            LoginUserInfoVO loginUserInfoVO=this.getLoginUserInfo();
            ComActVO comActVO=loginUserInfoVO.getComActVO();
            if(comActVO!=null){
                return comActVO.getAreaCode();
            if(isNull(comActVO) || isBlank(comActVO.getAreaCode())){
                return "510423";
            }
            return "510423";
            return comActVO.getAreaCode();
        }
    }


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

@@ -12,4 +12,8 @@
     * 物业宣传
     */
    public static Integer PROPERTY_PUBLICITY = 1;
    /**
     * 五微服务-微讲堂
     */
    public static Integer FMS_CLASSROOM = 2;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComActSocialWorkerExcelListen.java

New file
@@ -0,0 +1,61 @@
package com.panzhihua.common.listen;

import com.alibaba.excel.context.AnalysisContext;
import com.alibaba.excel.event.AnalysisEventListener;
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.dtos.civil.ComActSocialWorkerExcelVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComCvtServeExcelVO;
import com.panzhihua.common.service.community.CommunityService;
import lombok.extern.slf4j.Slf4j;

import java.util.ArrayList;
import java.util.List;

/**
 * @description: 便民服务导入监听
 * @author: Null
 * @date: 2021/3/11 13:26
 */
@Slf4j
public class ComActSocialWorkerExcelListen extends AnalysisEventListener<ComActSocialWorkerExcelVO> {

    private CommunityService communityService;

    private Long communityId;

    public ComActSocialWorkerExcelListen(CommunityService communityService, Long communityId) {
        this.communityService = communityService;
        this.communityId = communityId;
    }


    private static final int BATCH_COUNT = 5000;
    private List<ComActSocialWorkerExcelVO> list = new ArrayList<>();

    @Override
    public void invoke(ComActSocialWorkerExcelVO comActSocialWorkerExcelVO, AnalysisContext analysisContext) {
        list.add(comActSocialWorkerExcelVO);
        // 达到BATCH_COUNT了，需要去存储一次数据库，防止数据几万条数据在内存，容易OOM
        if (list.size() >= BATCH_COUNT) {
            log.info("excel导入数据【{}】", JSONObject.toJSONString(list));
            R r = this.communityService.listSaveSocialWorkerExcelVO(list, this.communityId);
            if (!R.isOk(r)) {
                throw new ServiceException(r.getMsg());
            }
            //清空list
            list.clear();
        }

    }

    @Override
    public void doAfterAllAnalysed(AnalysisContext analysisContext) {
        log.info("excel导入数据【{}】", JSONObject.toJSONString(list));
        R r = this.communityService.listSaveSocialWorkerExcelVO(list, this.communityId);//确保最后遗留的数据保存在数据库中
        if (!R.isOk(r)) {
            throw new ServiceException(r.getMsg());
        }
    }
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComFmsServiceImportExcelListen.java

New file
@@ -0,0 +1,176 @@
package com.panzhihua.common.listen;

import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;

import cn.hutool.core.date.DateUtil;
import com.panzhihua.common.utlis.ValidateUtils;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.data.redis.core.ValueOperations;

import com.alibaba.excel.context.AnalysisContext;
import com.alibaba.excel.event.AnalysisEventListener;
import com.alibaba.fastjson.JSONArray;
import com.google.common.collect.Lists;
import com.panzhihua.common.constants.Constants;
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.fms.ComFmsServiceImportExcelVO;
import com.panzhihua.common.model.vos.community.fms.ComFmsServiceImportMistakeExcelVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.StringUtils;

import lombok.extern.slf4j.Slf4j;

/**
 * @title: ComFmsTeamMemberImportExcelListen
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 五微服务-微服务导入监听
 * @author: hans
 * @date: 2022/02/15 10:16
 */
@Slf4j
public class ComFmsServiceImportExcelListen extends AnalysisEventListener<Map<Integer, String>> {
    /**
     * 每隔5条存储数据库，实际使用中可以3000条，然后清理list ，方便内存回收
     */
    private static final int BATCH_COUNT = 5000;
    private static int headSize = 0;
    List<Map<Integer, String>> list = new ArrayList<Map<Integer, String>>();
    private CommunityService communityService;
    private Long communityId;
    private Long userId;
    private Map<Integer, String> headData;
    private StringRedisTemplate stringRedisTemplate;

    public ComFmsServiceImportExcelListen(CommunityService communityService, Long communityId, Long userId,
                                          StringRedisTemplate stringRedisTemplate) {
        this.communityService = communityService;
        this.communityId = communityId;
        this.userId = userId;
        this.stringRedisTemplate = stringRedisTemplate;
    }

    @Override
    public void invoke(Map<Integer, String> data, AnalysisContext context) {
        list.add(data);
        if (list.size() >= BATCH_COUNT) {
            saveData();
            list.clear();
        }
    }

    /**
     * 这里会一行行的返回头
     *
     * @param headMap
     * @param context
     */
    @Override
    public void invokeHeadMap(Map<Integer, String> headMap, AnalysisContext context) {
        headSize = headMap.size();
        headData = headMap;
    }

    @Override
    public void doAfterAllAnalysed(AnalysisContext context) {
        saveData();
        log.info("所有数据解析完成！");
    }

    /**
     * 不是固定的列只能手动处理
     */
    private void saveData() {
        log.info("开始导入微服务数据");
        log.info("表格总数据：" + list.size());
        if (list.size() == 0) {
            throw new ServiceException("100", "导入数据为空！");
        }
        ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
        String key = Constants.FMS_SERVICE_ERROR_LIST + communityId;

        int index = 2;
        try {
            String[] parsePatterns = new String[] {"yyyy-MM-dd", "yyyy-M-dd", "yyyy-MM-d", "yyyy-M-d", "yyyy/MM/dd",
                    "yyyy/M/dd", "yyyy/MM/d", "yyyy/M/d"};
            ArrayList<ComFmsServiceImportExcelVO> voList = Lists.newArrayList();
            ArrayList<ComFmsServiceImportMistakeExcelVO> mistakes = Lists.newArrayList();
            for (Map<Integer, String> oneData : list) {
                ComFmsServiceImportExcelVO vo = new ComFmsServiceImportExcelVO();
                vo.setUserName(oneData.get(0));
                if (StringUtils.isNotEmpty(oneData.get(1)) && !ValidateUtils.assertPhoneIsValid(oneData.get(1))) {
                    ComFmsServiceImportMistakeExcelVO mistake = new ComFmsServiceImportMistakeExcelVO();
                    index++;
                    setServiceImportMistake(oneData, mistake);
                    mistake.setMistake("联系电话有误，请检查");
                    mistakes.add(mistake);
                    continue;
                }
                vo.setPhone(oneData.get(1));
                if (StringUtils.isEmpty(oneData.get(2))) {
                    ComFmsServiceImportMistakeExcelVO mistake = new ComFmsServiceImportMistakeExcelVO();
                    index++;
                    setServiceImportMistake(oneData, mistake);
                    mistake.setMistake("服务时间不可为空，请填写服务时间");
                    mistakes.add(mistake);
                    continue;
                }
                vo.setServiceAt(DateUtil.parse(oneData.get(2).trim(), parsePatterns));

                if (StringUtils.isEmpty(oneData.get(3))) {
                    ComFmsServiceImportMistakeExcelVO mistake = new ComFmsServiceImportMistakeExcelVO();
                    index++;
                    setServiceImportMistake(oneData, mistake);
                    mistake.setMistake("服务内容不可为空，请填写服务内容");
                    mistakes.add(mistake);
                    continue;
                }
                vo.setServiceContent(oneData.get(3));

                if (StringUtils.isEmpty(oneData.get(4))) {
                    ComFmsServiceImportMistakeExcelVO mistake = new ComFmsServiceImportMistakeExcelVO();
                    index++;
                    setServiceImportMistake(oneData, mistake);
                    mistake.setMistake("服务过程不可为空，请填写服务过程");
                    mistakes.add(mistake);
                    continue;
                }
                vo.setServiceProcess(oneData.get(4));
                voList.add(vo);
                index++;
            }
            if (!voList.isEmpty()) {
                log.info("开始进入业务层处理逻辑");
                R r = communityService.listSaveFmsServiceExcelVO(voList, communityId, userId);
                log.info("业务层处理逻辑完成");
                if (R.isOk(r)) {
                    log.info("业务层处理成功");
                } else {
                    log.info("业务层处理逻辑失败");
                }
            }
            if (!mistakes.isEmpty()) {
                log.info("将错误数据缓存到redis中");
                valueOperations.set(key, JSONArray.toJSONString(mistakes), 1, TimeUnit.HOURS);
                log.info("将错误数据缓存到redis中成功");
                throw new ServiceException("500", key);
            }
        } catch (NumberFormatException e) {
            log.info("处理数据时失败");
            e.printStackTrace();
            log.error("数据格式有误，第" + index + "行");
            throw new ServiceException("500", "导入失败111");
        }
    }

    private void setServiceImportMistake(Map<Integer, String> map, ComFmsServiceImportMistakeExcelVO vo) {
        vo.setUserName(map.get(0));
        vo.setPhone(map.get(1));
        vo.setServiceAt(map.get(2));
        vo.setServiceContent(map.get(3));
        vo.setServiceProcess(map.get(4));
    }
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComFmsTeamMemberImportExcelListen.java

New file
@@ -0,0 +1,188 @@
package com.panzhihua.common.listen;

import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;

import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.data.redis.core.ValueOperations;

import com.alibaba.excel.context.AnalysisContext;
import com.alibaba.excel.event.AnalysisEventListener;
import com.alibaba.fastjson.JSONArray;
import com.google.common.collect.Lists;
import com.panzhihua.common.constants.Constants;
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.fms.ComFmsTeamMemberImportExcelVO;
import com.panzhihua.common.model.vos.community.fms.ComFmsTeamMemberImportMistakeExcelVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.StringUtils;

import cn.hutool.core.util.IdcardUtil;
import lombok.extern.slf4j.Slf4j;

/**
 * @title: ComFmsTeamMemberImportExcelListen
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 五微服务-团队成员导入监听
 * @author: hans
 * @date: 2022/02/15 10:16
 */
@Slf4j
public class ComFmsTeamMemberImportExcelListen extends AnalysisEventListener<Map<Integer, String>> {
    /**
     * 每隔5条存储数据库，实际使用中可以3000条，然后清理list ，方便内存回收
     */
    private static final int BATCH_COUNT = 5000;
    private static int headSize = 0;
    List<Map<Integer, String>> list = new ArrayList<Map<Integer, String>>();
    private CommunityService communityService;
    private Long communityId;
    private Long userId;
    private Map<Integer, String> headData;
    private StringRedisTemplate stringRedisTemplate;

    public ComFmsTeamMemberImportExcelListen(CommunityService communityService, Long communityId, Long userId,
                                             StringRedisTemplate stringRedisTemplate) {
        this.communityService = communityService;
        this.communityId = communityId;
        this.userId = userId;
        this.stringRedisTemplate = stringRedisTemplate;
    }

    @Override
    public void invoke(Map<Integer, String> data, AnalysisContext context) {
        list.add(data);
        if (list.size() >= BATCH_COUNT) {
            saveData();
            list.clear();
        }
    }

    /**
     * 这里会一行行的返回头
     *
     * @param headMap
     * @param context
     */
    @Override
    public void invokeHeadMap(Map<Integer, String> headMap, AnalysisContext context) {
        headSize = headMap.size();
        headData = headMap;
    }

    @Override
    public void doAfterAllAnalysed(AnalysisContext context) {
        saveData();
        log.info("所有数据解析完成！");
    }

    /**
     * 不是固定的列只能手动处理
     */
    private void saveData() {
        log.info("开始导入团队成员数据");
        log.info("表格总数据：" + list.size());
        if (list.size() == 0) {
            throw new ServiceException("100", "导入数据为空！");
        }
        ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
        String key = Constants.FMS_MEMBER_ERROR_LIST + communityId;

        int index = 2;
        try {
            ArrayList<ComFmsTeamMemberImportExcelVO> voList = Lists.newArrayList();
            ArrayList<ComFmsTeamMemberImportMistakeExcelVO> mistakes = Lists.newArrayList();
            for (Map<Integer, String> oneData : list) {
                ComFmsTeamMemberImportExcelVO vo = new ComFmsTeamMemberImportExcelVO();
                if (StringUtils.isEmpty(oneData.get(0))) {
                    ComFmsTeamMemberImportMistakeExcelVO mistake = new ComFmsTeamMemberImportMistakeExcelVO();
                    index++;
                    setMemberImportMistake(oneData, mistake);
                    mistake.setMistake("团队类型不可为空，请填写团队类型");
                    mistakes.add(mistake);
                    continue;
                }
                vo.setTeamType(oneData.get(0));
                if (StringUtils.isEmpty(oneData.get(1))) {
                    ComFmsTeamMemberImportMistakeExcelVO mistake = new ComFmsTeamMemberImportMistakeExcelVO();
                    index++;
                    setMemberImportMistake(oneData, mistake);
                    mistake.setMistake("团队名称不可为空，请填写团队名称");
                    mistakes.add(mistake);
                    continue;
                }
                vo.setTeamName(oneData.get(1));

                if (StringUtils.isEmpty(oneData.get(2))) {
                    ComFmsTeamMemberImportMistakeExcelVO mistake = new ComFmsTeamMemberImportMistakeExcelVO();
                    index++;
                    setMemberImportMistake(oneData, mistake);
                    mistake.setMistake("团队成员不可为空，请填写团队成员");
                    mistakes.add(mistake);
                    continue;
                }
                vo.setTeamMember(oneData.get(2));

                if (StringUtils.isNotEmpty(oneData.get(3))) {
                    // 判断身份证号码位数
                    if (!IdcardUtil.isValidCard(oneData.get(3))) {
                        ComFmsTeamMemberImportMistakeExcelVO mistake = new ComFmsTeamMemberImportMistakeExcelVO();
                        index++;
                        setMemberImportMistake(oneData, mistake);
                        mistake.setMistake("身份证号有误，请检查身份证号码是否正确");
                        mistakes.add(mistake);
                        continue;
                    }
                    vo.setIdCard(oneData.get(3).toUpperCase());
                }

                if (StringUtils.isEmpty(oneData.get(4))) {
                    ComFmsTeamMemberImportMistakeExcelVO mistake = new ComFmsTeamMemberImportMistakeExcelVO();
                    index++;
                    setMemberImportMistake(oneData, mistake);
                    mistake.setMistake("联系电话不可为空，请填写联系电话");
                    mistakes.add(mistake);
                    continue;
                }
                vo.setPhone(oneData.get(4));
                voList.add(vo);
                index++;
            }
            if (!voList.isEmpty()) {
                log.info("开始进入业务层处理逻辑");
                R r = communityService.listSaveFmsTeamMemberExcelVO(voList, communityId, userId);
                log.info("业务层处理逻辑完成");
                if (R.isOk(r)) {
                    log.info("业务层处理成功");
                    List<ComFmsTeamMemberImportMistakeExcelVO> list =
                            JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComFmsTeamMemberImportMistakeExcelVO.class);
                    mistakes.addAll(list);
                } else {
                    log.info("业务层处理逻辑失败");
                }
            }
            if (!mistakes.isEmpty()) {
                log.info("将错误数据存入redis中");
                valueOperations.set(key, JSONArray.toJSONString(mistakes), 1, TimeUnit.HOURS);
                log.info("将错误数据存入redis中成功");
                throw new ServiceException("500", key);
            }
        } catch (NumberFormatException e) {
            log.info("处理数据时失败");
            e.printStackTrace();
            log.error("数据格式有误，第" + index + "行");
            throw new ServiceException("500", "导入失败111");
        }
    }

    private void setMemberImportMistake(Map<Integer, String> map, ComFmsTeamMemberImportMistakeExcelVO vo) {
        vo.setTeamType(map.get(0));
        vo.setTeamName(map.get(1));
        vo.setTeamMember(map.get(2));
        vo.setIdCard(map.get(3));
        vo.setPhone(map.get(4));
    }
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngVolunteerExcelListen.java

New file
@@ -0,0 +1,211 @@
package com.panzhihua.common.listen;

import com.alibaba.excel.context.AnalysisContext;
import com.alibaba.excel.event.AnalysisEventListener;
import com.alibaba.fastjson.JSONArray;
import com.google.common.collect.Lists;
import com.panzhihua.common.constants.Constants;
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.volunteer.ComMngVolunteerErrorExcelVO;
import com.panzhihua.common.model.vos.community.volunteer.ComMngVolunteerExcelVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.ListUtils;
import com.panzhihua.common.utlis.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.data.redis.core.ValueOperations;

import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;

/**
 * title: 志愿者导入监听
 * @author : lyq
 */
@Slf4j
public class ComMngVolunteerExcelListen extends AnalysisEventListener<Map<Integer, String>> {
    /**
     * 每隔5条存储数据库，实际使用中可以3000条，然后清理list ，方便内存回收
     */
    private static final int BATCH_COUNT = 3000;
    private static int headSize = 0;
    List<Map<Integer, String>> list = new ArrayList<Map<Integer, String>>();
    private CommunityService communityService;
    private Long communityId;
    private Long userId;
    private Map<Integer, String> headData;
    private StringRedisTemplate stringRedisTemplate;

    public ComMngVolunteerExcelListen(CommunityService communityService, Long communityId, Long userId,
                                      StringRedisTemplate stringRedisTemplate) {
        this.communityService = communityService;
        this.communityId = communityId;
        this.userId = userId;
        this.stringRedisTemplate = stringRedisTemplate;
    }

    @Override
    public void invoke(Map<Integer, String> data, AnalysisContext context) {
        list.add(data);
        if (list.size() >= BATCH_COUNT) {
            saveData();
            list.clear();
        }
    }

    /**
     * 这里会一行行的返回头
     *
     * @param headMap
     * @param context
     */
    @Override
    public void invokeHeadMap(Map<Integer, String> headMap, AnalysisContext context) {
        headSize = headMap.size();
        headData = headMap;
    }

    @Override
    public void doAfterAllAnalysed(AnalysisContext context) {
        saveData();
        log.info("所有数据解析完成！");
    }

    /**
     * 不是固定的列只能手动处理
     */
    private void saveData() {
        log.info("表格总数据：" + list.size());
        if (list.size() == 0) {
            throw new ServiceException("000", "导入数据为空！");
        }
        ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
        String key = Constants.COM_MNG_VOLUNTEER_ERROR_LIST + communityId;
        int index = 2;
        try {
            ArrayList<ComMngVolunteerExcelVO> voList = Lists.newArrayList();
            ArrayList<ComMngVolunteerErrorExcelVO> mistakes = Lists.newArrayList();
            for (Map<Integer, String> oneData : list) {
                ComMngVolunteerExcelVO vo = new ComMngVolunteerExcelVO();

                if (StringUtils.isEmpty(oneData.get(0))) {
                    index++;
                    mistakes.add(setErrorObject(oneData,"志愿者名称不可为空，请填写志愿者名称"));
                    continue;
                }else{
                    //判断导入的名字的长度是否超过10
                    if(oneData.get(0).length() > 10){
                        index++;
                        mistakes.add(setErrorObject(oneData,"志愿者名称长度不可超过10，请重新填写志愿者名称"));
                        continue;
                    }
                }
                vo.setName(oneData.get(0));
                if (StringUtils.isEmpty(oneData.get(1))) {
                    index++;
                    mistakes.add(setErrorObject(oneData,"志愿者手机号不可为空，请填写志愿者手机号"));
                    continue;
                }
                vo.setPhone(oneData.get(1));
                if (StringUtils.isEmpty(oneData.get(2))) {
                    index++;
                    mistakes.add(setErrorObject(oneData,"志愿者身份证不可为空，请填写志愿者身份证"));
                    continue;
                }
                // 判断身份证号码位数
                if (oneData.get(2).length() != 18) {
                    if (oneData.get(2).length() != 15) {
                        index++;
                        mistakes.add(setErrorObject(oneData,"志愿者身份证位数有误，请检查身份证号码是否正确"));
                        continue;
                    }
                }
                if (oneData.get(2).length() != 15) {
                    if (oneData.get(2).length() != 18) {
                        index++;
                        mistakes.add(setErrorObject(oneData,"志愿者身份证位数有误，请检查身份证号码是否正确"));
                        continue;
                    }
                }
                vo.setIdCard(oneData.get(2).toUpperCase());
                if (StringUtils.isEmpty(oneData.get(3))) {
                    index++;
                    mistakes.add(setErrorObject(oneData,"志愿者组织不可为空，请填写志愿者组织"));
                    continue;
                }
                vo.setOrgName(oneData.get(3));

                if (StringUtils.isEmpty(oneData.get(4))) {
                    index++;
                    mistakes.add(setErrorObject(oneData,"志愿者队伍不可为空，请填写志愿者队伍"));
                    continue;
                }
                vo.setTeamName(oneData.get(4));
                if (StringUtils.isEmpty(oneData.get(5))) {
                    index++;
                    mistakes.add(setErrorObject(oneData,"志愿者技能不可为空，请填写志愿者技能"));
                    continue;
                }
                vo.setSkillName(oneData.get(5));
                if (StringUtils.isEmpty(oneData.get(6))) {
                    index++;
                    mistakes.add(setErrorObject(oneData,"是否是大学生不可为空，请填写是否是大学生"));
                    continue;
                }
                if(!oneData.get(6).equals("1") && !oneData.get(6).equals("2")){
                    index++;
                    mistakes.add(setErrorObject(oneData,"是否是大学生选择错误,请选择是否"));
                    continue;
                }
                vo.setIsUniversity(Integer.parseInt(oneData.get(6)));
                voList.add(vo);
                index++;
            }
            List<ComMngVolunteerExcelVO> newVoList =
                voList.stream().filter(ListUtils.distinctByKey(ComMngVolunteerExcelVO::getIdCard))
                    .collect(Collectors.toList());
            R r = communityService.importVolunteerAdmin(newVoList, communityId, userId);
            if (!R.isOk(r)) {
                List<ComMngVolunteerErrorExcelVO> list =
                    JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComMngVolunteerErrorExcelVO.class);
                mistakes.addAll(list);
                valueOperations.set(key, JSONArray.toJSONString(mistakes), 1, TimeUnit.HOURS);
                throw new ServiceException("500", key);
            } else {
                if (!mistakes.isEmpty()) {
                    valueOperations.set(key, JSONArray.toJSONString(mistakes), 1, TimeUnit.HOURS);
                    throw new ServiceException("500", key);
                }
            }
        } catch (NumberFormatException e) {
            e.printStackTrace();
            throw new ServiceException("500", "导入失败");
        }
    }

    private void setError(Map<Integer, String> map, ComMngVolunteerErrorExcelVO vo) {
        vo.setName(map.get(0));
        vo.setPhone(map.get(1));
        vo.setIdCard(map.get(2));
        vo.setOrgName(map.get(3));
        vo.setTeamName(map.get(4));
        vo.setSkillName(map.get(5));
    }

    /**
     * 组装错误信息
     * @param oneData   数据表格对象
     * @param error     错误信息
     * @return  错误对象
     */
    private ComMngVolunteerErrorExcelVO setErrorObject(Map<Integer, String> oneData, String error){
        ComMngVolunteerErrorExcelVO mistake = new ComMngVolunteerErrorExcelVO();
        setError(oneData, mistake);
        mistake.setError(error);
        return mistake;
    }
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/ComActSocialExportVO.java

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

import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;

/**
 * @author zzj
 */
@Data
public class ComActSocialExportVO {
    /**
     * 姓名   列: name
     */
    @ExcelProperty(value = "姓名")
    private String name;
    /**
     * 联系电话   列: telephone
     */
    @ExcelProperty(value = "联系电话",index = 4)
    private String telephone;
    /**
     * 性别0女1男   列: gen
     */
    @ExcelProperty(value = "性别",index = 2)
    private Integer gen;
    /**
     * 出生日期   列: birthday
     */
    @ExcelProperty(value = "出生日期",index = 3)
    private String birthday;
    /**
     * 社工证编号   列: social_worker_code
     */
    @ExcelProperty(value = "社工证号码",index = 1)
    private String socialWorkerCode;

    /**
     * 所属街道   列: street_id
     */
    @ExcelProperty(value = "所属街道",index = 5)
    private Long streetId;
    /**
     * 所属社区   列: community_id
     */
    @ExcelProperty(value = "所属社区",index = 6)
    private Long communityId;

    /**
     * 技能领域   列: skill_field
     */
    @ExcelProperty(value = "技能领域",index = 9)
    private String skillField;
    /**
     * 业务范围   列: business_scope
     */
    @ExcelProperty(value = "业务范围",index = 10)
    private String businessScope;

    /**
     * 所属组织ID   列: social_org_id
     */
    @ExcelProperty(value = "所属机构",index = 7)
    private Long socialOrgId;

    /**
     * 社工资质   列: social_qua
     */
    @ExcelProperty(value = "社工资质",index = 8)
    private Long socialQua;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/ComActSocialWorkerAddDTO.java

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

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import javax.validation.constraints.Digits;
import javax.validation.constraints.*;

import javax.validation.constraints.Max;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.NotBlank;
import java.util.Date;
import org.hibernate.validator.constraints.Length;
import com.fasterxml.jackson.annotation.JsonFormat;


/**
 * 创建表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-06-03
 * */
@Data
@ApiModel("创建社工请求参数")
public class ComActSocialWorkerAddDTO {

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "所属组织ID", hidden = false, example = "1")
    private Long socialOrgId;

    @NotBlank() @Length(max=32)
    @ApiModelProperty(value = "姓名", hidden = false, example = "")
    private String name;

    @NotBlank() @Length(max=32)
    @ApiModelProperty(value = "联系电话", hidden = false, example = "")
    private String telephone;

    @ApiModelProperty(value = "性别0女1男", hidden = false, example = "")
    private Integer gen;

    @ApiModelProperty(value = "所属街道", hidden = false, example = "")
    private Long streetId;

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "所属社区", hidden = false, example = "1")
    private Long communityId;

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

    @ApiModelProperty(value = "(当前操作)用户名称", hidden = true, example = "张三")
    private String userName;

    /**
     * 身份证
     */
    @ApiModelProperty(value = "身份证")
    private String idCard;

    /**
     * 分类id
     */
    @ApiModelProperty(value = "分类id")
    private String  skillType;

    /**
     * 分类名称
     */
    @ApiModelProperty(value = "分类名称")
    private String  skillTypeName;

    /**
     * 入职时间
     */
    @ApiModelProperty(value = "入职时间")
    private Date joinTime;

    /**
     * 住址
     */
    @ApiModelProperty(value = "住址")
    private String address;

    /**
     * 图片
     */
    @ApiModelProperty(value = "图片")
    private String image;

    /**
     * 学历
     */
    @ApiModelProperty(value = "学历")
    private String education;

    /**
     * 政治面貌
     */
    @ApiModelProperty(value = "政治面貌")
    private String politicalOutlook;

    /**
     * 民族
     */
    @ApiModelProperty(value = "民族")
    private String nation;

    /**
     * 是否证件 0否 1是
     */
    @ApiModelProperty(value = "是否证件 0否 1是")
    private Integer credential;

    /**
     * 年龄
     */
    @ApiModelProperty(value = "年龄")
    private Integer age;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/ComActSocialWorkerDeleteDTO.java

New file
@@ -0,0 +1,30 @@
package com.panzhihua.common.model.dtos.civil;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;


/**
 * 删除表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-06-03
 * */
@Data
@ApiModel("删除社工请求参数")
public class ComActSocialWorkerDeleteDTO {

    @ApiModelProperty(value = "ID", hidden = false, example = "1")
    private Long id;

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

    @ApiModelProperty(value = "(当前操作)用户名称", hidden = true, example = "张三")
    private String userName;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/ComActSocialWorkerEditDTO.java

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

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

import org.hibernate.validator.constraints.Length;

import com.fasterxml.jackson.annotation.JsonFormat;
import javax.validation.constraints.*;
import java.math.*;
import java.util.Date;

/**
 * 编辑表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-06-03
 * */
@Data
@ApiModel("编辑社工请求参数")
public class ComActSocialWorkerEditDTO {

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "ID", hidden = false, example = "1")
    private Long id;

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "所属组织ID", hidden = false, example = "1")
    private Long socialOrgId;

    @Length(max=32)
    @ApiModelProperty(value = "姓名", hidden = false, example = "")
    private String name;

    @Length(max=32)
    @ApiModelProperty(value = "联系电话", hidden = false, example = "")
    private String telephone;

    @ApiModelProperty(value = "性别0女1男", hidden = false, example = "")
    private Integer gen;

    @ApiModelProperty(value = "所属街道", hidden = false, example = "")
    private Long streetId;

    @ApiModelProperty(value = "所属社区", hidden = false, example = "1")
    private Long communityId;

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

    @ApiModelProperty(value = "(当前操作)用户名称", hidden = true, example = "张三")
    private String userName;

    /**
     * 身份证
     */
    @ApiModelProperty(value = "身份证")
    private String idCard;

    /**
     * 分类id
     */
    @ApiModelProperty(value = "分类id")
    private String skillType;

    /**
     * 入职时间
     */
    @ApiModelProperty(value = "入职时间")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date joinTime;

    /**
     * 住址
     */
    @ApiModelProperty(value = "住址")
    private String address;

    /**
     * 图片
     */
    @ApiModelProperty(value = "图片")
    private String image;

    /**
     * 学历
     */
    @ApiModelProperty(value = "学历")
    private String education;

    /**
     * 政治面貌
     */
    @ApiModelProperty(value = "政治面貌")
    private String politicalOutlook;

    /**
     * 民族
     */
    @ApiModelProperty(value = "民族")
    private String nation;

    /**
     * 是否证件 0否 1是
     */
    @ApiModelProperty(value = "是否证件 0否 1是")
    private Integer credential;

    private Integer age;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/ComActSocialWorkerExcelVO.java

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

import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;

import java.util.Date;

/**
 * @author zzj
 */
@Data
public class ComActSocialWorkerExcelVO {

    /**
     * 姓名   列: name
     */
    @ExcelProperty(value = "姓名",index = 0)
    private String name;
    /**
     * 身份证   列: social_worker_code
     */
    @ExcelProperty(value = "身份证号码",index = 1)
    private String idCard;

    /**
     * 性别0女1男   列: gen
     */
    @ExcelProperty(value = "性别0女1男",index = 2)
    private String gen;
    /**
     * 入职时间
     */
    @ExcelProperty(value = "入职时间",index = 3)
    private Date joinTime;
    /**
     * 联系电话   列: telephone
     */
    @ExcelProperty(value = "联系电话",index = 4)
    private String telephone;

    /**
     * 学历   列: street_id
     */
    @ExcelProperty(value = "学历",index = 5)
    private String education;
    /**
     * 所属社区   列: community_id
     */
    @ExcelProperty(value = "所属社区",index = 6)
    private String communityId;

    /**
     * 政治面貌
     */
    @ExcelProperty(value = "政治面貌",index = 7)
    private String politicalOutlook;


    /**
     * 民族   列: social_qua
     */
    @ExcelProperty(value = "民族",index = 8)
    private String nation;
    /**
     * 社工证
     */
    @ExcelProperty(value = "社工证",index = 9)
    private String credential;
    /**
     * 住址
     */
    @ExcelProperty(value = "住址",index = 10)
    private String address;
    /**
     * 年龄
     */
    @ExcelProperty(value = "年龄",index = 11)
    private Integer age;





}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/PageComActSocialWorkerDTO.java

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

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

import org.hibernate.validator.constraints.Length;

import javax.validation.constraints.*;
import java.util.Date;
import java.math.BigDecimal;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.google.common.base.CaseFormat;

/**
 * 分页查询表单
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-06-03
 * */
@Data
@ApiModel("查询社工请求参数")
public class PageComActSocialWorkerDTO {

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

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

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "ID", hidden = false, example = "1")
    private Long id;


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "所属组织ID", hidden = false, example = "1")
    private Long socialOrgId;


    @Length(max=32)
    @ApiModelProperty(value = "姓名", hidden = false, example = "")
    private String name;


    @Length(max=32)
    @ApiModelProperty(value = "联系电话", hidden = false, example = "")
    private String telephone;


    @Length(max=1)
    @ApiModelProperty(value = "性别0女1男", hidden = false, example = "")
    private String gen;

    @Length(max=32)
    @ApiModelProperty(value = "所属街道", hidden = false, example = "")
    private String streetId;


    @Max(9223372036854775807L)
    @ApiModelProperty(value = "所属社区", hidden = false, example = "1")
    private Long communityId;

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "创建人", hidden = false, example = "1")
    private Long createBy;

    @Max(9223372036854775807L)
    @ApiModelProperty(value = "更新人", hidden = false, example = "1")
    private Long updateBy;

    @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
    private Long userId;
    @ApiModelProperty(value = "(当前操作)用户名称", hidden = true, example = "张三")
    private String userName;

    /**
     * 身份证
     */
    @ApiModelProperty(value = "身份证")
    private String idCard;

    /**
     * 分类id
     */
    @ApiModelProperty(value = "分类id")
    private Long skillType;

    /**
     * 入职时间
     */
    @ApiModelProperty(value = "入职时间")
    private Date joinTime;

    /**
     * 住址
     */
    @ApiModelProperty(value = "住址")
    private String address;

    /**
     * 图片
     */
    @ApiModelProperty(value = "图片")
    private String image;

    /**
     * 学历
     */
    @ApiModelProperty(value = "学历")
    private String education;

    /**
     * 政治面貌
     */
    @ApiModelProperty(value = "政治面貌")
    private String politicalOutlook;

    /**
     * 民族
     */
    @ApiModelProperty(value = "民族")
    private String nation;

    /**
     * 是否证件 0否 1是
     */
    @ApiModelProperty(value = "是否证件 0否 1是")
    private Integer credential;

    @ApiModelProperty(value = "关键字搜索")
    private String keyword;

    @ApiModelProperty(value = "年龄开始")
    private Integer ageBegin;

    @ApiModelProperty(value = "年龄结束")
    private Integer ageEnd;

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

}

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

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

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.util.Date;

/**
 * 新增志愿者组织队伍表请求参数
 *
 * @author lyq
 * @since 2021-10-30 16:04:49
 */
@Data
@ApiModel("新增志愿者组织队伍表请求参数")
public class AddComMngVolunteerOrgTeamDto {


    /**
     * 社区id
     */
    @ApiModelProperty(value = "社区id")
    private Long communityId;

    /**
     * 名称
     */
    @ApiModelProperty(value = "名称")
    private String name;

    /**
     * 父级id,为0时则为组织，不为0则为队伍
     */
    @ApiModelProperty(value = "父级id,为0时则为组织，不为0则为队伍")
    private Long parentId;

    /**
     * 服务类型
     */
    @ApiModelProperty(value = "服务类型")
    private Long serviceTypeId;

    /**
     * 创建时间
     */
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "创建时间")
    private Date createAt;

    /**
     * 修改时间
     */
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "修改时间")
    private Date updateAt;




}


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

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

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

/**
 * 新增志愿者服务类型表请求参数
 *
 * @author lyq
 * @since 2021-10-30 16:47:10
 */
@Data
@ApiModel("新增志愿者服务类型表请求参数")
public class AddComMngVolunteerServiceTypeDto {


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

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

    /**
     * 名称
     */
    @ApiModelProperty(value = "名称")
    private String name;

    /**
     * 备注
     */
    @ApiModelProperty(value = "备注")
    private String remark;


}


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

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

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

/**
 * 新增志愿者技能表请求参数
 *
 * @author lyq
 * @since 2021-10-30 16:47:37
 */
@Data
@ApiModel("新增志愿者技能表请求参数")
public class AddComMngVolunteerSkillDto {


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

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

    /**
     * 名称
     */
    @ApiModelProperty(value = "名称")
    private String name;

    /**
     * 备注
     */
    @ApiModelProperty(value = "备注")
    private String remark;


}


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

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

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.util.Date;

/**
 * 编辑志愿者组织队伍表请求参数
 *
 * @author lyq
 * @since 2021-10-30 16:04:50
 */
@Data
@ApiModel("编辑志愿者组织队伍表请求参数")
public class EditComMngVolunteerOrgTeamDto {

    /**
     * 主键id
     */
    @ApiModelProperty(value = "主键id")
    private Long id;
    /**
     * 社区id
     */
    @ApiModelProperty(value = "社区id")
    private Long communityId;
    /**
     * 名称
     */
    @ApiModelProperty(value = "名称")
    private String name;
    /**
     * 父级id,为0时则为组织，不为0则为队伍
     */
    @ApiModelProperty(value = "父级id,为0时则为组织，不为0则为队伍")
    private Long parentId;
    /**
     * 服务类型
     */
    @ApiModelProperty(value = "服务类型")
    private Long serviceTypeId;
    /**
     * 创建时间
     */
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "创建时间")
    private Date createAt;
    /**
     * 修改时间
     */
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "修改时间")
    private Date updateAt;

}


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

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

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.util.Date;

/**
 * 编辑志愿者服务类型表请求参数
 *
 * @author lyq
 * @since 2021-10-30 16:47:10
 */
@Data
@ApiModel("编辑志愿者服务类型表请求参数")
public class EditComMngVolunteerServiceTypeDto {

    /**
     * 主键id
     */
    @ApiModelProperty(value = "主键id")
    private Long id;
    /**
     * 社区id
     */
    @ApiModelProperty(value = "社区id")
    private Long communityId;
    /**
     * 名称
     */
    @ApiModelProperty(value = "名称")
    private String name;
    /**
     * 备注
     */
    @ApiModelProperty(value = "备注")
    private String remark;
    /**
     * 创建时间
     */
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "创建时间")
    private Date createAt;
    /**
     * 创建人id
     */
    @ApiModelProperty(value = "创建人id")
    private Long createBy;
    /**
     * 修改时间
     */
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "修改时间")
    private Date updateAt;
    /**
     * 修改人id
     */
    @ApiModelProperty(value = "修改人id")
    private Long updateBy;

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

}


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

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

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

/**
 * 编辑志愿者技能表请求参数
 *
 * @author lyq
 * @since 2021-10-30 16:47:37
 */
@Data
@ApiModel("编辑志愿者技能表请求参数")
public class EditComMngVolunteerSkillDto {

    /**
     * 主键id
     */
    @ApiModelProperty(value = "主键id")
    private Long id;
    /**
     * 社区id
     */
    @ApiModelProperty(value = "社区id",hidden = true)
    private Long communityId;
    /**
     * 用户id
     */
    @ApiModelProperty(value = "用户id",hidden = true)
    private Long userId;
    /**
     * 名称
     */
    @ApiModelProperty(value = "名称")
    private String name;
    /**
     * 备注
     */
    @ApiModelProperty(value = "备注")
    private String remark;

}


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

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

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.util.Date;

/**
 * 分页查询志愿者组织队伍表请求参数
 *
 * @author lyq
 * @since 2021-10-30 16:04:48
 */
@Data
@ApiModel("分页查询志愿者组织队伍表请求参数")
public class PageComMngVolunteerOrgTeamDto {

    /**
     * 主键id
     */
    @ApiModelProperty(value = "主键id")
    private Long id;
    /**
     * 社区id
     */
    @ApiModelProperty(value = "社区id")
    private Long communityId;
    /**
     * 名称
     */
    @ApiModelProperty(value = "名称")
    private String name;
    /**
     * 父级id,为0时则为组织，不为0则为队伍
     */
    @ApiModelProperty(value = "父级id,为0时则为组织，不为0则为队伍")
    private Long parentId;
    /**
     * 服务类型
     */
    @ApiModelProperty(value = "服务类型")
    private Long serviceTypeId;
    /**
     * 创建时间
     */
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "创建时间")
    private Date createAt;
    /**
     * 修改时间
     */
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "修改时间")
    private Date updateAt;

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

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

    @ApiModelProperty(value = "关键词")
    private String keyWord;

}


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

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

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.util.Date;

/**
 * 分页查询志愿者服务类型表请求参数
 *
 * @author lyq
 * @since 2021-10-30 16:47:10
 */
@Data
@ApiModel("分页查询志愿者服务类型表请求参数")
public class PageComMngVolunteerServiceTypeDto {

    /**
     * 主键id
     */
    @ApiModelProperty(value = "主键id")
    private Long id;
    /**
     * 社区id
     */
    @ApiModelProperty(value = "社区id")
    private Long communityId;
    /**
     * 名称
     */
    @ApiModelProperty(value = "名称")
    private String name;
    /**
     * 备注
     */
    @ApiModelProperty(value = "备注")
    private String remark;
    /**
     * 创建时间
     */
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "创建时间")
    private Date createAt;
    /**
     * 创建人id
     */
    @ApiModelProperty(value = "创建人id")
    private Long createBy;
    /**
     * 修改时间
     */
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "修改时间")
    private Date updateAt;
    /**
     * 修改人id
     */
    @ApiModelProperty(value = "修改人id")
    private Long updateBy;

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

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

    @ApiModelProperty(value = "关键词")
    private String keyWord;

}


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

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

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.util.Date;

/**
 * 分页查询志愿者技能表请求参数
 *
 * @author lyq
 * @since 2021-10-30 16:47:37
 */
@Data
@ApiModel("分页查询志愿者技能表请求参数")
public class PageComMngVolunteerSkillDto {

    /**
     * 主键id
     */
    @ApiModelProperty(value = "主键id")
    private Long id;
    /**
     * 社区id
     */
    @ApiModelProperty(value = "社区id")
    private Long communityId;
    /**
     * 名称
     */
    @ApiModelProperty(value = "名称")
    private String name;
    /**
     * 备注
     */
    @ApiModelProperty(value = "备注")
    private String remark;
    /**
     * 创建时间
     */
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "创建时间")
    private Date createAt;
    /**
     * 创建人id
     */
    @ApiModelProperty(value = "创建人id")
    private Long createBy;
    /**
     * 修改时间
     */
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "修改时间")
    private Date updateAt;
    /**
     * 修改人id
     */
    @ApiModelProperty(value = "修改人id")
    private Long updateBy;

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

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

    @ApiModelProperty(value = "关键词")
    private String keyWord;

}


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

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

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;

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

/**
 * @title: AddFmsServiceDTO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 后台新增微讲堂请求参数类
 * @author: hans
 * @date: 2022/02/16 11:22
 */
@Data
@ApiModel("后台新增微讲堂请求参数类")
public class AddFmsClassroomAdminDTO {

    @ApiModelProperty("标题")
    @NotBlank
    @Size(min = 1, max = 30)
    private String title;

    @ApiModelProperty("参与学习人数")
    private Integer scholars;

    @ApiModelProperty("封面")
    @NotBlank
    private String cover;

    @ApiModelProperty("内容")
    @NotBlank
    private String content;

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

    @ApiModelProperty(value = "创建者", hidden = true)
    private Long createdBy;

    @ApiModelProperty(value = "由谁更新", hidden = true)
    private Long updatedBy;
}

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

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

import java.util.Date;

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern;
import javax.validation.constraints.Size;

import com.fasterxml.jackson.annotation.JsonFormat;

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

/**
 * @title: AddFmsServiceDTO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 后台新增微服务请求参数类
 * @author: hans
 * @date: 2022/02/16 11:22
 */
@Data
@ApiModel("后台新增微服务请求参数类")
public class AddFmsServiceAdminDTO {

    @ApiModelProperty("服务用户")
    @NotBlank
    @Size(min = 1, max = 10)
    private String userName;

    @ApiModelProperty("联系电话")
    @NotBlank(message = "联系电话不能为空")
    @Pattern(message = "联系电话格式错误", regexp = "^(13[0-9]|14[01456879]|15[0-3,5-9]|16[2567]|17[0-8]|18[0-9]|19[0-3,5-9])\\d{8}$")
    private String phone;

    @ApiModelProperty("服务时间")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    @NotNull
    private Date serviceAt;

    @ApiModelProperty("服务内容")
    @NotBlank(message = "服务内容不能为空")
    private String serviceContent;

    @ApiModelProperty("服务内容图片，多张逗号隔开")
    private String serviceImage;

    @ApiModelProperty("服务过程")
    @NotBlank(message = "服务过程不能为空")
    private String serviceProcess;

    @ApiModelProperty("服务过程图片，多张逗号隔开")
    private String processImage;

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

    @ApiModelProperty(value = "创建者", hidden = true)
    private Long createdBy;

    @ApiModelProperty(value = "由谁更新", hidden = true)
    private Long updatedBy;
}

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

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

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;

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

/**
 * @title: AddTeamTypeDTO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 新增团队请求参数类
 * @author: hans
 * @date: 2022/02/11 13:40
 */
@Data
@ApiModel("新增团队请求参数类")
public class AddTeamDTO {

    @ApiModelProperty("团队名称")
    @NotBlank
    @Size(min = 1, max = 20)
    private String name;

    @ApiModelProperty("所属团队类型")
    @NotNull
    private Long teamType;

    @ApiModelProperty("服务电话")
    private String phone;

    @ApiModelProperty("团队照片")
    @NotBlank
    private String image;

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

    @ApiModelProperty(value = "创建者", hidden = true)
    private Long createdBy;

    @ApiModelProperty(value = "由谁更新", hidden = true)
    private Long updatedBy;
}

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

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

import java.util.List;

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.Pattern;
import javax.validation.constraints.Size;

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

/**
 * @title: AddTeamTypeDTO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 新增团队成员请求参数类
 * @author: hans
 * @date: 2022/02/11 13:40
 */
@Data
@ApiModel("新增团队成员请求参数类")
public class AddTeamMemberDTO {

    @ApiModelProperty("成员姓名")
    @NotBlank
    @Size(min = 1, max = 10)
    private String name;

    @ApiModelProperty("所属团队")
    @NotEmpty
    private List<Long> teamIds;

    @ApiModelProperty("联系电话")
    @NotBlank(message = "联系电话不能为空")
    @Pattern(message = "联系电话格式错误", regexp = "^(13[0-9]|14[01456879]|15[0-3,5-9]|16[2567]|17[0-8]|18[0-9]|19[0-3,5-9])\\d{8}$")
    private String phone;

    @ApiModelProperty(value = "身份证号")
    private String idCard;

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

    @ApiModelProperty(value = "创建者", hidden = true)
    private Long createdBy;

    @ApiModelProperty(value = "由谁更新", hidden = true)
    private Long updatedBy;
}

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

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

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

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;

/**
 * @title: AddTeamTypeDTO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 团队类型新增请求参数类
 * @author: hans
 * @date: 2022/02/11 13:40
 */
@Data
@ApiModel("团队类型新增请求参数类")
public class AddTeamTypeDTO {

    @ApiModelProperty("团队类型名称")
    @NotBlank
    @Size(min = 1, max = 10)
    private String name;

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

    @ApiModelProperty(value = "创建者", hidden = true)
    private Long createdBy;

    @ApiModelProperty(value = "由谁更新", hidden = true)
    private Long updatedBy;
}

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

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

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;

import com.panzhihua.common.model.vos.LoginUserInfoVO;

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

/**
 * @title: ApplyFmsServiceDTO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 申请微服务请求参数类
 * @author: hans
 * @date: 2022/02/19 13:42
 */
@Data
@ApiModel("申请微服务请求参数类")
public class ApplyFmsServiceDTO {

    @ApiModelProperty("申请服务内容")
    @NotBlank(message = "申请服务内容不能为空")
    @Size(min = 1, max = 200)
    private String serviceContent;

    @ApiModelProperty("服务内容图片，多张逗号隔开")
    private String serviceImage;

    @ApiModelProperty(value = "创建者", hidden = true)
    private LoginUserInfoVO userInfo;
}

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

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

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

import javax.validation.constraints.NotNull;

/**
 * @title: AddFmsServiceDTO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 后台核实微服务请求参数类
 * @author: hans
 * @date: 2022/02/16 11:22
 */
@Data
@ApiModel("后台核实微服务请求参数类")
public class ApprovalFmsServiceAdminDTO {

    @ApiModelProperty("服务id")
    @NotNull
    private Long serviceId;

    @ApiModelProperty("反馈内容")
    private String content;

    @ApiModelProperty("是否通过（TRUE-通过，FALSE-不通过）")
    @NotNull
    private Boolean isPass;

    @ApiModelProperty("分派服务人员id")
    private Long memberId;

    @ApiModelProperty(value = "由谁更新", hidden = true)
    private Long updatedBy;
}

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

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

import javax.validation.constraints.NotNull;

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

/**
 * @title: AddTeamTypeDTO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 团队成员删除请求参数类
 * @author: hans
 * @date: 2022/02/11 13:40
 */
@Data
@ApiModel("团队成员删除请求参数类")
public class DeleteTeamMemberDTO {

    @ApiModelProperty("成员id")
    @NotNull
    private Long id;

    @ApiModelProperty("所属团队")
    @NotNull
    private Long teamId;

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

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

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

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;

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

/**
 * @title: AddFmsServiceDTO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 后台编辑微讲堂请求参数类
 * @author: hans
 * @date: 2022/02/16 11:22
 */
@Data
@ApiModel("后台编辑微讲堂请求参数类")
public class EditFmsClassroomAdminDTO {

    @ApiModelProperty("讲堂id")
    @NotNull
    private Long id;

    @ApiModelProperty("标题")
    @NotBlank
    @Size(min = 1, max = 30)
    private String title;

    @ApiModelProperty("参与学习人数")
    private Integer scholars;

    @ApiModelProperty("封面")
    @NotBlank
    private String cover;

    @ApiModelProperty("内容")
    @NotBlank
    private String content;

    @ApiModelProperty(value = "由谁更新", hidden = true)
    private Long updatedBy;
}

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

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

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;

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

/**
 * @title: AddTeamTypeDTO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 团队信息编辑请求参数类
 * @author: hans
 * @date: 2022/02/11 13:40
 */
@Data
@ApiModel("团队信息编辑请求参数类")
public class EditTeamDTO {

    @ApiModelProperty("团队id")
    @NotNull
    private Long id;

    @ApiModelProperty("团队名称")
    @NotBlank
    @Size(min = 1, max = 20)
    private String name;

    @ApiModelProperty("所属团队类型")
    @NotNull
    private Long teamType;

    @ApiModelProperty("服务电话")
    private String phone;

    @ApiModelProperty("团队照片")
    @NotBlank
    private String image;

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

    @ApiModelProperty(value = "由谁更新", hidden = true)
    private Long updatedBy;
}

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

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

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern;
import javax.validation.constraints.Size;

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

import java.util.List;

/**
 * @title: AddTeamTypeDTO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 团队成员编辑请求参数类
 * @author: hans
 * @date: 2022/02/11 13:40
 */
@Data
@ApiModel("团队成员编辑请求参数类")
public class EditTeamMemberDTO {

    @ApiModelProperty("成员id")
    @NotNull
    private Long id;

    @ApiModelProperty("成员姓名")
    @NotBlank
    @Size(min = 1, max = 10)
    private String name;

    @ApiModelProperty("所属团队")
    @NotEmpty
    private List<Long> teamIds;

    @ApiModelProperty("联系电话")
    @NotBlank(message = "联系电话不能为空")
    @Pattern(message = "联系电话格式错误", regexp = "^(13[0-9]|14[01456879]|15[0-3,5-9]|16[2567]|17[0-8]|18[0-9]|19[0-3,5-9])\\d{8}$")
    private String phone;

    @ApiModelProperty(value = "身份证号")
    private String idCard;

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

    @ApiModelProperty(value = "由谁更新", hidden = true)
    private Long updatedBy;
}

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

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

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;

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

/**
 * @title: AddTeamTypeDTO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 团队类型编辑请求参数类
 * @author: hans
 * @date: 2022/02/11 13:40
 */
@Data
@ApiModel("团队类型编辑请求参数类")
public class EditTeamTypeDTO {

    @ApiModelProperty("团队类型id")
    @NotNull
    private Long id;

    @ApiModelProperty("团队类型名称")
    @NotBlank
    @Size(min = 1, max = 10)
    private String name;

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

    @ApiModelProperty(value = "由谁更新", hidden = true)
    private Long updatedBy;
}

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

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

import javax.validation.constraints.NotNull;

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

/**
 * @title: EvaluationFmsServiceDTO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 服务评价请求参数类
 * @author: hans
 * @date: 2022/02/19 14:19
 */
@Data
@ApiModel("服务评价请求参数类")
public class EvaluationFmsServiceDTO {

    @ApiModelProperty("服务id")
    @NotNull
    private Long serviceId;

    @ApiModelProperty("评分星级（1.非常差2.差3.一般4.满意5.非常满意）")
    @NotNull
    private Integer starLevel;

    @ApiModelProperty("评价内容")
    private String evaluateContent;

    @ApiModelProperty("图片")
    private String image;

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

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

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

import javax.validation.constraints.NotNull;

import com.panzhihua.common.model.vos.LoginUserInfoVO;

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

/**
 * @title: FeedbackFmsServiceDTO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 服务反馈微服务信息请求参数
 * @author: hans
 * @date: 2022/02/19 14:52
 */
@Data
@ApiModel("服务反馈微服务信息请求参数")
public class FeedbackFmsServiceDTO {

    @ApiModelProperty(value = "服务id")
    @NotNull
    private Long serviceId;

    @ApiModelProperty(value = "反馈内容")
    private String feedbackContent;

    @ApiModelProperty(value = "反馈图片")
    private String image;

    @ApiModelProperty("结束服务（TRUE-是，FALSE-否）")
    @NotNull
    private Boolean isEnd;

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

    @ApiModelProperty(value = "用户信息", hidden = true)
    private LoginUserInfoVO userInfo;
}

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

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

import java.util.Date;

import javax.validation.constraints.NotNull;

import com.fasterxml.jackson.annotation.JsonFormat;

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

/**
 * @title: PageFmsClassroomAdminDTO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 后台分页查询微讲堂信息请求参数
 * @author: hans
 * @date: 2022/02/17 14:15
 */
@Data
@ApiModel("后台分页查询微讲堂信息请求参数")
public class PageFmsClassroomAdminDTO {

    @ApiModelProperty(value = "关键字")
    private String keyword;

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

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

    @ApiModelProperty(value = "分页-当前页数", example = "1")
    @NotNull(message = "分页参数不能为空")
    private Long pageNum;

    @ApiModelProperty(value = "分页-每页记录数", example = "10")
    @NotNull(message = "分页参数不能为空")
    private Long pageSize;

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

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

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

import javax.validation.constraints.NotNull;

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

/**
 * @title: PageFmsClassroomAdminDTO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 后台分页查询微调节/微防控信息请求参数
 * @author: hans
 * @date: 2022/02/17 14:15
 */
@Data
@ApiModel("后台分页查询微调节/微防控信息请求参数")
public class PageFmsEventAdminDTO {

    @ApiModelProperty(value = "关键字")
    private String keyword;

    @ApiModelProperty(value = "事件类型")
    private String eventClazz;

    @ApiModelProperty(value = "状态(1.待处理2.已解决)")
    private Integer eventProcessStatus;

    @ApiModelProperty(value = "查询类型（1.微调节数据2.微防控数）")
    @NotNull(message = "查询类型不能为空")
    private Integer type;

    @ApiModelProperty(value = "分页-当前页数", example = "1")
    @NotNull(message = "分页参数不能为空")
    private Long pageNum;

    @ApiModelProperty(value = "分页-每页记录数", example = "10")
    @NotNull(message = "分页参数不能为空")
    private Long pageSize;

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

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

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

import javax.validation.constraints.NotNull;

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

/**
 * @title: PageFmsServiceAdminDTO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 后台分页查询微服务信息请求参数
 * @author: hans
 * @date: 2022/02/16 14:05
 */
@Data
@ApiModel("后台分页查询微服务信息请求参数")
public class PageFmsServiceAdminDTO {

    @ApiModelProperty(value = "关键字")
    private String keyword;

    @ApiModelProperty(value = "服务状态（1.待核实2.进行中3.待评价4.已完成5.未通过）")
    private Integer serviceStatus;

    @ApiModelProperty(value = "分页-当前页数", example = "1")
    @NotNull(message = "分页参数不能为空")
    private Long pageNum;

    @ApiModelProperty(value = "分页-每页记录数", example = "10")
    @NotNull(message = "分页参数不能为空")
    private Long pageSize;

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

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

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

import javax.validation.constraints.NotNull;

import com.panzhihua.common.model.vos.LoginUserInfoVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @title: PageFmsServiceAdminDTO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 小程序分页查询微服务信息请求参数
 * @author: hans
 * @date: 2022/02/16 14:05
 */
@Data
@ApiModel("小程序分页查询微服务信息请求参数")
public class PageFmsServiceAppletsDTO {

    @ApiModelProperty(value = "此状态和服务状态不一致（1.已完成2.进行中）")
    private Integer status;

    @ApiModelProperty(value = "微服务处理状态（1.待我服务2.待核实3.已完成）")
    private Integer dealStatus;

    @ApiModelProperty(value = "分页-当前页数", example = "1")
    @NotNull(message = "分页参数不能为空")
    private Long pageNum;

    @ApiModelProperty(value = "分页-每页记录数", example = "10")
    @NotNull(message = "分页参数不能为空")
    private Long pageSize;

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

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

    @ApiModelProperty(value = "用户信息", hidden = true)
    private LoginUserInfoVO userInfo;

    @ApiModelProperty(value = "成员id", hidden = true)
    private Long memberId;
}

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

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

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

/**
 * @title: PageFmsTeamDTO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 分页查询团队信息请求参数
 * @author: hans
 * @date: 2022/02/18 10:16
 */
@Data
@ApiModel("分页查询团队信息请求参数")
public class PageFmsTeamDTO {

    @ApiModelProperty(value = "关键字")
    private String keyword;

    @ApiModelProperty(value = "团队类型")
    private Long teamType;

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

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

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

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

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

import javax.validation.constraints.NotNull;

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

/**
 * @title: PageTeamMemberDTO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 分页查询团队成员信息请求参数
 * @author: hans
 * @date: 2022/02/14 15:28
 */
@Data
@ApiModel("分页查询团队成员信息请求参数")
public class PageTeamMemberDTO {

    @ApiModelProperty(value = "关键字")
    private String keyword;

    @ApiModelProperty(value = "团队类型")
    private Long teamType;

    @ApiModelProperty(value = "所属团队")
    private Long teamId;

    @ApiModelProperty(value = "性别（1.男2.女3.未知）")
    private Integer gender;

    @ApiModelProperty(value = "分页-当前页数", example = "1")
    @NotNull(message = "分页参数不能为空")
    private Long pageNum;

    @ApiModelProperty(value = "分页-每页记录数", example = "10")
    @NotNull(message = "分页参数不能为空")
    private Long pageSize;

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

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/integral/admin/AddComActIntegralUserDTO.java

@@ -29,6 +29,8 @@
    @ApiModelProperty(value = "是否是志愿者 0 不是 1 是")
    private Integer isVolunteer;

    private Integer integralPartyTime;

    public AddComActIntegralUserDTO(Long serviceId, Integer integralType, Long communityId, Long userId) {
        this.serviceId = serviceId;
        this.integralType = integralType;

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/property/CommonPage.java

@@ -61,4 +61,8 @@
    private Long communityId;
    @ApiModelProperty("商家id")
    private Long merchantId;
    @ApiModelProperty("街道id")
    private Long streetId;
    @ApiModelProperty("分类2")
    private Integer type2;
}

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

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

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

import java.util.Date;

/**
 * @author zzj
 */
@Data
@ApiModel
public class ComActSocialMemberVO {
    private Long id;

    /**
     * 姓名
     */
    @ApiModelProperty(value = "姓名")
    private String name;

    /**
     * 手机号
     */
    @ApiModelProperty(value = "手机号")
    private String phone;

    /**
     * 社会组织id
     */
    @ApiModelProperty(value = "社会组织id")
    private Long orgId;

    /**
     * 职位
     */
    @ApiModelProperty(value = "职位")
    private String position;

    /**
     * 身份证号
     */
    @ApiModelProperty(value = "身份证号")
    private String idCard;

    /**
     * 账号
     */
    @ApiModelProperty(value = "账号")
    private String account;

    /**
     * 密码
     */
    @ApiModelProperty(value = "密码")
    private String password;

    /**
     * 状态1启用 0停用
     */
    @ApiModelProperty(value = "状态1启用 0停用")
    private Integer status;

    /**
     * 照片
     */
    @ApiModelProperty(value = "照片")
    private String image;

    /**
     * 创建时间
     */
    @ApiModelProperty(value = "创建时间")
    private Date createTime;

    /**
     * 街道id
     */
    @ApiModelProperty(value = "街道id")
    private Long streetId;

    /**
     * 所属组织
     */
    @ApiModelProperty(value = "所属组织")
    private String orgName;

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

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

@@ -184,11 +184,17 @@
    @ApiModelProperty("是否社区工作人员 1.是 2.否")
    private Integer isCommunityWorker;

    @ApiModelProperty("是否社工 1.是 2.否")
    private Integer isSocialWorker;

    @ApiModelProperty("实名认证地址")
    private String address;

    @ApiModelProperty("是否物业工作人员 1.是 2.否")
    private Integer isPropertyWorker;

    @ApiModelProperty("是否微团队成员 1.是 2.否")
    private Integer isFmsMember;

    @ApiModelProperty("appid")
    private String appId;
@@ -196,4 +202,9 @@
    private String appSecret;
    @ApiModelProperty("areaCode")
    private String areaCode;
    @ApiModelProperty("街道id")
    private Long streetId;

    @ApiModelProperty("账号类型 1街道 2社区 3社会组织")
    private Integer userType;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/civil/ComActSocialWorkerDetailsVO.java

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

import java.util.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;

import com.fasterxml.jackson.annotation.JsonFormat;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-06-03
 * */
@Data
@ApiModel("社工详细返回参数")
public class ComActSocialWorkerDetailsVO {

    @ApiModelProperty(value = "ID")
    private Long id;

    @ApiModelProperty(value = "所属组织ID")
    private Long socialOrgId;

    @ApiModelProperty(value = "姓名")
    private String name;

    @ApiModelProperty(value = "联系电话")
    private String telephone;

    @ApiModelProperty(value = "性别0女1男")
    private Integer gen;

    @ApiModelProperty(value = "所属街道")
    private Long streetId;

    @ApiModelProperty(value = "所属社区")
    private Long communityId;

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

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

    @ApiModelProperty(value = "更新人")
    private Long updateBy;

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

    /**
     * 身份证
     */
    @ApiModelProperty(value = "身份证")
    private String idCard;

    /**
     * 分类id
     */
    @ApiModelProperty(value = "分类id")
    private Long skillType;

    /**
     * 入职时间
     */
    @ApiModelProperty(value = "入职时间")
    private Date joinTime;

    /**
     * 住址
     */
    @ApiModelProperty(value = "住址")
    private String address;

    /**
     * 图片
     */
    @ApiModelProperty(value = "图片")
    private String image;

    /**
     * 学历
     */
    @ApiModelProperty(value = "学历")
    private String education;

    /**
     * 政治面貌
     */
    @ApiModelProperty(value = "政治面貌")
    private String politicalOutlook;

    /**
     * 民族
     */
    @ApiModelProperty(value = "民族")
    private String nation;

    /**
     * 是否证件 0否 1是
     */
    @ApiModelProperty(value = "是否证件 0否 1是")
    private Integer credential;
    /**
     * 分类名称
     */
    @ApiModelProperty(value = "分类id")
    private String skillTypeName;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/civil/ComActSocialWorkerVO.java

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

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

import java.util.Date;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-06-03
 * */
@Data
@ApiModel("社工返回参数")
public class ComActSocialWorkerVO {

    @ApiModelProperty(value = "ID")
    private Long id;

    @ApiModelProperty(value = "所属组织ID")
    private String socialOrgId;

    @ApiModelProperty(value = "姓名")
    private String name;

    @ApiModelProperty(value = "联系电话")
    private String telephone;

    @ApiModelProperty(value = "性别0女1男")
    private String gen;

    @ApiModelProperty(value = "所属街道")
    private String streetId;

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

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

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

    @ApiModelProperty(value = "更新人")
    private Long updateBy;

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

    /**
     * 身份证
     */
    @ApiModelProperty(value = "身份证")
    private String idCard;

    /**
     * 分类id
     */
    @ApiModelProperty(value = "分类id")
    private String skillType;

    /**
     * 入职时间
     */
    @ApiModelProperty(value = "入职时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date joinTime;

    /**
     * 住址
     */
    @ApiModelProperty(value = "住址")
    private String address;

    /**
     * 图片
     */
    @ApiModelProperty(value = "图片")
    private String image;

    /**
     * 学历
     */
    @ApiModelProperty(value = "学历")
    private String education;

    /**
     * 政治面貌
     */
    @ApiModelProperty(value = "政治面貌")
    private String politicalOutlook;

    /**
     * 民族
     */
    @ApiModelProperty(value = "民族")
    private String nation;

    /**
     * 是否证件 0否 1是
     */
    @ApiModelProperty(value = "是否证件 0否 1是")
    private Integer credential;

    @ApiModelProperty(value = "分类名称")
    private String skillTypeName;

    @ApiModelProperty(value = "年龄")
    private Integer age;

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

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

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

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.util.Date;
import java.util.List;

/**
 * 志愿者组织队伍表返回参数
 *
 * @author lyq
 * @since 2021-10-30 16:06:57
 */
@Data
@ApiModel("志愿者组织队伍表返回参数")
public class ComMngVolunteerOrgTeamVo {

    /**
     * 主键id
     */
    @ApiModelProperty(value = "主键id")
    private Long id;
    /**
     * 社区id
     */
    @ApiModelProperty(value = "社区id")
    private Long communityId;
    /**
     * 名称
     */
    @ApiModelProperty(value = "名称")
    private String name;
    /**
     * 父级id,为0时则为组织，不为0则为队伍
     */
    @ApiModelProperty(value = "父级id,为0时则为组织，不为0则为队伍")
    private Long parentId;
    /**
     * 服务类型
     */
    @ApiModelProperty(value = "服务类型")
    private Long serviceTypeId;
    /**
     * 服务类型名称
     */
    @ApiModelProperty(value = "服务类型名称")
    private String serviceTypeName;
    /**
     * 创建时间
     */
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "创建时间")
    private Date createAt;
    /**
     * 修改时间
     */
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "修改时间")
    private Date updateAt;

    @ApiModelProperty(value = "组织下队伍列表")
    private List<ComMngVolunteerOrgTeamVo> childList;

    @ApiModelProperty(value = "创建人名字")
    private String createByName;

}

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

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

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.util.Date;

/**
 * 志愿者服务类型表返回参数
 *
 * @author lyq
 * @since 2021-10-30 16:47:10
 */
@Data
@ApiModel("志愿者服务类型表返回参数")
public class ComMngVolunteerServiceTypeVo {

    /**
     * 主键id
     */
    @ApiModelProperty(value = "主键id")
    private Long id;
    /**
     * 社区id
     */
    @ApiModelProperty(value = "社区id")
    private Long communityId;
    /**
     * 名称
     */
    @ApiModelProperty(value = "名称")
    private String name;
    /**
     * 备注
     */
    @ApiModelProperty(value = "备注")
    private String remark;
    /**
     * 创建时间
     */
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "创建时间")
    private Date createAt;
    /**
     * 创建人id
     */
    @ApiModelProperty(value = "创建人id")
    private Long createBy;
    /**
     * 创建人名称
     */
    @ApiModelProperty(value = "创建人名称")
    private String createByName;
    /**
     * 修改时间
     */
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "修改时间")
    private Date updateAt;
    /**
     * 修改人id
     */
    @ApiModelProperty(value = "修改人id")
    private Long updateBy;

}

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

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

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.util.Date;

/**
 * 志愿者技能表返回参数
 *
 * @author lyq
 * @since 2021-10-30 16:47:37
 */
@Data
@ApiModel("志愿者技能表返回参数")
public class ComMngVolunteerSkillVo {

    /**
     * 主键id
     */
    @ApiModelProperty(value = "主键id")
    private Long id;
    /**
     * 社区id
     */
    @ApiModelProperty(value = "社区id")
    private Long communityId;
    /**
     * 名称
     */
    @ApiModelProperty(value = "名称")
    private String name;
    /**
     * 备注
     */
    @ApiModelProperty(value = "备注")
    private String remark;
    /**
     * 创建时间
     */
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "创建时间")
    private Date createAt;
    /**
     * 创建人id
     */
    @ApiModelProperty(value = "创建人id")
    private Long createBy;
    /**
     * 创建人名称
     */
    @ApiModelProperty(value = "创建人名称")
    private String createByName;
    /**
     * 修改时间
     */
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty(value = "修改时间")
    private Date updateAt;
    /**
     * 修改人id
     */
    @ApiModelProperty(value = "修改人id")
    private Long updateBy;

}

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

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

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


/**
 * 志愿者组织统计返回参数
 *
 * @author lyq
 * @since 2021-10-30 16:06:57
 */
@Data
@ApiModel("志愿者组织统计返回参数")
public class ComMngVolunteerStatisticsVo {

    @ApiModelProperty(value = "组织数量")
    private Integer orgTotal;

    @ApiModelProperty(value = "队伍数量")
    private Integer teamTotal;

    @ApiModelProperty(value = "志愿者数量")
    private Integer volunteerTotal;

}

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

@@ -88,4 +88,7 @@
    @ApiModelProperty("签到结束时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date endTime;

    @ApiModelProperty("1签到 2签退")
    private Integer signType;
}

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

@@ -180,7 +180,7 @@
    @ApiModelProperty("活动参加志愿者人员集合")
    private List<ActivitySignVO> activityVolunteerList;

    @ApiModelProperty("活动类型 1 支援者活动 2 普通社区活动 3 党建活动")
    @ApiModelProperty("活动类型 1 支援者活动 2 普通社区活动 3 党建活动 4项目活动")
    private Integer type;

    @ApiModelProperty("活动创建时间")
@@ -248,4 +248,37 @@

    @ApiModelProperty("单次活动时长（小时）")
    private Integer duration;

    @ApiModelProperty("项目Id")
    private Long projectId;

    @ApiModelProperty("项目名称")
    private String projectName;

    @ApiModelProperty("社工数")
    private Integer socialCount;


    /**
     * 党员参与者人数下线
     */
    @ApiModelProperty("党员参与者人数下线")
    private Integer partyMemberMin;

    /**
     * 党员参与者人数上限
     */
    @ApiModelProperty("党员参与者人数上限")
    private Integer partyMemberMax;
    /**
     * 签退范围，默认0无限制
     */
    @ApiModelProperty("签退范围，默认0无限制")
    private Integer signOutRange;

    @ApiModelProperty("单次活动时长")
    private Integer activityTime;

    @ApiModelProperty("1签到 2签退")
    private Integer signType;
}

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

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

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

import java.util.Date;
import java.util.List;

/**
 * @author zzj
 */
@Data
@ApiModel
public class ComActColumnLevelVO {
    private Long id;

    /**
     * 分类名称
     */
    @ApiModelProperty(value = "分类名称")
    private String name;

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

    /**
     * 创建时间
     */
    @ApiModelProperty(value = "创建时间")
    private Date createTime;

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

    /**
     * 修改时间
     */
    @ApiModelProperty(value = "修改时间")
    private Date updateTime;

    /**
     * 状态 0禁用 1启用
     */
    @ApiModelProperty(value = "状态 0禁用 1启用")
    private Integer status;

    /**
     * 分类类型 1服务类型分类 2技能分类 3通知公告 4项目分类
     */
    @ApiModelProperty(value = "分类类型 1服务类型分类 2技能分类 3通知公告 4项目分类")
    private Integer type;

    private Long communityId;

    @ApiModelProperty(value = "父类id")
    private Long parentId;
    @ApiModelProperty(value = "二级目录集合")
    List<ComActColumnVO> comActColumnVOList;
}

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

@@ -51,11 +51,16 @@
    private Integer status;

    /**
     * 分类类型 1服务类型分类 2技能分类 3通知公告
     * 分类类型 1服务类型分类 2技能分类 3通知公告 4项目分类
     */
    @ApiModelProperty(value = "分类类型 1服务类型分类 2技能分类 3通知公告")
    @ApiModelProperty(value = "分类类型 1服务类型分类 2技能分类 3通知公告 4项目分类")
    private Integer type;

    private Long communityId;

    @ApiModelProperty(value = "父类id")
    private Long parentId;

    @ApiModelProperty("街道id")
    private Long streetId;
}

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

@@ -242,4 +242,37 @@

    @ApiModelProperty("权限id")
    private Long roleId;

    @ApiModelProperty("状态")
    private Integer status;

    @ApiModelProperty("成立方式 1社区孵化 2民政注册")
    private Integer buildType;

    @ApiModelProperty("经度")
    private String longitude;

    @ApiModelProperty("纬度")
    private String latitude;

    @ApiModelProperty("服务类型")
    private Long serviceType;

    @ApiModelProperty("街道id")
    private Long streetId;

    @ApiModelProperty("服务类型名称")
    private String serviceName;

    @ApiModelProperty("所属机构名称")
    private String streetName;

    @ApiModelProperty("是否三社 0否1是")
    private Integer isSociety;

    /**
     * 描述
     */
    @ApiModelProperty("描述")
    private String description;
}

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

@@ -11,6 +11,7 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.validator.constraints.Length;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -84,4 +85,41 @@

    @ApiModelProperty(value = "申请提交人ID", hidden = true)
    private Long submitUserId;

    @ApiModelProperty(value = "身份证号")
    private String idCard;

    @ApiModelProperty(value = "组织id")
    private Long orgId;

    @ApiModelProperty(value = "队伍id")
    private Long teamId;

    @ApiModelProperty(value = "技能id")
    private Long skillId;

    @ApiModelProperty(value = "关键词")
    private String keyWord;

    @ApiModelProperty(value = "组织名称")
    private String orgName;

    @ApiModelProperty(value = "队伍名称")
    private String teamName;

    @ApiModelProperty(value = "技能名称")
    private String skillName;

    @ApiModelProperty(value = "服务类型id")
    private Long serviceTypeId;

    @ApiModelProperty(value = "服务类型名称")
    private String serviceTypeName;

    @ApiModelProperty(value = "是否是在校大学生（1.是 2.否）")
    private Integer isUniversity;

    @Length(max = 30)
    @ApiModelProperty(value = "大学名称")
    private String universityName;
}

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

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

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

/**
 * @author zzj
 */
@Data
@ApiModel("党员活动柱状图")
public class PartyActivityLine {
    @ApiModelProperty("月份")
    private String x;
    @ApiModelProperty("数量")
    private Integer y;
}

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

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

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

import java.util.List;

/**
 * @author zzj
 */
@Data
@ApiModel("党员统计")
public class PartyActivityStatics {
    @ApiModelProperty("活动总数")
    private Integer activityCount;
    @ApiModelProperty("党员总数")
    private Integer memberCount;
    @ApiModelProperty("活动饼状图")
    private List<PartyActivityTypeChart> partyActivityTypeChartList;
    @ApiModelProperty("活动柱状图")
    private List<PartyActivityLine> partyActivityLines;
}

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

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

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

/**
 * @author zzj
 */
@Data
@ApiModel("党员活动类型饼状图")
public class PartyActivityTypeChart {
    @ApiModelProperty("名称")
    private String name;
    @ApiModelProperty("数量")
    private Integer count;
    @ApiModelProperty("百分比")
    private Integer percent;
}

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

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

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

/**
 * @author zzj
 */
@Data
@ApiModel("大屏首页数据")
public class BigScreenHmkBaseInfo {
    @ApiModelProperty("项目管理")
    private BigScreenHmkProjectInfo bigScreenHmkProjectInfo;
    @ApiModelProperty("项目数")
    private Integer projectCount;
    @ApiModelProperty("活动数")
    private Integer activityCount;
    @ApiModelProperty("社工数")
    private Integer socialWorkerCount;
    @ApiModelProperty("居民数")
    private Integer userCount;
    @ApiModelProperty("社会组织数")
    private Integer socialOrgCount;
    @ApiModelProperty("服务次数")
    private Integer serviceCount;
    @ApiModelProperty("社会组织管理")
    private BigScreenHmkSocialOrgInfo bigScreenHmkSocialOrgInfo;
    @ApiModelProperty("社工分析数据")
    private BigScreenHmkSocialWorkerInfo bigScreenHmkSocialWorkerInfo;
}

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

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

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

import java.util.List;

/**
 * @author zzj
 */
@Data
@ApiModel("项目数据")
public class BigScreenHmkProjectInfo {
    @ApiModelProperty("项目数")
    private Integer count;
    @ApiModelProperty("项目类型饼状图")
    private List<BigScreenHmkProjectTypeInfo> typeInfoList;
    @ApiModelProperty("项目活动类型饼状图")
    private List<BigScreenHmkProjectTypeInfo> activityTypeInfoList;
    @ApiModelProperty("已分派")
    private Integer assigned;
    @ApiModelProperty("待分派")
    private Integer assign;
}

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

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

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

/**
 * @author zzj
 */
@Data
@ApiModel("项目饼状图")
public class BigScreenHmkProjectTypeInfo {
    @ApiModelProperty("名字")
    private String name;
    @ApiModelProperty("数量")
    private Integer count;
    @ApiModelProperty("百分比")
    private Integer percent;
}

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

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

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

import java.util.List;

/**
 * @author zzj
 */
@Data
@ApiModel("社会组织饼状图")
public class BigScreenHmkSocialOrgInfo {
    @ApiModelProperty("总数")
    private Integer count;
    @ApiModelProperty("服务数")
    private Integer serviceCount;
    @ApiModelProperty("组织分类图")
    List<BigScreenHmkProjectTypeInfo> typeInfoList;
}

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

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

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

import java.util.List;

/**
 * @author zzj
 */
@Data
@ApiModel("社工基础数据")
public class BigScreenHmkSocialWorkerInfo {
    @ApiModelProperty("社工年龄分布")
    private List<BigScreenHmkProjectTypeInfo> socialWorkerAge;
    @ApiModelProperty("社工技能分析")
    private List<BigScreenHmkProjectTypeInfo> socialWorkerSkill;
}

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

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

import java.util.List;

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

/**
 * @title: CascadeCommVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 级联数据公共类
 * @author: hans
 * @date: 2022/02/14 11:13
 */
@Data
@ApiModel("级联数据公共类")
public class CascadeCommVO {

    @ApiModelProperty("value")
    private Long value;

    @ApiModelProperty("parentId")
    private Long parentId;

    @ApiModelProperty("label")
    private String label;

    @ApiModelProperty("children")
    private List<CascadeCommVO> children;
}

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

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

import java.util.Date;

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

/**
 * @title: ComFmsClassroomVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 五微服务-微讲堂信息
 * @author: hans
 * @date: 2022/02/17 14:16
 */
@Data
@ApiModel("五微服务-微讲堂信息")
public class ComFmsClassroomVO {

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

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

    @ApiModelProperty("参与学习人数")
    private Integer scholars;

    @ApiModelProperty("封面")
    private String cover;

    @ApiModelProperty("内容")
    private String content;

    @ApiModelProperty("浏览量")
    private Integer viewNum;

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

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

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

import java.util.Date;

import com.fasterxml.jackson.annotation.JsonFormat;

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

/**
 * @title: ComFmsServiceVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 五微服务-评论详情
 * @author: hans
 * @date: 2022/02/16 14:13
 */
@Data
@ApiModel("五微服务-评论详情")
public class ComFmsServiceEvaluateVO {

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

    @ApiModelProperty("服务关联id")
    private Long serviceId;

    @ApiModelProperty("评分星级（1.非常差2.差3.一般4.满意5.非常满意）")
    private String starLevel;

    @ApiModelProperty("内")
    private String evaluateContent;

    @ApiModelProperty("图片")
    private String image;

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

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

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

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

import com.alibaba.excel.annotation.ExcelProperty;

import lombok.Data;

/**
 * @title: ComFmsTeamMemberImportExcelVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 五微服务-微服务导入信息
 * @author: hans
 * @date: 2022/02/15 10:36
 */
@Data
public class ComFmsServiceImportExcelVO implements Serializable {

    @ExcelProperty(value = "服务用户", index = 0)
    private String userName;

    @ExcelProperty(value = "联系电话", index = 1)
    private String phone;

    @ExcelProperty(value = "服务时间", index = 2)
    private Date serviceAt;

    @ExcelProperty(value = "服务内容", index = 3)
    private String serviceContent;

    @ExcelProperty(value = "服务过程", index = 4)
    private String serviceProcess;
}

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

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

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

import com.alibaba.excel.annotation.ExcelProperty;

import lombok.Data;

/**
 * @title: ComFmsTeamMemberImportExcelVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 五微服务-微服务导入错误反馈信息
 * @author: hans
 * @date: 2022/02/15 10:36
 */
@Data
public class ComFmsServiceImportMistakeExcelVO implements Serializable {

    @ExcelProperty(value = "服务用户", index = 0)
    private String userName;

    @ExcelProperty(value = "联系电话", index = 1)
    private String phone;

    @ExcelProperty(value = "服务时间", index = 2)
    private String serviceAt;

    @ExcelProperty(value = "服务内容", index = 3)
    private String serviceContent;

    @ExcelProperty(value = "服务过程", index = 4)
    private String serviceProcess;

    @ExcelProperty(value = "错误信息", index = 5)
    private String mistake;
}

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

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

import java.util.Date;

import com.fasterxml.jackson.annotation.JsonFormat;

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

/**
 * @title: ComFmsServiceVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 五微服务-微服务记录
 * @author: hans
 * @date: 2022/02/16 14:13
 */
@Data
@ApiModel("五微服务-微服务记录")
public class ComFmsServiceRecordVO {

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

    @ApiModelProperty("服务关联id")
    private Long serviceId;

    @ApiModelProperty("服务阶段")
    private String stage;

    @ApiModelProperty("内容")
    private String content;

    @ApiModelProperty("图片")
    private String image;

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

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

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

import java.util.Date;
import java.util.List;

import com.fasterxml.jackson.annotation.JsonFormat;

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

/**
 * @title: ComFmsServiceVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 五微服务-微服务信息
 * @author: hans
 * @date: 2022/02/16 14:13
 */
@Data
@ApiModel("五微服务-微服务信息")
public class ComFmsServiceVO {

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

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

    @ApiModelProperty("真实姓名")
    private String realName;

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

    @ApiModelProperty("联系电话")
    private String phone;

    @ApiModelProperty("服务内容")
    private String serviceContent;

    @ApiModelProperty("服务内容图片")
    private String serviceImage;

    @ApiModelProperty("反馈内容")
    private String approvalContent;

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

    @ApiModelProperty("团队服务人员关联id")
    private Long memberId;

    @ApiModelProperty("服务人员")
    private String serviceMember;

    @ApiModelProperty("服务评价")
    private Integer starLevel;

    @ApiModelProperty("服务状态（1.待核实2.进行中3.待评价4.已完成5.未通过）")
    private Integer serviceStatus;

    @ApiModelProperty("服务时间")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date serviceAt;

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

    @ApiModelProperty("创建者")
    private Long createdBy;

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

    @ApiModelProperty("由谁更新")
    private Long updatedBy;

    @ApiModelProperty("所属社区")
    private Long communityId;

    @ApiModelProperty("服务进度")
    private List<ComFmsServiceRecordVO> serviceRecords;

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

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

    @ApiModelProperty("服务评价")
    private ComFmsServiceEvaluateVO evaluateVO;

    @ApiModelProperty("是否本人")
    private Boolean isMyself;

    @ApiModelProperty("自动评价倒计时")
    private Long autoEvaluateAt;
}

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

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

import com.alibaba.excel.annotation.ExcelProperty;

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

/**
 * @title: ComFmsTeamMemberExportExcleVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 五微服务-团队成员导出信息
 * @author: hans
 * @date: 2022/02/16 10:34
 */
@Data
@ApiModel("五微服务-团队成员导出信息")
public class ComFmsTeamMemberExportExcelVO {

    @ExcelProperty(value = "团队类型", index = 0)
    private String teamType;

    @ExcelProperty(value = "团队名称", index = 1)
    private String teamName;

    @ExcelProperty(value = "团队成员", index = 2)
    private String teamMember;

    @ExcelProperty(value = "身份证号", index = 3)
    private String idCard;

    @ExcelProperty(value = "性别", index = 4)
    private String gender;

    @ExcelProperty(value = "年龄", index = 5)
    private String age;

    @ExcelProperty(value = "联系电话", index = 6)
    private String phone;
}

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

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

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

import com.alibaba.excel.annotation.ExcelProperty;

import lombok.Data;

/**
 * @title: ComFmsTeamMemberImportExcelVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 五微服务-团队成员导入信息
 * @author: hans
 * @date: 2022/02/15 10:36
 */
@Data
public class ComFmsTeamMemberImportExcelVO implements Serializable {

    @ExcelProperty(value = "团队类型", index = 0)
    private String teamType;

    @ExcelProperty(value = "团队名称", index = 1)
    private String teamName;

    @ExcelProperty(value = "团队成员", index = 2)
    private String teamMember;

    @ExcelProperty(value = "身份证号（非必填）", index = 3)
    private String idCard;

    @ExcelProperty(value = "联系电话", index = 4)
    private String phone;
}

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

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

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

import com.alibaba.excel.annotation.ExcelProperty;

import lombok.Data;

/**
 * @title: ComFmsTeamMemberImportExcelVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 五微服务-团队成员导入错误反馈信息
 * @author: hans
 * @date: 2022/02/15 10:36
 */
@Data
public class ComFmsTeamMemberImportMistakeExcelVO implements Serializable {

    @ExcelProperty(value = "团队类型", index = 0)
    private String teamType;

    @ExcelProperty(value = "团队名称", index = 1)
    private String teamName;

    @ExcelProperty(value = "团队成员", index = 2)
    private String teamMember;

    @ExcelProperty(value = "身份证号（非必填）", index = 3)
    private String idCard;

    @ExcelProperty(value = "联系电话", index = 4)
    private String phone;

    @ExcelProperty(value = "错误信息", index = 5)
    private String mistake;
}

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

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

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

/**
 * @title: ComFmsTeamTypeVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 五微服务-团队成员信息
 * @author: hans
 * @date: 2022/02/11 14:54
 */
@Data
@ApiModel("五微服务-团队成员信息")
public class ComFmsTeamMemberVO {

    @ApiModelProperty("团队成员id")
    private Long id;

    @ApiModelProperty("成员姓名")
    private String name;

    @ApiModelProperty("联系电话")
    private String phone;

    @ApiModelProperty("身份证号")
    private String idCard;

    @ApiModelProperty("所属团队类型")
    private Long teamType;

    @ApiModelProperty("所属团队类型名称")
    private String teamTypeName;

    @ApiModelProperty("所属团队")
    private Long teamId;

    @ApiModelProperty("所属团队名称")
    private String teamName;

    @ApiModelProperty("性别（1.男2.女3.未知）")
    private Integer gender;

    @ApiModelProperty("年龄")
    private Integer age;

    @ApiModelProperty("团队级联关系")
    private String cascadeIds;
}

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

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

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

/**
 * @title: ComFmsTeamTypeVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 五微服务-团队类型信息
 * @author: hans
 * @date: 2022/02/11 14:54
 */
@Data
@ApiModel("五微服务-团队类型信息")
public class ComFmsTeamTypeVO {

    @ApiModelProperty("团队类型id")
    private Long id;

    @ApiModelProperty("团队类型名称")
    private String name;
}

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

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

import java.util.List;

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

import javax.validation.constraints.NotBlank;

/**
 * @title: ComFmsTeamTypeVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 五微服务-团队信息
 * @author: hans
 * @date: 2022/02/11 14:54
 */
@Data
@ApiModel("五微服务-团队信息")
public class ComFmsTeamVO {

    @ApiModelProperty("团队id")
    private Long id;

    @ApiModelProperty("团队名称")
    private String name;

    @ApiModelProperty("服务电话")
    private String phone;

    @ApiModelProperty("所属团队类型")
    private Long teamType;

    @ApiModelProperty("团队照片")
    private String image;

    @ApiModelProperty("团队成员总数")
    private Integer teamMemberTotal;

    @ApiModelProperty("团队成员列表")
    private List<ComFmsTeamMemberVO> memberList;
}

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

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

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

/**
 * @title: FmsServiceTopStatisticsVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 五微服务-微讲堂顶部统计
 * @author: hans
 * @date: 2022/02/17 10:11
 */
@Data
@ApiModel("五微服务-微讲堂顶部统计")
public class FmsClassroomTopStatisticsVO {

    @ApiModelProperty("开课次数")
    private Integer classroomCount;

    @ApiModelProperty("学习人数")
    private Integer learnCount;
}

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

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

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

/**
 * @title: FmsServiceTopStatisticsVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 五微服务-微调节/微防控顶部统计
 * @author: hans
 * @date: 2022/02/17 10:11
 */
@Data
@ApiModel("五微服务-微调节/微防控顶部统计")
public class FmsEventTopStatisticsVO {

    @ApiModelProperty("待处理")
    private Integer unHandledCount;

    @ApiModelProperty("已解决")
    private Integer handledCount;
}

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

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

import java.util.Date;

import com.fasterxml.jackson.annotation.JsonFormat;

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;

/**
 * @title: ComFmsClassroomVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 五微服务-事件信息
 * @author: hans
 * @date: 2022/02/17 14:16
 */
@Data
@ApiModel("五微服务-事件信息")
public class FmsEventVO {

    @ApiModelProperty("事件id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;

    @ApiModelProperty("事件类型")
    private String eventClazz;

    @ApiModelProperty("发生区域")
    private String gridName;

    @ApiModelProperty("发生地经纬度")
    private String happentLatLng;

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

    @ApiModelProperty("事件描述")
    private String eventDes;

    @ApiModelProperty("危险级别")
    private Integer dangerLevel;

    @ApiModelProperty("是否紧急")
    private Boolean urgent;

    @ApiModelProperty("是否重大")
    private Boolean major;

    @ApiModelProperty("状态")
    private Integer eventProcessStatus;
}

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

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

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

/**
 * @title: FmsServiceTopStatisticsVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 五微服务-微服务顶部统计
 * @author: hans
 * @date: 2022/02/17 10:11
 */
@Data
@ApiModel("五微服务-微服务顶部统计")
public class FmsServiceTopStatisticsVO {

    @ApiModelProperty("已完成")
    private Integer completedCount;

    @ApiModelProperty("待核实")
    private Integer unVerifiedCount;

    @ApiModelProperty("进行中")
    private Integer inProgressCount;

    @ApiModelProperty("待评价")
    private Integer unEvaluateCount;

    @ApiModelProperty("未通过")
    private Integer unPassCount;
}

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

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

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

/**
 * @title: ComFmsTeamTypeVO
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 五微服务-微团队顶部统计
 * @author: hans
 * @date: 2022/02/11 14:54
 */
@Data
@ApiModel("五微服务-微团队顶部统计")
public class TeamMemberTopStatisticsVO {

    @ApiModelProperty("团队数量")
    private Integer teamCount;

    @ApiModelProperty("团队成员")
    private Integer memberCount;
}

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

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

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

import java.util.List;

/**
 * @author zzj
 */
@Data
@ApiModel("礼品统计")
public class ComActRafflePrizeCount {
    @ApiModelProperty("总数")
    private Integer total;
    @ApiModelProperty("剩下")
    private Integer surplus;
    @ApiModelProperty("礼品列表")
    private List<ComActRafflePrizeVO> comActRafflePrizeVOList;
}

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

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

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;


/**
 * 抽奖活动奖品表(ComActRafflePrize)表实体类
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 抽奖活动奖品表相关功能
 *
 * @author zzj
 * @since 2022-02-18 14:31:45
 */
@Data
@ApiModel("抽奖活动奖品表")
public class ComActRafflePrizeVO implements Serializable {

    private static final long serialVersionUID = 706879121724104929L;

    private Long id;

    /**
     * 奖品名称
     */
    @ApiModelProperty(value = "奖品名称")
    private String name;

    /**
     * 总数
     */
    @ApiModelProperty(value = "总数")
    private Integer total;

    /**
     * 剩余
     */
    @ApiModelProperty(value = "剩余")
    private Integer surplus;

    /**
     * 图片
     */
    @ApiModelProperty(value = "图片")
    private String image;

    /**
     * 抽奖活动id
     */
    @ApiModelProperty(value = "抽奖活动id")
    private Long raffleId;

}

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

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

import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.net.URL;
import java.util.Date;

/**
 * @author zzj
 */
@Data
public class ComActRaffleRecordExcelVO {
    @ApiModelProperty(value = "昵称")
    @ExcelProperty(value = "昵称",index = 0)
    private String nickName;

    @ApiModelProperty(value = "姓名")
    @ExcelProperty(value = "姓名",index = 1)
    private String username;

    @ApiModelProperty(value = "联系电话")
    @ExcelProperty(value = "联系电话",index = 2)
    private String phone;
    /**
     * 创建时间
     */
    @ExcelProperty(value = "中奖时间",index = 3)
    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createTime;

    @ApiModelProperty(value = "奖品名称")
    @ExcelProperty(value = "奖品名称",index = 4)
    private String prizeName;

    @ApiModelProperty(value = "核销人名称")
    @ExcelProperty(value = "核销人",index = 5)
    private String staffName;

    @ApiModelProperty(value = "核销时间")
    @ExcelProperty(value = "核销时间",index = 6)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date staffTime;

    @ExcelProperty(value = "状态",index = 7)
    private String status;

    public String getStatus() {
        if("1".equals(this.status)){
            return "待兑奖";
        }
        if("2".equals(this.status)){
            return "已兑奖";
        }
        if("3".equals(this.status)){
            return "已失效";
        }
        return "";
    }
}

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

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

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;


/**
 * 抽奖活动中奖记录表(ComActRaffleRecord)表实体类
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 抽奖活动中奖记录表相关功能
 *
 * @author zzj
 * @since 2022-02-18 14:32:01
 */
@Data
@ApiModel("抽奖活动中奖记录表")
public class ComActRaffleRecordVO implements Serializable {

    private static final long serialVersionUID = 201328912468431601L;

    private Long id;

    /**
     * 用户id
     */
    @ApiModelProperty(value = "用户id")
    private Long userId;

    /**
     * 创建时间
     */
    @ApiModelProperty(value = "创建时间")
    private Date createTime;

    /**
     * 奖品id
     */
    @ApiModelProperty(value = "奖品id")
    private Long prizeId;

    /**
     * 核销人
     */
    @ApiModelProperty(value = "核销人")
    private Long staffId;

    /**
     * 核销时间
     */
    @ApiModelProperty(value = "核销时间")
    private Date staffTime;

    @ApiModelProperty(value = "0 已参加 1待兑奖 2已兑奖 3已失效 4未中奖")
    private Integer status;

    @ApiModelProperty(value = "抽奖id")
    private Long raffleId;

    @ApiModelProperty(value = "核销人名称")
    private String staffName;

    @ApiModelProperty(value = "奖品名称")
    private String prizeName;

    @ApiModelProperty(value = "奖品图片")
    private String image;

    @ApiModelProperty(value = "昵称")
    private String nickName;

    @ApiModelProperty(value = "姓名")
    private String username;

    @ApiModelProperty(value = "联系电话")
    private String phone;

    /**
     * 兑奖开始时间
     */
    @ApiModelProperty(value = "兑奖开始时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
    private Date raffleStartTime;

    /**
     * 兑奖结束时间
     */
    @ApiModelProperty(value = "兑奖结束时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
    private Date raffleStopTime;

}

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

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

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;
import java.util.List;


/**
 * 抽奖活动表(ComActRaffle)表实体类
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 抽奖活动表相关功能
 *
 * @author zzj
 * @since 2022-02-18 14:31:19
 */
@Data
@ApiModel("抽奖活动表")
public class ComActRaffleVO implements Serializable {

    private static final long serialVersionUID = -19557136291047637L;

    private Long id;

    /**
     * 名称
     */
    @ApiModelProperty(value = "名称")
    private String name;

    /**
     * 开始时间
     */
    @ApiModelProperty(value = "开始时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
    private Date startTime;

    /**
     * 结束时间
     */
    @ApiModelProperty(value = "结束时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
    private Date stopTime;

    /**
     * 开奖时间
     */
    @ApiModelProperty(value = "开奖时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
    private Date lotteryTime;

    /**
     * 兑奖开始时间
     */
    @ApiModelProperty(value = "兑奖开始时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
    private Date raffleStartTime;

    /**
     * 兑奖结束时间
     */
    @ApiModelProperty(value = "兑奖结束时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
    private Date raffleStopTime;

    /**
     * 工作时间
     */
    @ApiModelProperty(value = "工作时间")
    private String workTime;

    /**
     * 地址
     */
    @ApiModelProperty(value = "地址")
    private String address;

    /**
     * 经度
     */
    @ApiModelProperty(value = "经度")
    private String longitude;

    /**
     * 纬度
     */
    @ApiModelProperty(value = "纬度")
    private String latitude;

    /**
     * 联系方式
     */
    @ApiModelProperty(value = "联系方式")
    private String phone;

    /**
     * 封面
     */
    @ApiModelProperty(value = "封面")
    private String cover;

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

    /**
     * 状态 0未开始 1报名中 2待开奖 3已开奖
     */
    @ApiModelProperty(value = "状态 0未开始 1报名中 2待开奖 3已开奖")
    private Integer status;

    /**
     * 创建人
     */
    @ApiModelProperty(value = "创建人")
    private Long createBy;

    /**
     * 社区id
     */
    @ApiModelProperty(value = "社区id")
    private Long communityId;

    @ApiModelProperty(value = "奖品数量")
    private Integer prizeCount;

    @ApiModelProperty(value = "参与人数")
    private Integer joinCount;

    @ApiModelProperty(value = "中奖人数")
    private Integer raffleCount;

    @ApiModelProperty(value = "待兑换奖品数量")
    private Integer waitRaffleCount;

    @ApiModelProperty(value = "创建人名称")
    private String createName;

    @ApiModelProperty(value = "奖品集合")
    private List<ComActRafflePrizeVO> comActRafflePrizeVOList;

    @ApiModelProperty(value = "中奖情况")
    private ComActRaffleRecordVO comActRaffleRecordVO;

    @ApiModelProperty(value = "参与状态 0 不可参与 1 可参与")
    private Integer joinStatus;

    @ApiModelProperty("是否参与  0参与 1没参与")
    private Integer isJoin;
}

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

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

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;
import java.util.List;


/**
 * 项目人员(ComActSocialProjectMember)表实体类
 *
 * @author makejava
 * @since 2021-12-23 15:16:42
 */
@Data
@ApiModel("项目人员")
public class ComActSocialProjectMemberVO implements Serializable {

    private Long id;

    /**
     * 姓名
     */
    @ApiModelProperty(value = "姓名")
    private String name;

    /**
     * 年龄
     */
    @ApiModelProperty(value = "年龄")
    private Integer age;

    /**
     * 照片
     */
    @ApiModelProperty(value = "照片")
    private String image;

    /**
     * 手机号
     */
    @ApiModelProperty(value = "手机号")
    private String phone;

    /**
     * 类型 1社工 2志愿者
     */
    @ApiModelProperty(value = "类型 1社工 2志愿者")
    private Integer type;

    /**
     * 创建时间
     */
    @ApiModelProperty(value = "创建时间")
    private Date createTime;

    /**
     * 项目id
     */
    @ApiModelProperty(value = "项目id")
    private Long projectId;

    /**
     * 所属社区
     */
    @ApiModelProperty(value = "社区名称")
    private String communityName;

    @ApiModelProperty(value = "人员Id")
    private Long paramId;

    @ApiModelProperty(value = "ids")
    private List<Long> ids;

    private Long communityId;
}

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

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

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;


/**
 * 项目宣传表(ComActSocialProjectPublicity)表实体类
 *
 * @author makejava
 * @since 2021-12-23 14:30:54
 */
@Data
@ApiModel("项目宣传表")
public class ComActSocialProjectPublicityVO {


    private Long id;

    /**
     * 标题
     */
    @ApiModelProperty(value = "标题")
    private String title;

    /**
     * 封面图
     */
    @ApiModelProperty(value = "封面图")
    private String image;

    /**
     * 内容
     */
    @ApiModelProperty(value = "内容")
    private String content;

    /**
     * 项目id
     */
    @ApiModelProperty(value = "项目id")
    private Long projectId;

    /**
     * 创建时间
     */
    @ApiModelProperty(value = "创建时间")
    private Date createTime;

    /**
     * 浏览量
     */
    @ApiModelProperty(value = "浏览量")
    private Integer views;

    /**
     * 是否置顶 0否 1是
     */
    @ApiModelProperty(value = "是否置顶")
    private Integer isTop;

    @ApiModelProperty(value = "项目名称")
    private String name;

    @ApiModelProperty(value="责任方")
    private String responsibility;

    @ApiModelProperty(value = "街道名字")
    private String streetName;
}

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

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

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;


/**
 * 项目进度表(ComActSocialProjectSchedule)表实体类
 *
 * @author makejava
 * @since 2021-12-23 14:31:15
 */
@Data
@ApiModel("项目进度表")
public class ComActSocialProjectScheduleVO{

    private Long id;

    /**
     * 标题
     */
    @ApiModelProperty(value = "标题")
    private String title;

    /**
     * 内容
     */
    @ApiModelProperty(value = "内容")
    private String content;

    /**
     * 创建时间
     */
    @ApiModelProperty(value = "创建时间")
    private Date createTime;

    /**
     * 项目id
     */
    @ApiModelProperty(value = "项目id")
    private Long projectId;

}

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

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

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;


/**
 * 社工服务表(ComActSocialWorkerService)表实体类
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 社工服务表相关功能
 *
 * @author zzj
 * @since 2022-02-16 15:59:41
 */
@Data
@ApiModel("社工服务表")
public class ComActSocialWorkerServiceVO implements Serializable {

    private Long id;

    /**
     * 社工id
     */
    @ApiModelProperty(value = "社工id")
    private Long workerId;

    /**
     * 发起人id
     */
    @ApiModelProperty(value = "发起人id")
    private Long senderId;

    /**
     * 服务状态 0待执行 1已完成
     */
    @ApiModelProperty(value = "服务状态 0待执行 1已完成")
    private Integer status;

    /**
     * 内容id
     */
    @ApiModelProperty(value = "内容id")
    private Long serviceId;

    /**
     * 服务类型 1微心愿 2随手拍
     */
    @ApiModelProperty(value = "服务类型 1微心愿 2随手拍")
    private Integer serviceType;

    /**
     * 创建时间
     */
    @ApiModelProperty(value = "创建时间")
    private Date createTime;

    /**
     * 汇报内容
     */
    @ApiModelProperty(value = "汇报内容")
    private String resultContent;

    /**
     * 汇报图片
     */
    @ApiModelProperty(value = "汇报图片")
    private String resultUrl;

    /**
     * 得分
     */
    @ApiModelProperty(value = "得分")
    private Integer score;

    @ApiModelProperty("发起人姓名")
    private String senderName;
}

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

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

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.util.Date;

/**
 * @author zzj
 */
@Data
@ApiModel("项目实体")
public class SocialProjectVO {

    private Long id;

    /**
     * 项目名称
     */
    @ApiModelProperty(value = "项目名称")
    private String name;

    /**
     * 项目类型 1公共文化 2社会组织参与 3 社会企业带动 4其他
     */
    @ApiModelProperty(value = "项目类型 1公共文化 2社会组织参与 3 社会企业带动 4其他")
    private Integer type;

    /**
     * 项目状态  1初创项目 2公开发布 3运作中 4 已结束
     */
    @ApiModelProperty(value = "项目状态  1初创项目 2公开发布 3运作中 4 已结束")
    private Integer status;

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

    /**
     * 社区id
     */
    @ApiModelProperty(value = "社区id")
    private Long communityId;

    /**
     * 街道id
     */
    @ApiModelProperty(value = "街道id")
    private Long streetId;

    /**
     * 责任方
     */
    @ApiModelProperty(value = "责任方")
    private String responsibility;

    /**
     * 父项目id
     */
    @ApiModelProperty(value = "父项目id")
    private Long parentId;

    /**
     * 附件
     */
    @ApiModelProperty(value = "附件")
    private String url;

    /**
     * 封面
     */
    @ApiModelProperty(value = "封面")
    private String image;

    /**
     * 介绍
     */
    @ApiModelProperty(value = "介绍")
    private String content;

    /**
     * 项目等级
     */
    @ApiModelProperty(value = "项目等级")
    private Integer level;

    /**
     * 浏览量
     */
    @ApiModelProperty(value = "浏览量")
    private Integer views;

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

    /**
     * 街道名字
     */
    @ApiModelProperty(value = "街道名字")
    private String streetName;

    /**
     * 街道电话
     */
    @ApiModelProperty(value = "街道电话")
    private String streetPhone;

    /**
     * 分类id
     */
    @ApiModelProperty(value = "分类id")
    private Long columnId;

    /**
     * 二级分类id
     */
    @ApiModelProperty(value = "二级分类id")
    private Long secondColumnId;

    /**
     * 分类名称
     */
    @ApiModelProperty(value = "分类名称")
    private String columnName;

    /**
     * 二级分类
     */
    @ApiModelProperty(value = "分类名称")
    private String secondColumnName;

    @ApiModelProperty(value = "责任方类型 1街道 2社区 3社会组织")
    private Integer responsibilityType;

    @ApiModelProperty(value = "责任方id")
    private Long responsibilityId;
}

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

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

import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;

import java.io.Serializable;

/**
 * @description: 批量导入志愿者请求参数
 * @author : lyq
 */
@Data
public class ComMngVolunteerErrorExcelVO implements Serializable {

    @ExcelProperty(value = "志愿者名称", index = 0)
    private String name;

    @ExcelProperty(value = "志愿者手机号", index = 1)
    private String phone;

    @ExcelProperty(value = "志愿者身份证", index = 2)
    private String idCard;

    @ExcelProperty(value = "志愿者组织", index = 3)
    private String orgName;

    @ExcelProperty(value = "志愿者队伍", index = 4)
    private String teamName;

    @ExcelProperty(value = "技能", index = 5)
    private String skillName;

    @ExcelProperty(value = "是否是大学生", index = 6)
    private Integer isUniversity;

    @ExcelProperty(value = "错误信息", index = 7)
    private String error;

}

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

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

import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;

import java.io.Serializable;

/**
 * @description: 批量导入志愿者请求参数
 * @author : lyq
 */
@Data
public class ComMngVolunteerExcelVO implements Serializable {

    @ExcelProperty(value = "志愿者名称", index = 0)
    private String name;

    @ExcelProperty(value = "志愿者手机号", index = 1)
    private String phone;

    @ExcelProperty(value = "志愿者身份证", index = 2)
    private String idCard;

    @ExcelProperty(value = "志愿者组织", index = 3)
    private String orgName;

    @ExcelProperty(value = "志愿者队伍", index = 4)
    private String teamName;

    @ExcelProperty(value = "技能", index = 5)
    private String skillName;

    @ExcelProperty(value = "是否是大学生", index = 6)
    private Integer isUniversity;

}

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

@@ -200,4 +200,7 @@
    @ApiModelProperty(value = "网格绑定社区id")
    private Long communityId;

    @ApiModelProperty(value = "撤销人")
    private String revoke;

}

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

@@ -87,4 +87,10 @@

    @ApiModelProperty("跳转状态")
    private Integer jumpType;

    @ApiModelProperty("政策分类: 1-社工人才政策 2-社会组织培育政策 3-其他政策")
    private Integer policyType;

    @ApiModelProperty("排序方式 正序 ASC")
    private String sort;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/AdministratorsUserVO.java

@@ -93,4 +93,12 @@

    private String areaCode;

    @ApiModelProperty(value = "街道id")
    private Long streetId;

    @ApiModelProperty(value = "三社账户类型  1街道 2社会组织 3社会组织成员")
    private Integer socialType;

    @ApiModelProperty("社会组织id")
    private Long orgId;
}

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

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

import java.util.List;

import com.panzhihua.common.model.dtos.community.microCommercialStreet.DeleteProductDTO;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.scheduling.annotation.Async;
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -18,6 +17,20 @@
import com.panzhihua.common.model.dtos.PageDTO;
import com.panzhihua.common.model.dtos.advertisement.ComOpsAdvDTO;
import com.panzhihua.common.model.dtos.advertisement.PageComOpsAdvDTO;
import com.panzhihua.common.model.dtos.civil.ComActSocialWorkerAddDTO;
import com.panzhihua.common.model.dtos.civil.ComActSocialWorkerDeleteDTO;
import com.panzhihua.common.model.dtos.civil.ComActSocialWorkerEditDTO;
import com.panzhihua.common.model.dtos.civil.ComActSocialWorkerExcelVO;
import com.panzhihua.common.model.dtos.civil.PageComActSocialWorkerDTO;
import com.panzhihua.common.model.dtos.common.AddComMngVolunteerOrgTeamDto;
import com.panzhihua.common.model.dtos.common.AddComMngVolunteerServiceTypeDto;
import com.panzhihua.common.model.dtos.common.AddComMngVolunteerSkillDto;
import com.panzhihua.common.model.dtos.common.EditComMngVolunteerOrgTeamDto;
import com.panzhihua.common.model.dtos.common.EditComMngVolunteerServiceTypeDto;
import com.panzhihua.common.model.dtos.common.EditComMngVolunteerSkillDto;
import com.panzhihua.common.model.dtos.common.PageComMngVolunteerOrgTeamDto;
import com.panzhihua.common.model.dtos.common.PageComMngVolunteerServiceTypeDto;
import com.panzhihua.common.model.dtos.common.PageComMngVolunteerSkillDto;
import com.panzhihua.common.model.dtos.community.AddComActDynTypeDTO;
import com.panzhihua.common.model.dtos.community.AddIdentityAuthDTO;
import com.panzhihua.common.model.dtos.community.CancelRecordDTO;
@@ -149,11 +162,32 @@
import com.panzhihua.common.model.dtos.community.elder.PageElderAuthStatisticDTO;
import com.panzhihua.common.model.dtos.community.elder.PagePensionAuthStatisticDTO;
import com.panzhihua.common.model.dtos.community.elder.SignElderAuthStatisticDTO;
import com.panzhihua.common.model.dtos.community.fms.AddFmsClassroomAdminDTO;
import com.panzhihua.common.model.dtos.community.fms.AddFmsServiceAdminDTO;
import com.panzhihua.common.model.dtos.community.fms.AddTeamDTO;
import com.panzhihua.common.model.dtos.community.fms.AddTeamMemberDTO;
import com.panzhihua.common.model.dtos.community.fms.AddTeamTypeDTO;
import com.panzhihua.common.model.dtos.community.fms.ApplyFmsServiceDTO;
import com.panzhihua.common.model.dtos.community.fms.ApprovalFmsServiceAdminDTO;
import com.panzhihua.common.model.dtos.community.fms.DeleteTeamMemberDTO;
import com.panzhihua.common.model.dtos.community.fms.EditFmsClassroomAdminDTO;
import com.panzhihua.common.model.dtos.community.fms.EditTeamDTO;
import com.panzhihua.common.model.dtos.community.fms.EditTeamMemberDTO;
import com.panzhihua.common.model.dtos.community.fms.EditTeamTypeDTO;
import com.panzhihua.common.model.dtos.community.fms.EvaluationFmsServiceDTO;
import com.panzhihua.common.model.dtos.community.fms.FeedbackFmsServiceDTO;
import com.panzhihua.common.model.dtos.community.fms.PageFmsClassroomAdminDTO;
import com.panzhihua.common.model.dtos.community.fms.PageFmsEventAdminDTO;
import com.panzhihua.common.model.dtos.community.fms.PageFmsServiceAdminDTO;
import com.panzhihua.common.model.dtos.community.fms.PageFmsServiceAppletsDTO;
import com.panzhihua.common.model.dtos.community.fms.PageFmsTeamDTO;
import com.panzhihua.common.model.dtos.community.fms.PageTeamMemberDTO;
import com.panzhihua.common.model.dtos.community.integral.ComActIntegralCommunityRankDTO;
import com.panzhihua.common.model.dtos.community.integral.admin.AddComActIntegralUserDTO;
import com.panzhihua.common.model.dtos.community.integral.admin.EditComActIntegralRuleDTO;
import com.panzhihua.common.model.dtos.community.integral.admin.PageComActIntegralRuleDTO;
import com.panzhihua.common.model.dtos.community.integral.admin.PageComActIntegralTradeDTO;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.DeleteProductDTO;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.DisableOrEnableMcsMerchantDTO;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.LoginWithPhoneDTO;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsEvaluateDTO;
@@ -264,9 +298,11 @@
import com.panzhihua.common.model.dtos.vaccines.VaccinesInoculationByAdminDTO;
import com.panzhihua.common.model.vos.BcDictionaryItemVO;
import com.panzhihua.common.model.vos.BcDictionaryVO;
import com.panzhihua.common.model.vos.ComActSocialMemberVO;
import com.panzhihua.common.model.vos.DictionaryVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
import com.panzhihua.common.model.vos.civil.ComActSocialWorkerDetailsVO;
import com.panzhihua.common.model.vos.community.ActivitySignVO;
import com.panzhihua.common.model.vos.community.BatchhouseVO;
import com.panzhihua.common.model.vos.community.ComActActEvaluateVO;
@@ -335,15 +371,26 @@
import com.panzhihua.common.model.vos.community.bigscreen.PartyBuildingMemberVO;
import com.panzhihua.common.model.vos.community.cluster.admin.ComClusterMemberExcelVO;
import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
import com.panzhihua.common.model.vos.community.fms.ComFmsServiceImportExcelVO;
import com.panzhihua.common.model.vos.community.fms.ComFmsTeamMemberImportExcelVO;
import com.panzhihua.common.model.vos.community.microCommercialStreet.McsConfigVO;
import com.panzhihua.common.model.vos.community.microCommercialStreet.McsOrderVO;
import com.panzhihua.common.model.vos.community.questnaire.EditComActQuestnaireVo;
import com.panzhihua.common.model.vos.community.questnaire.QuestnaireVO;
import com.panzhihua.common.model.vos.community.questnaire.UsersAnswerQuestnaireVO;
import com.panzhihua.common.model.vos.community.raffle.ComActRaffleRecordVO;
import com.panzhihua.common.model.vos.community.raffle.ComActRaffleVO;
import com.panzhihua.common.model.vos.community.rentHouse.RentingHourseOrderVO;
import com.panzhihua.common.model.vos.community.rentHouse.RentingHoursePreOrderVO;
import com.panzhihua.common.model.vos.community.rentHouse.WxPayNotifyOrderVO;
import com.panzhihua.common.model.vos.community.rentHouse.WxPayOrderVO;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveDetailAdminVO;
import com.panzhihua.common.model.vos.community.social.ComActSocialProjectMemberVO;
import com.panzhihua.common.model.vos.community.social.ComActSocialProjectPublicityVO;
import com.panzhihua.common.model.vos.community.social.ComActSocialProjectScheduleVO;
import com.panzhihua.common.model.vos.community.social.ComActSocialWorkerServiceVO;
import com.panzhihua.common.model.vos.community.social.SocialProjectVO;
import com.panzhihua.common.model.vos.community.volunteer.ComMngVolunteerExcelVO;
import com.panzhihua.common.model.vos.community.warehouse.ComActWarehouseApplyVO;
import com.panzhihua.common.model.vos.community.warehouse.ComActWarehouseBaseVO;
import com.panzhihua.common.model.vos.community.warehouse.QRCodeVO;
@@ -357,8 +404,6 @@
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
import com.panzhihua.common.model.vos.user.UserElectronicFileVO;
import com.panzhihua.common.model.vos.user.UserPhoneVO;

import javax.validation.Valid;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -1103,7 +1148,7 @@
     * @return 活动列表
     */
    @PostMapping("listactivity")
    R listActivity(@RequestParam("userId") Long userId, @RequestParam(value = "status", required = false) Integer status);
    R listActivity(@RequestParam("userId") Long userId, @RequestParam(value = "status", required = false) Integer status,@RequestParam(value = "type",required = false)Integer type);

    /**
     * 用户确认心愿
@@ -5640,7 +5685,7 @@
     * @return  预约登记详情
     */
    @GetMapping("/reserve/admin/detail")
    R detailReserveAdmin(@RequestParam("reserveId") Long reserveId);
    R<ComActReserveDetailAdminVO> detailReserveAdmin(@RequestParam("reserveId") Long reserveId);

    /**
     * 社区后台-根据社区id统计预约类数据
@@ -5755,6 +5800,15 @@
    @PostMapping("/reserve/admin/register/list/export")
    R exportRegisterAdmin(@RequestBody PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO);

    /**
     * 查询预约登记题目下属选择项列表
     *
     * @param reserveSubId
     *            预约登记id
     * @return 查询预约登记题目下属选择项列表
     */
    @GetMapping("/reserve/admin/subject/selection/list")
    List<String> subjectSelectionListAdmin(@RequestParam("reserveSubId") Long reserveSubId);
    /**
     * 查询预约登记题目列表
     * @param reserveId 预约登记id
@@ -6278,7 +6332,7 @@
     * @return 菜单列表
     */
    @PostMapping("/common/data/population/second/listBack")
    public R getSecondHouse(@RequestBody CascadeHouseDTO cascadeHouseDTO);
    R getSecondHouse(@RequestBody CascadeHouseDTO cascadeHouseDTO);

    /**
     * 微心愿处理人列表
@@ -8294,6 +8348,992 @@
                                 @RequestParam("communityId") Long communityId, @RequestParam("userId") Long userId);

    /**
     * 社区后台-分页查询志愿者组织队伍
     *
     * @param orgTeamDto 请求参数
     * @return 志愿者组织队伍
     */
    @PostMapping("/comMngVolunteerOrgTeam/page")
    R pageVolunteerOrgAdmin(@RequestBody PageComMngVolunteerOrgTeamDto orgTeamDto);

    /**
     * 社区后台-新增志愿者组织队伍
     *
     * @param orgTeamDto 请求参数
     * @return 新增结果
     */
    @PostMapping("/comMngVolunteerOrgTeam/add")
    R addVolunteerOrgAdmin(@RequestBody AddComMngVolunteerOrgTeamDto orgTeamDto);

    /**
     * 社区后台-编辑志愿者组织队伍
     *
     * @param orgTeamDto 请求参数
     * @return 编辑结果
     */
    @PutMapping("/comMngVolunteerOrgTeam/edit")
    R editVolunteerOrgAdmin(@RequestBody EditComMngVolunteerOrgTeamDto orgTeamDto);

    /**
     * 社区后台-删除志愿者组织队伍
     *
     * @param id 主键id
     * @return 删除结果
     */
    @GetMapping("/comMngVolunteerOrgTeam/delete")
    R deleteVolunteerOrgAdmin(@RequestParam("id") Long id);

    /**
     * 社区后台-查询志愿者组织列表
     *
     * @param orgTeamDto 请求参数
     * @return 志愿者组织列表
     */
    @PostMapping("/comMngVolunteerOrgTeam/list")
    R listVolunteerOrgAdmin(@RequestBody PageComMngVolunteerOrgTeamDto orgTeamDto);

    /**
     * 社区后台-分页查询服务类型
     *
     * @param serviceTypeDto 请求参数
     * @return 服务类型列表
     */
    @PostMapping("/comMngVolunteerServiceType/page")
    R pageServiceTypeAdmin(@RequestBody PageComMngVolunteerServiceTypeDto serviceTypeDto);

    /**
     * 社区后台-新增服务类型
     *
     * @param serviceTypeDto 请求参数
     * @return 新增结果
     */
    @PostMapping("/comMngVolunteerServiceType/add")
    R addServiceTypeAdmin(@RequestBody AddComMngVolunteerServiceTypeDto serviceTypeDto);

    /**
     * 社区后台-编辑服务类型
     *
     * @param serviceTypeDto 请求参数
     * @return 编辑结果
     */
    @PutMapping("/comMngVolunteerServiceType/edit")
    R editServiceTypeAdmin(@RequestBody EditComMngVolunteerServiceTypeDto serviceTypeDto);

    /**
     * 社区后台-删除服务类型
     *
     * @param id 主键id
     * @return 删除结果
     */
    @GetMapping("/comMngVolunteerServiceType/delete")
    R deleteServiceTypeAdmin(@RequestParam("id") Long id);

    /**
     * 社区后台-分页查询志愿者技能列表
     *
     * @param volunteerSkillDto 请求参数
     * @return 志愿者技能列表
     */
    @PostMapping("/comMngVolunteerSkill/page")
    R pageVolunteerSkillAdmin(@RequestBody PageComMngVolunteerSkillDto volunteerSkillDto);

    /**
     * 社区后台-新增志愿者技能
     *
     * @param volunteerSkillDto 请求参数
     * @return 新增结果
     */
    @PostMapping("/comMngVolunteerSkill/add")
    R addVolunteerSkillAdmin(@RequestBody AddComMngVolunteerSkillDto volunteerSkillDto);

    /**
     * 社区后台-编辑志愿者技能
     *
     * @param volunteerSkillDto 请求参数
     * @return 编辑结果
     */
    @PutMapping("/comMngVolunteerSkill/edit")
    R editVolunteerSkillAdmin(@RequestBody EditComMngVolunteerSkillDto volunteerSkillDto);

    /**
     * 社区后台-删除志愿者技能
     *
     * @param id 主键id
     * @return 删除结果
     */
    @GetMapping("/comMngVolunteerSkill/delete")
    R deleteVolunteerSkillAdmin(@RequestParam("id") Long id);

    /**
     * 社区后台-查询志愿者服务类型列表
     *
     * @param serviceTypeDto 请求参数
     * @return 志愿者服务列表
     */
    @PostMapping("/comMngVolunteerServiceType/list")
    R listServiceTypeAdmin(@RequestBody PageComMngVolunteerServiceTypeDto serviceTypeDto);

    /**
     * 社区后台-查询志愿者技能列表
     *
     * @param volunteerSkillDto 请求参数
     * @return 志愿者技能列表
     */
    @PostMapping("/comMngVolunteerSkill/list")
    R listVolunteerSkillAdmin(@RequestBody PageComMngVolunteerSkillDto volunteerSkillDto);

    /**
     * 社区后台-志愿者组织统计
     *
     * @param communityId 社区id
     * @return 志愿者组织统计
     */
    @GetMapping("/comMngVolunteerOrgTeam/statistics")
    R statisticsVolunteerOrgAdmin(@RequestParam("communityId") Long communityId);

    /**
     * 志愿者导入
     *
     * @param list        志愿者数据列表
     * @param communityId 社区id
     * @param userId      用户id
     * @return 导入结果
     */
    @PostMapping("/volunteer/import/admin")
    R importVolunteerAdmin(@RequestBody List<ComMngVolunteerExcelVO> list,
                           @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);

    @PostMapping("/screen/hmk/baseInfo")
    R hmkBaseInfo(@RequestBody CommonPage commonPage);

    @GetMapping("/screen/hmk/partyProjectActivityLine")
    R partyProjectActivityLine();

    @PostMapping("/screen/hmk/projectActivityTop")
    R projectActivityProject(@RequestBody CommonPage commonPage);

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("/comActSocialOrg/{id}")
    R comActSocialOrgSelectOne(@PathVariable("id") Long id);


    /**
     * 通过userId查询
     *
     * @param userId 主键
     * @return 单条数据
     */
    @GetMapping("/comActSocialOrg/selectByUserId")
    R selectOneByUserId(@RequestParam("userId") Long userId);

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @PostMapping("/comActSocialMember/queryAll")
    public R comActSocialMemberSelectAll(@RequestBody CommonPage commonPage);

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("/comActSocialMember/{id}")
    public R comActSocialMemberSelectOne(@PathVariable("id") Long id);

    /**
     * 新增数据
     *
     * @param comActSocialMember 实体对象
     * @return 新增结果
     */
    @PostMapping("/comActSocialMember")
    public R comActSocialMemberInsert(@RequestBody ComActSocialMemberVO comActSocialMember);

    /**
     * 批量新增数据
     *
     * @param comActSocialMember 实体对象
     * @return 新增结果
     */
    @PostMapping("/comActSocialProjectMember/batch")
    public R comActSocialMemberInsertBatch(@RequestBody ComActSocialProjectMemberVO comActSocialMember);

    /**
     * 修改数据
     *
     * @param comActSocialMember 实体对象
     * @return 修改结果
     */
    @PostMapping("/comActSocialMember/update")
    public R comActSocialMemberUpdate(@RequestBody ComActSocialMemberVO comActSocialMember);

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @GetMapping("/comActSocialMember/del")
    public R comActSocialMemberDelete(@RequestParam("id") Long id);

    /**
     * 新增社工
     * @param comActSocialWorkerAddDTO
     * @return 新增结果
     */
    @PostMapping("/comActSocialWorker/add")
    R addComactsocialworker(@RequestBody ComActSocialWorkerAddDTO comActSocialWorkerAddDTO);

    /**
     * 修改社工
     * @param comActSocialWorkerEditDTO
     * @return 维护结果
     */
    @PostMapping("/comActSocialWorker/edit")
    R editComactsocialworker(@RequestBody ComActSocialWorkerEditDTO comActSocialWorkerEditDTO);

    /**
     * 分页查找社工
     * @param pageComActSocialWorkerDTO
     * @return 维护结果
     */
    @PostMapping("/comActSocialWorker/page")
    R queryComactsocialworker(@RequestBody PageComActSocialWorkerDTO pageComActSocialWorkerDTO);//返回 R<IPage<ComActSocialWorkerVO>>

    /**
     * 删除社工
     * @param comActSocialWorkerDeleteDTO
     * @return 平台用户信息
     */
    @PostMapping("/comActSocialWorker/delete")
    R deleteComactsocialworker(@RequestBody ComActSocialWorkerDeleteDTO comActSocialWorkerDeleteDTO);

    /**
     * 查询社工详细信息
     * @param id 社工 id
     * @return 查找结果
     */
    @PostMapping("/comActSocialWorker/{id}")
    R<ComActSocialWorkerDetailsVO> comActSocialWorkerDetails(@PathVariable("id") Long id);

    /**
     * 批量导入社工
     *
     * @param list 社工集合
     */
    @PostMapping("/comActSocialWorker/input")
    R listSaveSocialWorkerExcelVO(@RequestBody List<ComActSocialWorkerExcelVO> list, @RequestParam("communityId") Long communityId);

    /**
     *活动查询社工列表
     * @param commonPage
     * @return
     */
    @PostMapping("/comActSocialWorker/activity")
    R activity(@RequestBody CommonPage commonPage);

    /**
     * 社工查询活动
     * @param commonPage
     * @return
     */
    @PostMapping("/comActSocialWorker/activityList")
    R activityList(@RequestBody CommonPage commonPage);

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @PostMapping("/comActSocialWorkerService/queryAll")
    R selectAllComActSocialWorkerService(@RequestBody CommonPage commonPage);

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("/comActSocialWorkerService/{id}")
    R selectOneComActSocialWorkerService(@PathVariable("id") Long id);

    /**
     * 修改数据
     *
     * @param comActSocialWorkerServiceVO 实体对象
     * @return 修改结果
     */
    @PostMapping("/comActSocialWorkerService/update")
    R updateComActSocialWorkerService(@RequestBody ComActSocialWorkerServiceVO comActSocialWorkerServiceVO);

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @PostMapping("/comActSocialProject/queryAll")
    R selectAllComActSocialProject(@RequestBody CommonPage commonPage);

    /**
     * 平台详情接口
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("/comActSocialProject/{id}")
    R selectOneComActSocialProject(@PathVariable("id") Long id);

    /**
     * 根据项目id分页获取关联项目
     */
    @PostMapping("/comActSocialProject/getRelation")
    R getRelationComActSocialProject(@RequestBody CommonPage commonPage);

    /**
     * 新增数据
     *
     * @param socialProjectVO 实体对象
     * @return 新增结果
     */
    @PostMapping("/comActSocialProject")
    R insertComActSocialProject(@RequestBody SocialProjectVO socialProjectVO);
    /**
     * 修改数据
     *
     * @param socialProjectVO 实体对象
     * @return 修改结果
     */
    @PostMapping("/comActSocialProject/update")
    R updateComActSocialProject(@RequestBody SocialProjectVO socialProjectVO);
    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @GetMapping("/comActSocialProject/del")
    R deleteComActSocialProject(@RequestParam("id") Long id);
    /**
     * 小程序详情接口
     * @param id
     * @return
     */
    @GetMapping("/comActSocialProject/getApplet")
    R getAppletComActSocialProject(@RequestParam("id") Long id);

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @PostMapping("/comActSocialProjectMember/queryAll")
    public R selectAllComActSocialProjectMember(@RequestBody CommonPage commonPage);

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("/comActSocialProjectMember/{id}")
    public R selectOneComActSocialProjectMember(@PathVariable("id") Long id);

    /**
     * 新增数据
     *
     * @param comActSocialProjectMemberVO 实体对象
     * @return 新增结果
     */
    @PostMapping("/comActSocialProjectMember")
    public R insertComActSocialProjectMember(@RequestBody ComActSocialProjectMemberVO comActSocialProjectMemberVO);

    /**
     * 修改数据
     *
     * @param comActSocialProjectMemberVO 实体对象
     * @return 修改结果
     */
    @PostMapping("/comActSocialProjectMember/update")
    public R updateComActSocialProjectMember(@RequestBody ComActSocialProjectMemberVO comActSocialProjectMemberVO);

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @GetMapping("/comActSocialProjectMember/del")
    public R deleteComActSocialProjectMember(@RequestParam("id") Long id);

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @PostMapping("/comActSocialProjectPublicity/queryAll")
    public R selectAllComActSocialProjectPublicity(@RequestBody CommonPage commonPage);

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("/comActSocialProjectPublicity/getByApplet/{id}")
    public R selectOneComActSocialProjectPublicity(@PathVariable("id") Long id);


    /**
     * 新增数据
     *
     * @param comActSocialProjectPublicityVO 实体对象
     * @return 新增结果
     */
    @PostMapping("/comActSocialProjectPublicity")
    public R insertComActSocialProjectPublicity(@RequestBody ComActSocialProjectPublicityVO comActSocialProjectPublicityVO);

    /**
     * 修改数据
     *
     * @param comActSocialProjectPublicityVO 实体对象
     * @return 修改结果
     */
    @PostMapping("/comActSocialProjectPublicity/update")
    public R updateComActSocialProjectPublicity(@RequestBody ComActSocialProjectPublicityVO comActSocialProjectPublicityVO);

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @GetMapping("/comActSocialProjectPublicity/del")
    public R deleteComActSocialProjectPublicity(@RequestParam("id") Long id);
    /**
     * 多条删除数据
     *
     * @param ids 主键结合
     * @return 删除结果
     */
    @GetMapping("/comActSocialProjectPublicity/delBatch")
    public R delBatchComActSocialProjectPublicity(@RequestParam("ids") List<Long> ids);

    /**
     * 根据projectId查询所有进度
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @PostMapping("/comActSocialProjectSchedule/queryAll")
    public R selectAllComActSocialProjectSchedule(@RequestBody CommonPage commonPage);

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("/comActSocialProjectSchedule/{id}")
    public R selectOneComActSocialProjectSchedule(@PathVariable("id") Long id);

    /**
     * 新增数据
     *
     * @param comActSocialProjectScheduleVO 实体对象
     * @return 新增结果
     */
    @PostMapping("/comActSocialProjectSchedule")
    public R insertComActSocialProjectSchedule(@RequestBody ComActSocialProjectScheduleVO comActSocialProjectScheduleVO);

    /**
     * 修改数据
     *
     * @param comActSocialProjectScheduleVO 实体对象
     * @return 修改结果
     */
    @PostMapping("/comActSocialProjectSchedule/update")
    public R updateComActSocialProjectSchedule(@RequestBody ComActSocialProjectScheduleVO comActSocialProjectScheduleVO);

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @GetMapping("/comActSocialProjectSchedule/del")
    public R deleteComActSocialProjectSchedule(@RequestParam("id") Long id);

    /**
     * 项目分类级联
     * @param comActColumnVO
     * @return
     */
    @PostMapping("/comActColumn/queryLevel")
    public R queryLevel(@RequestBody ComActColumnVO comActColumnVO);

    @PostMapping("/comActRaffle/queryAll")
    R selectAllComActRaffle(@RequestBody CommonPage commonPage);

    @GetMapping("/comActRaffle/detail")
    R selectOneComActRaffle(@RequestParam("id") Long id,@RequestParam("userId")Long userId);

    @PostMapping("/comActRaffle")
    R insertComActRaffle(@RequestBody ComActRaffleVO comActRaffleVO);

    @PostMapping("/comActRaffle/update")
    R updateComActRaffle(@RequestBody ComActRaffleVO comActRaffleVO);

    @GetMapping("/comActRaffle/del")
    R deleteComActRaffle(@RequestParam("id") Long id);

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @PostMapping("/comActRaffleRecord/queryAll")
    R selectAllComActRaffleRecord(@RequestBody CommonPage commonPage);

    @GetMapping("/comActRaffleRecord/queryPrize")
    R queryPrize(@RequestParam("id")Long id);

    /**
     * 生成二维码
     * @param qrCodeVO
     * @return
     */
    @PostMapping("/comActRaffleRecord/getQRCode")
    R getRaffleQRCode(@RequestBody QRCodeVO qrCodeVO);

    /**
     * 修改数据
     *
     * @param comActRaffleRecordVO 实体对象
     * @return 修改结果
     */
    @PostMapping("/comActRaffleRecord/update")
    R updateRaffleRecord(@RequestBody ComActRaffleRecordVO comActRaffleRecordVO);

    @PostMapping("/comActRaffleRecord")
    R insertRaffleRecord(@RequestBody ComActRaffleRecordVO comActRaffleRecordVO);

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("/comActRaffleRecord/{id}")
    R selectOneRaffleRecord(@PathVariable("id") Long id);
    /**
     * 导出
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @PostMapping("/comActRaffleRecord/export")
    R exportComActRaffleRecord(@RequestBody CommonPage commonPage);

    /**
     * [方法描述] 根据社区ID查询所属城市所在区区域代码，
     *
     * @param communityId
     *            社区ID
     * @return String 区域code
     * @author manailin
     * @date 2022/2/17 10:09
     */
    @GetMapping("act/getActBelongRegionCode")
    String getActBelongRegionCode(@RequestParam("communityId") Long communityId);

    /**
     * 新增团队类型
     * @param addTeamTypeDTO
     * @return
     */
    @PostMapping("/fms/teamType/add")
    R addFmsTeamType(@RequestBody AddTeamTypeDTO addTeamTypeDTO);

    /**
     * 修改团队类型
     * @param editTeamTypeDTO
     * @return
     */
    @PostMapping("/fms/teamType/edit")
    R editFmsTeamType(@RequestBody EditTeamTypeDTO editTeamTypeDTO);

    /**
     * 删除团队类型
     * @param teamTypeId
     * @param communityId
     * @return
     */
    @DeleteMapping("/fms/teamType/delete")
    R deleteFmsTeamType(@RequestParam("teamTypeId") Long teamTypeId,
                        @RequestParam("communityId") Long communityId);

    /**
     * 获取团队类型列表
     * @param communityId
     * @return
     */
    @GetMapping("/fms/teamType/list")
    R listFmsTeamType(@RequestParam("communityId") Long communityId);

    /**
     * 新增团队
     * @param addTeamDTO
     * @return
     */
    @PostMapping("/fms/team/add")
    R addFmsTeam(@RequestBody AddTeamDTO addTeamDTO);

    /**
     * 修改团队信息
     * @param editTeamDTO
     * @return
     */
    @PostMapping("/fms/team/edit")
    R editFmsTeam(@RequestBody EditTeamDTO editTeamDTO);

    /**
     * 删除团队
     * @param teamId
     * @return
     */
    @DeleteMapping("/fms/team/delete")
    R deleteFmsTeam(@RequestParam("teamId") Long teamId);

    /**
     * 获取团队列表
     * @param teamTypeId
     * @return
     */
    @GetMapping("/fms/team/list")
    R listFmsTeam(@RequestParam("teamTypeId") Long teamTypeId);

    /**
     * 获取团队详情
     * @param teamId
     * @return
     */
    @GetMapping("/fms/team/detail")
    R detailFmsTeam(@RequestParam("teamId") Long teamId);

    /**
     * 级联查询团队数据
     * @param communityId
     * @return
     */
    @GetMapping("/fms/team/cascade")
    R retrieveFmsTeamCascade(@RequestParam("communityId") Long communityId);

    /**
     * 新增团队成员
     * @param addTeamMemberDTO
     * @return
     */
    @PostMapping("/fms/teamMember/add")
    R addFmsTeamMember(@RequestBody AddTeamMemberDTO addTeamMemberDTO);

    /**
     * 编辑团队成员
     * @param editTeamMemberDTO
     * @return
     */
    @PostMapping("/fms/teamMember/edit")
    R editFmsTeamMember(@RequestBody EditTeamMemberDTO editTeamMemberDTO);

    /**
     * 删除团队成员
     * @param deleteTeamMemberDTO
     * @return
     */
    @PostMapping("/fms/teamMember/delete")
    R deleteFmsTeamMember(@RequestBody DeleteTeamMemberDTO deleteTeamMemberDTO);

    /**
     * 分页查询团队成员
     * @param pageTeamMemberDTO
     * @return
     */
    @PostMapping("/fms/teamMember/page")
    R pageFmsTeamMember(@RequestBody PageTeamMemberDTO pageTeamMemberDTO);

    /**
     * 微团队顶部统计
     * @param communityId
     * @return
     */
    @GetMapping("/fms/teamMember/statistics")
    R statisticsFmsTeamMember(@RequestParam("communityId") Long communityId);

    /**
     * 批量导入团队成员
     * @param voList
     * @param communityId
     * @param userId
     * @return
     */
    @PostMapping("/fms/teamMember/import")
    R listSaveFmsTeamMemberExcelVO(@RequestBody List<ComFmsTeamMemberImportExcelVO> voList,
                                   @RequestParam("communityId") Long communityId, @RequestParam("userId") Long userId);

    /**
     * 团队人员导出
     * @param pageTeamMemberDTO
     * @return
     */
    @PostMapping("/fms/teamMember/export")
    R exportTeamMember(@RequestBody PageTeamMemberDTO pageTeamMemberDTO);

    /**
     * 后台新增微服务
     * @param adminDTO
     * @return
     */
    @PostMapping("/fms/service/adminAdd")
    R addFmsServiceAdmin(@RequestBody AddFmsServiceAdminDTO adminDTO);

    /**
     * 后台分页查询微服务
     * @param adminDTO
     * @return
     */
    @PostMapping("/fms/service/adminPage")
    R pageFmsServiceAdmin(@RequestBody PageFmsServiceAdminDTO adminDTO);

    /**
     * 后台核实微服务
     * @param adminDTO
     * @return
     */
    @PostMapping("/fms/service/approval")
    R approvalFmsService(@RequestBody ApprovalFmsServiceAdminDTO adminDTO);

    /**
     * 级联查询团队服务人员
     * @param communityId
     * @return
     */
    @GetMapping("/fms/teamMember/cascade")
    R retrieveFmsTeamMemberCascade(@RequestParam("communityId") Long communityId);

    /**
     * 后台查看微服务详情
     * @param serviceId
     * @return
     */
    @GetMapping("/fms/service/detailAdmin")
    R detailFmsServiceAdmin(@RequestParam("serviceId") Long serviceId);

    /**
     * 后台删除微服务
     * @param serviceId
     * @return
     */
    @DeleteMapping("/fms/service/delete")
    R deleteFmsServiceAdmin(@RequestParam("serviceId") Long serviceId);

    /**
     * 微服务顶部统计
     * @param communityId
     * @return
     */
    @GetMapping("/fms/service/statistics")
    R statisticsFmsService(@RequestParam("communityId") Long communityId);

    /**
     * 后台导入微服务数据
     * @param voList
     * @param communityId
     * @param userId
     * @return
     */
    @PostMapping("/fms/service/import")
    R listSaveFmsServiceExcelVO(@RequestBody List<ComFmsServiceImportExcelVO> voList,
                                @RequestParam("communityId") Long communityId,
                                @RequestParam("userId") Long userId);

    /**
     * 后台新增微讲堂
     * @param adminDTO
     * @return
     */
    @PostMapping("/fms/classroom/add")
    R addFmsClassroom(@RequestBody AddFmsClassroomAdminDTO adminDTO);

    /**
     * 后台编辑微讲堂
     * @param adminDTO
     * @return
     */
    @PostMapping("/fms/classroom/edit")
    R editFmsClassroom(@RequestBody EditFmsClassroomAdminDTO adminDTO);

    /**
     * 后台删除微讲堂
     * @param id
     * @return
     */
    @DeleteMapping("/fms/classroom/delete")
    R deleteFmsClassroom(@RequestParam("id") Long id);

    /**
     * 后台获取微讲堂详情
     * @param id
     * @return
     */
    @GetMapping("/fms/classroom/detail")
    R detailFmsClassroom(@RequestParam("id") Long id);

    /**
     * 后台分页查询微讲堂
     * @param adminDTO
     * @return
     */
    @PostMapping("/fms/classroom/pageAdmin")
    R pageFmsClassroomAdmin(@RequestBody PageFmsClassroomAdminDTO adminDTO);

    /**
     * 微讲堂顶部统计
     * @param communityId
     * @return
     */
    @GetMapping("/fms/classroom/statistics")
    R statisticsFmsClassroom(@RequestParam("communityId") Long communityId);

    /**
     * 后台分页查询微调节/微防控
     * @param adminDTO
     * @return
     */
    @PostMapping("/fms/event/page")
    R pageFmsEvent(@RequestBody PageFmsEventAdminDTO adminDTO);

    /**
     * 微调节/微防控顶部统计
     * @param type
     * @param communityId
     * @return
     */
    @GetMapping("/fms/event/statistics")
    R statisticsFmsEvent(@RequestParam("type") Integer type, @RequestParam("communityId") Long communityId);

    /**
     * 微调节/微防控事件详情
     * @param eventId
     * @return
     */
    @GetMapping("/fms/event/detail")
    R detailFmsEvent(@RequestParam("eventId") Long eventId);

    /**
     * 小程序分页查询团队信息
     * @param pageFmsTeamDTO
     * @return
     */
    @PostMapping("/fms/team/pageApplets")
    R pageFmsTeamApplets(@RequestBody PageFmsTeamDTO pageFmsTeamDTO);

    /**
     * 获取微讲堂详情
     * @param id
     * @return
     */
    @GetMapping("/fms/classroom/detailApplets")
    R detailFmsClassroomApplets(@RequestParam("id") Long id);

    /**
     * 小程序分页查询微调节/微防控
     * @param adminDTO
     * @return
     */
    @PostMapping("/fms/event/pageApplets")
    R pageFmsEventApplets(@RequestBody PageFmsEventAdminDTO adminDTO);

    /**
     * 小程序分页查询微服务
     * @param adminDTO
     * @return
     */
    @PostMapping("/fms/service/pageApplets")
    R pageFmsServiceApplets(@RequestBody PageFmsServiceAppletsDTO adminDTO);

    /**
     * 小程序查看微服务详情
     * @param serviceId
     * @param userId
     * @return
     */
    @GetMapping("/fms/service/detailApplets")
    R detailFmsServiceApplets(@RequestParam("serviceId") Long serviceId, @RequestParam(value = "userId", required = false) Long userId);

    /**
     * 微服务申请
     * @param adminDTO
     * @return
     */
    @PostMapping("/fms/service/apply")
    R applyFmsService(@RequestBody ApplyFmsServiceDTO adminDTO);

    /**
     * 分页查询我的微服务
     * @param adminDTO
     * @return
     */
    @PostMapping("/fms/service/pageMy")
    R pageMyFmsService(@RequestBody PageFmsServiceAppletsDTO adminDTO);

    /**
     * 微服务评价
     * @param evaluationFmsServiceDTO
     * @return
     */
    @PostMapping("/fms/service/evaluate")
    R evaluateFmsService(@RequestBody EvaluationFmsServiceDTO evaluationFmsServiceDTO);

    /**
     * 微团队成员分页查询服务处理
     * @param adminDTO
     * @return
     */
    @PostMapping("/fms/service/pageDeal")
    R pageDealFmsService(@RequestBody PageFmsServiceAppletsDTO adminDTO);

    /**
     * 微团队成员服务反馈
     * @param adminDTO
     * @return
     */
    @PostMapping("/fms/service/feedback")
    R feedbackFmsService(@RequestBody FeedbackFmsServiceDTO adminDTO);

    /**
     * 定时任务针对服务结束后3天还未评价的用户默认好评
     * @return
     */
    @PostMapping("/fms/service/defaultPraise")
    R timedTaskFmsServiceDefaultPraise();

    @GetMapping("/activity/partyMemberCount")
    R partyMemberCount(@RequestParam("communityId")Long communityId,@RequestParam("year")String year);

    /**
     * 根据小区id查询楼栋列表
     * @param villageId 小区id
     * @return  查询楼栋列表

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

@@ -349,6 +349,17 @@
    @PostMapping("adduserbackstageproperty")
    R addUserBackstageProperty(@RequestBody AdministratorsUserVO administratorsUserVO);


    /**
     * 更新
     *
     * @param administratorsUserVO
     *            编辑账户内容
     * @return 编辑结果
     */
    @PostMapping("updateStreet")
    R updateStreet(@RequestBody AdministratorsUserVO administratorsUserVO);

    /**
     * 编辑运营、社区后台账户
     * 

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

@@ -47,7 +47,7 @@
                   userData.add(" ");
                }
                //判断是文字描述直接跳过
                if (userAnswers.getOptionType().equals(5) || userAnswers.getOptionType().equals(11)
                if (userAnswers.getOptionType().equals(5)
                        || (StringUtils.isNotEmpty(userAnswers.getAnswerContent()) && userAnswers.getAnswerContent().contains(noExport))) {
                    continue;
                }
@@ -94,9 +94,27 @@
                        if(userAnswers.getOptionType().equals(11)){
                            reserveSubId = userAnswers.getReserveSubId();
                            try {
                                userData.add(new URL(userAnswers.getAnswerContent()));
                                if(StringUtils.isNotEmpty(userAnswers.getAnswerContent())){
                                    if(userAnswers.getAnswerContent().contains("_compress")){
                                        userData.add(new URL(userAnswers.getAnswerContent()));
                                    }
                                    else {
                                        URL url=new URL(userAnswers.getAnswerContent().substring(0,userAnswers.getAnswerContent().lastIndexOf("."))+"_compress.jpg");
                                        if(url.getContent()!=null){
                                            userData.add(url);
                                        }
                                        else {
                                            userData.add(userAnswers.getAnswerContent());
                                        }
                                    }
                                    //userData.add(new File("/workspace/minio/data/files/"+userAnswers.getAnswerContent().substring(userAnswers.getAnswerContent().indexOf("files/")+6)));
                                }
                                else {
                                    userData.add(" ");
                                }
                            }catch (Exception e){
                                userData.add(" ");
                                e.printStackTrace();
                                log.error("导出转换图片失败！");
                            }
                            continue;
@@ -138,7 +156,219 @@
                        if(userAnswers.getOptionType().equals(11)){
                            reserveSubId = userAnswers.getReserveSubId();
                            try {
                                userData.add(new URL(userAnswers.getAnswerContent()));
                                if(StringUtils.isNotEmpty(userAnswers.getAnswerContent())){
                                    if(userAnswers.getAnswerContent().contains("_compress")){
                                        userData.add(new URL(userAnswers.getAnswerContent()));
                                    }
                                    else {
                                        URL url=new URL(userAnswers.getAnswerContent().substring(0,userAnswers.getAnswerContent().lastIndexOf("."))+"_compress.jpg");
                                        if(url.getContent()!=null){
                                            userData.add(url);
                                        }
                                        else {
                                            userData.add(userAnswers.getAnswerContent());
                                        }

                                    }
                                    //userData.add(new File("/workspace/minio/data/files/"+userAnswers.getAnswerContent().substring(userAnswers.getAnswerContent().indexOf("files/")+6)));
                                }
                                else {
                                    userData.add(" ");
                                }
                            }catch (Exception e){
                                userData.add(" ");
                                log.error("导出转换图片失败！");
                            }
                            continue;
                        }
                        //判断当前组件类型是否签名
                        if(userAnswers.getOptionType().equals(12)){
                            reserveSubId = userAnswers.getReserveSubId();
                            try {
                                //userData.add(new URL("http://image.panzhihua.nhys.cdnhxx.com//idcard/967dbdef3ef3465a9169fbea204f9aa7.jpg"));
                                userData.add(DatatypeConverter.parseBase64Binary(userAnswers.getAnswerContent().substring(userAnswers.getAnswerContent().indexOf(",") + 1)));
                            }catch (Exception e){
                                userData.add(" ");
                                log.error("导出转换图片失败！");
                            }
                            continue;
                        }
                        if(userAnswers.getOptionType().equals(1)){
                            isOldDuo = true;
                            sb.append(userAnswers.getAnswerContent()==null?"无":userAnswers.getAnswerContent() + ",");
                            continue;
                        }else{
                            if(isOldDuo){
                                String answer = sb.toString();
                                userData.add(answer.substring(0, answer.length() - 1));
                                sb = new StringBuffer();
                            }
                            isOldDuo = false;
                        }
                        sb.append(userAnswers.getAnswerContent()==null?"无":userAnswers.getAnswerContent() + ",");
                        String answer = sb.toString();
                        userData.add(answer.substring(0, answer.length() - 1));
                        sb = new StringBuffer();
                    }
                }
            }
            if(isOldDuo){
                String answer = sb.toString();
                userData.add(answer.substring(0, answer.length() - 1));
            }
            resultList.add(userData);
        }
        return resultList;
    }

    public static List<List<Object>> ReserveDataNoImage(List<ComActQuestnaireAnswerContentVO> answerContentVOList) {
        //结果数据集合
        List<List<Object>> resultList = new ArrayList<>();
        //构建单个用户数据
        List<Object> userData = new ArrayList<>();

        String noExport = "以上信息仅用于";
        //遍历答案列表
        Long reserveRecordId = 0L;
        Long reserveSubId = 0L;
        Boolean isOldDuo = false;
        StringBuffer sb = new StringBuffer();
        if (answerContentVOList != null && answerContentVOList.size() > 0) {
            int a=0;
            for (ComActQuestnaireAnswerContentVO userAnswers : answerContentVOList) {
                a++;
                if(answerContentVOList.size()==26&&a==9){
                    userData.add(" ");
                }
                //判断是文字描述直接跳过
                if (userAnswers.getOptionType().equals(5) ||userAnswers.getOptionType().equals(11)
                        || (StringUtils.isNotEmpty(userAnswers.getAnswerContent()) && userAnswers.getAnswerContent().contains(noExport))) {
                    continue;
                }
                //判断reserveRecordId为空则为第一条记录,默认加上昵称和灯谜是
                if (reserveRecordId.equals(0L)) {
                    reserveRecordId = userAnswers.getReserveRecordId();
                    userData.add(userAnswers.getNickName());
                    userData.add(DateUtils.format(userAnswers.getTime(), DateUtils.ymdhms_format));
                }
                //根据reserveRecordId判断是否是第二条填报记录
                if (!reserveRecordId.equals(userAnswers.getReserveRecordId())) {
                    reserveSubId = 0L;

                    if(isOldDuo){
                        String answer = sb.toString();
                        userData.add(answer.substring(0, answer.length() - 1));
                        sb = new StringBuffer();
                        isOldDuo = false;
                    }
                    resultList.add(userData);
                    userData = new ArrayList<>();
                    reserveRecordId = userAnswers.getReserveRecordId();
                    userData.add(userAnswers.getNickName());
                    userData.add(DateUtils.format(userAnswers.getTime(), DateUtils.ymdhms_format));
                    if(StringUtils.isNotEmpty(userAnswers.getAnswerContent())){
                        userData.add(userAnswers.getAnswerContent());
                    }else{
                        userData.add(" ");
                    }
                }else{
                    if(reserveSubId.equals(0L)){
                        reserveSubId = userAnswers.getReserveSubId();
                    }

                    if(!reserveSubId.equals(userAnswers.getReserveSubId())){
                        reserveSubId = userAnswers.getReserveSubId();

                        //如果是承诺字段则不导出
                        if(StringUtils.isNotEmpty(userAnswers.getAnswerContent()) && userAnswers.getAnswerContent().contains(noExport)){
                            continue;
                        }

                        //判断当前的组件类型是否是图片上传，导出时需要导出图片
                        if(userAnswers.getOptionType().equals(11)){
                            reserveSubId = userAnswers.getReserveSubId();
                            try {
                                if(StringUtils.isNotEmpty(userAnswers.getAnswerContent())){
                                    if(userAnswers.getAnswerContent().contains("_compress")){
                                        userData.add(new URL(userAnswers.getAnswerContent()));
                                    }
                                    else {
                                        URL url=new URL(userAnswers.getAnswerContent().substring(0,userAnswers.getAnswerContent().lastIndexOf("."))+"_compress.jpg");
                                        if(url.getContent()!=null){
                                            userData.add(url);
                                        }
                                        else {
                                            userData.add(userAnswers.getAnswerContent());
                                        }
                                    }
                                    //userData.add(new File("/workspace/minio/data/files/"+userAnswers.getAnswerContent().substring(userAnswers.getAnswerContent().indexOf("files/")+6)));
                                }
                                else {
                                    userData.add(" ");
                                }
                            }catch (Exception e){
                                userData.add(" ");
                                e.printStackTrace();
                                log.error("导出转换图片失败！");
                            }
                            continue;
                        }
                        //判断当前组件类型是否签名
                        if(userAnswers.getOptionType().equals(12)){
                            reserveSubId = userAnswers.getReserveSubId();
                            try {
                                userData.add(DatatypeConverter.parseBase64Binary(userAnswers.getAnswerContent().substring(userAnswers.getAnswerContent().indexOf(",") + 1)));
                            }catch (Exception e){
                                userData.add(" ");
                                log.error("导出转换图片失败！");
                            }
                            continue;
                        }

                        if(userAnswers.getOptionType().equals(1)){
                            isOldDuo = true;
                            sb.append(userAnswers.getAnswerContent()==null?"无":userAnswers.getAnswerContent() + ",");
                            continue;
                        }else{
                            if(isOldDuo){
                                String answer = sb.toString();
                                userData.add(answer.substring(0, answer.length() - 1));
                                sb = new StringBuffer();
                            }
                            isOldDuo = false;
                        }
                        sb.append(userAnswers.getAnswerContent()==null?"无":userAnswers.getAnswerContent() + ",");
                        String answer = sb.toString();
                        userData.add(answer.substring(0, answer.length() - 1));
                        sb = new StringBuffer();
                    }else{
                        //如果是承诺字段则不导出
                        if(StringUtils.isNotEmpty(userAnswers.getAnswerContent()) && userAnswers.getAnswerContent().contains(noExport)){
                            continue;
                        }
                        //判断当前的组件类型是否是图片上传，导出时需要导出图片
                        if(userAnswers.getOptionType().equals(11)){
                            reserveSubId = userAnswers.getReserveSubId();
                            try {
                                if(StringUtils.isNotEmpty(userAnswers.getAnswerContent())){
                                    if(userAnswers.getAnswerContent().contains("_compress")){
                                        userData.add(new URL(userAnswers.getAnswerContent()));
                                    }
                                    else {
                                        URL url=new URL(userAnswers.getAnswerContent().substring(0,userAnswers.getAnswerContent().lastIndexOf("."))+"_compress.jpg");
                                        if(url.getContent()!=null){
                                            userData.add(url);
                                        }
                                        else {
                                            userData.add(userAnswers.getAnswerContent());
                                        }

                                    }
                                    //userData.add(new File("/workspace/minio/data/files/"+userAnswers.getAnswerContent().substring(userAnswers.getAnswerContent().indexOf("files/")+6)));
                                }
                                else {
                                    userData.add(" ");
                                }
                            }catch (Exception e){
                                userData.add(" ");
                                log.error("导出转换图片失败！");

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

New file
@@ -0,0 +1,52 @@
package com.panzhihua.common.utlis;

/**
 * 应用模块名称
 * <p>
 * 代码描述
 * <p>
 * Copyright: Copyright (C) 2022 XXX, Inc. All rights reserved.
 * <p>
 * Company: 成都呐喊信息技术有限公司
 * <p>
 *
 * @author manailin
 * @since 2022/2/17 14:33
 */
import java.util.Objects;
import java.util.function.BiConsumer;

/**
 *
 * @author yangzhilong
 * @date 7/15/2019
 */
public class ForEachUtils {

    /**
     *
     * @param <T>
     * @param startIndex
     *            开始遍历的索引
     * @param elements
     *            集合
     * @param action
     */
    public static <T> void forEach(int startIndex, Iterable<? extends T> elements,
        BiConsumer<Integer, ? super T> action) {
        Objects.requireNonNull(elements);
        Objects.requireNonNull(action);
        if (startIndex < 0) {
            startIndex = 0;
        }
        int index = 0;
        for (T element : elements) {
            index++;
            if (index <= startIndex) {
                continue;
            }

            action.accept(index - 1, element);
        }
    }
}

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

New file
@@ -0,0 +1,19 @@
package com.panzhihua.common.utlis;

import java.util.regex.Pattern;

/**
 * @title: ValidateUtils
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 验证相关工具类
 * @author: hans
 * @date: 2022/02/11 15:16
 */
public class ValidateUtils {

    private static final String PHONE_REGEX = "^(13[0-9]|14[01456879]|15[0-3,5-9]|16[2567]|17[0-8]|18[0-9]|19[0-3,5-9])\\d{8}$";

    public static Boolean assertPhoneIsValid(String phone) {
        return Pattern.matches(PHONE_REGEX, phone);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/aop/RenheAssemblyUtils.java

New file
@@ -0,0 +1,275 @@
package com.panzhihua.community_backstage.aop;

import java.net.URL;
import java.util.ArrayList;
import java.util.List;

import javax.xml.bind.DatatypeConverter;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import com.panzhihua.common.model.vos.community.ComActQuestnaireAnswerContentVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.StringUtils;

import lombok.extern.slf4j.Slf4j;

/**
 * @author lyq 前端H5组件库工具类
 */
@Slf4j
@Component
public class RenheAssemblyUtils {

    @Autowired
    private CommunityService communityService;

    private static List<String> automaticDataCompletion(List<String> chooseList, String selected) {
        if (chooseList == null) {
            chooseList = new ArrayList<>();
            chooseList.add("是");
            chooseList.add("否");
        }
        List<String> list = new ArrayList<>();
        for (String item : chooseList) {
            if (item.equals(selected)) {
                list.add("√");
            } else {
                list.add("");
            }
        }
        return list;
    }

    /**
     * 数据转换--登记明细用户填写答案导出数据格式转换
     *
     * @param answerContentVOList
     *            用户答题记录
     * @return 用户填写答案数据
     */
    public List<List<Object>> ReserveData(List<ComActQuestnaireAnswerContentVO> answerContentVOList) {
        // 结果数据集合
        List<List<Object>> resultList = new ArrayList<>();
        // 构建单个用户数据
        List<Object> userData = new ArrayList<>();

        String noExport = "以上信息仅用于";
        // 遍历答案列表
        Long reserveRecordId = 0L;
        Long reserveSubId = 0L;
        Boolean isOldDuo = false;
        StringBuffer sb = new StringBuffer();
        if (answerContentVOList != null && answerContentVOList.size() > 0) {
            int a = 0;
            for (ComActQuestnaireAnswerContentVO userAnswers : answerContentVOList) {
                a++;
                if (answerContentVOList.size() == 26 && a == 9) {
                    userData.add(" ");
                }
                // 判断是文字描述直接跳过
                if (userAnswers.getOptionType().equals(5) || (StringUtils.isNotEmpty(userAnswers.getAnswerContent())
                    && userAnswers.getAnswerContent().contains(noExport))) {
                    continue;
                }
                // 判断reserveRecordId为空则为第一条记录,默认加上昵称和灯谜是
                if (reserveRecordId.equals(0L)) {
                    reserveRecordId = userAnswers.getReserveRecordId();
                    // userData.add(userAnswers.getNickName());
                    // userData.add(DateUtils.format(userAnswers.getTime(), DateUtils.ymdhms_format));
                }
                // 根据reserveRecordId判断是否是第二条填报记录
                if (!reserveRecordId.equals(userAnswers.getReserveRecordId())) {
                    reserveSubId = 0L;

                    if (isOldDuo) {
                        String answer = sb.toString();
                        userData.add(answer.substring(0, answer.length() - 1));
                        sb = new StringBuffer();
                        isOldDuo = false;
                    }
                    userData.add(0, " ");
                    userData.add(1, " ");
                    userData.add(2, " ");
                    userData.add(28, " ");
                    resultList.add(userData);
                    userData = new ArrayList<>();
                    reserveRecordId = userAnswers.getReserveRecordId();
                    // userData.add(userAnswers.getNickName());
                    // userData.add(DateUtils.format(userAnswers.getTime(), DateUtils.ymdhms_format));
                    if (StringUtils.isNotEmpty(userAnswers.getAnswerContent())) {
                        userData.add(userAnswers.getAnswerContent());
                    } else {
                        userData.add(" ");
                    }
                } else {
                    if (reserveSubId.equals(0L)) {
                        reserveSubId = userAnswers.getReserveSubId();
                    }

                    if (!reserveSubId.equals(userAnswers.getReserveSubId())) {
                        reserveSubId = userAnswers.getReserveSubId();

                        // 如果是承诺字段则不导出
                        if (StringUtils.isNotEmpty(userAnswers.getAnswerContent())
                            && userAnswers.getAnswerContent().contains(noExport)) {
                            continue;
                        }

                        // 判断当前的组件类型是否是图片上传，导出时需要导出图片
                        if (userAnswers.getOptionType().equals(11)) {
                            reserveSubId = userAnswers.getReserveSubId();
                            try {
                                if (StringUtils.isNotEmpty(userAnswers.getAnswerContent())) {
                                    userData.add(new URL(userAnswers.getAnswerContent()));
                                    // userData.add(new
                                    // File("/workspace/minio/data/files/"+userAnswers.getAnswerContent().substring(userAnswers.getAnswerContent().indexOf("files/")+6)));
                                } else {
                                    userData.add(" ");
                                }
                            } catch (Exception e) {
                                e.printStackTrace();
                                userData.add(" ");
                                log.error("导出转换图片失败！" + "/workspace/minio/data/files/" + userAnswers.getAnswerContent()
                                    .substring(userAnswers.getAnswerContent().indexOf("files/") + 6));
                            }
                            continue;
                        }
                        // 如果是多选
                        if (userAnswers.getOptionType().equals(1)) {
                            List<String> selectionList =
                                communityService.subjectSelectionListAdmin(userAnswers.getReserveSubId());
                            List<String> completionList =
                                automaticDataCompletion(selectionList, userAnswers.getAnswerContent());
                            userData.addAll(completionList);
                            continue;
                        }
                        // 如果是单选
                        if (userAnswers.getOptionType().equals(0)) {
                            if (userAnswers.getAnswerContent().equals("男")
                                || userAnswers.getAnswerContent().equals("女")) {

                            } else {
                                List<String> completionList =
                                    automaticDataCompletion(null, userAnswers.getAnswerContent());
                                userData.addAll(completionList);
                                continue;
                            }
                        }
                        // 判断当前组件类型是否签名
                        if (userAnswers.getOptionType().equals(12)) {
                            reserveSubId = userAnswers.getReserveSubId();
                            try {
                                userData.add(DatatypeConverter.parseBase64Binary(userAnswers.getAnswerContent()
                                    .substring(userAnswers.getAnswerContent().indexOf(",") + 1)));
                            } catch (Exception e) {
                                userData.add(" ");
                                log.error("导出转换图片失败！");
                            }
                            continue;
                        }

                        if (userAnswers.getOptionType().equals(1)) {
                            isOldDuo = true;
                            sb.append(
                                userAnswers.getAnswerContent() == null ? "无" : userAnswers.getAnswerContent() + ",");
                            continue;
                        } else {
                            if (isOldDuo) {
                                String answer = sb.toString();
                                userData.add(answer.substring(0, answer.length() - 1));
                                sb = new StringBuffer();
                            }
                            isOldDuo = false;
                        }
                        sb.append(userAnswers.getAnswerContent() == null ? "无" : userAnswers.getAnswerContent() + ",");
                        String answer = sb.toString();
                        userData.add(answer.substring(0, answer.length() - 1));
                        sb = new StringBuffer();
                    } else {
                        // 如果是承诺字段则不导出
                        if (StringUtils.isNotEmpty(userAnswers.getAnswerContent())
                            && userAnswers.getAnswerContent().contains(noExport)) {
                            continue;
                        }
                        // 判断当前的组件类型是否是图片上传，导出时需要导出图片
                        if (userAnswers.getOptionType().equals(11)) {
                            reserveSubId = userAnswers.getReserveSubId();
                            try {
                                userData.add(new URL(userAnswers.getAnswerContent()));
                            } catch (Exception e) {
                                userData.add(" ");
                                log.error("导出转换图片失败！");
                            }
                            continue;
                        }
                        // 如果是多选
                        if (userAnswers.getOptionType().equals(1)) {
                            List<String> selectionList =
                                communityService.subjectSelectionListAdmin(userAnswers.getReserveSubId());
                            List<String> completionList =
                                automaticDataCompletion(selectionList, userAnswers.getAnswerContent());
                            userData.addAll(completionList);
                            continue;
                        }
                        // 如果是单选
                        if (userAnswers.getOptionType().equals(0)) {
                            if (userAnswers.getAnswerContent().equals("男")
                                || userAnswers.getAnswerContent().equals("女")) {

                            } else {
                                List<String> completionList =
                                    automaticDataCompletion(null, userAnswers.getAnswerContent());
                                userData.addAll(completionList);
                                continue;
                            }
                        }
                        // 判断当前组件类型是否签名
                        if (userAnswers.getOptionType().equals(12)) {
                            reserveSubId = userAnswers.getReserveSubId();
                            try {
                                // userData.add(new
                                // URL("http://image.panzhihua.nhys.cdnhxx.com//idcard/967dbdef3ef3465a9169fbea204f9aa7.jpg"));
                                userData.add(DatatypeConverter.parseBase64Binary(userAnswers.getAnswerContent()
                                    .substring(userAnswers.getAnswerContent().indexOf(",") + 1)));
                            } catch (Exception e) {
                                userData.add(" ");
                                log.error("导出转换图片失败！");
                            }
                            continue;
                        }
                        if (userAnswers.getOptionType().equals(1)) {
                            isOldDuo = true;
                            sb.append(
                                userAnswers.getAnswerContent() == null ? "无" : userAnswers.getAnswerContent() + ",");
                            continue;
                        } else {
                            if (isOldDuo) {
                                String answer = sb.toString();
                                userData.add(answer.substring(0, answer.length() - 1));
                                sb = new StringBuffer();
                            }
                            isOldDuo = false;
                        }
                        sb.append(userAnswers.getAnswerContent() == null ? "无" : userAnswers.getAnswerContent() + ",");
                        String answer = sb.toString();
                        userData.add(answer.substring(0, answer.length() - 1));
                        sb = new StringBuffer();
                    }
                }
            }
            if (isOldDuo) {
                String answer = sb.toString();
                userData.add(answer.substring(0, answer.length() - 1));
            }

            userData.add(0, " ");
            userData.add(1, " ");
            userData.add(2, " ");
            userData.add(28, " ");
            resultList.add(userData);
        }
        return resultList;
    }
}

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

@@ -35,6 +35,11 @@
import com.panzhihua.common.model.dtos.community.convenient.PagePopularMerchantDTO;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyOrg;
import com.panzhihua.common.model.vos.community.bigscreen.WestScreenStatics;
import com.panzhihua.common.model.vos.partybuilding.PartyBuildingComPbDynVO;
import com.panzhihua.common.service.partybuilding.PartyBuildingService;
import com.panzhihua.common.model.vos.community.ComActDynVO;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
import com.panzhihua.common.model.vos.community.ComActMicroWishVO;
@@ -53,6 +58,7 @@
import com.panzhihua.common.model.vos.community.bigscreen.IndexInfo;
import com.panzhihua.common.model.vos.community.bigscreen.ResidentAutonomyStatisticsVO;
import com.panzhihua.common.model.vos.community.bigscreen.WestScreenStatics;
import com.panzhihua.common.model.vos.community.bigscreen.*;
import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
import com.panzhihua.common.model.vos.community.screen.civil.CivilStatisticsVO;
import com.panzhihua.common.model.vos.community.screen.event.EventComprehensiveGovernanceStatisticsVO;
@@ -489,6 +495,7 @@
            return R.fail(401, "请先登录");
        }
        pagePopularMerchantDTO.setCommunityId(communityId);
        pagePopularMerchantDTO.setAreaCode(this.getAreaCode());
        return communityService.getScreenPopularMerchants(pagePopularMerchantDTO);
    }

@@ -555,4 +562,20 @@
        }
        return communityService.pageEventList(pageBaseDTO);
    }
    @ApiOperation(value = "河门口大屏首页", response = BigScreenHmkBaseInfo.class)
    @PostMapping("/hmk/baseInfo")
    public R getHmkBaseInfo(@RequestBody CommonPage commonPage){
        return communityService.hmkBaseInfo(commonPage);
    }

    @ApiOperation(value = "河门口大屏折线图", response = BigScreenActivityLine.class)
    @GetMapping("/hmk/partyProjectActivityLine")
    public R partyActivityLine(){
        return communityService.partyProjectActivityLine();
    }
    @ApiOperation(value = "河门口活动积分排行", response = ComActActivityVO.class)
    @PostMapping("/hmk/projectActivityTop")
    public R projectActivityTop(@RequestBody CommonPage commonPage){
        return communityService.projectActivityProject(commonPage);
    }
}

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

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


import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
@@ -41,7 +42,12 @@
    @ApiOperation(value = "分页查询所有数据",response = ComActColumnVO.class)
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        commonPage.setCommunityId(this.getCommunityId());
        if(this.getLoginUserInfo().getStreetId()!=null){
            commonPage.setStreetId(this.getLoginUserInfo().getStreetId());
        }
        else {
            commonPage.setCommunityId(this.getCommunityId());
        }
        return this.communityService.comActColumnSelectAll(commonPage);
    }

@@ -66,7 +72,12 @@
    @ApiOperation("新增数据")
    @PostMapping
    public R insert(@RequestBody ComActColumnVO comActColumnVO) {
        comActColumnVO.setCommunityId(this.getCommunityId());
        if(this.getLoginUserInfo().getStreetId()!=null){
            comActColumnVO.setStreetId(this.getLoginUserInfo().getStreetId());
        }
        else {
            comActColumnVO.setCommunityId(this.getCommunityId());
        }
        comActColumnVO.setStatus(1);
        comActColumnVO.setCreateTime(new Date());
        if(StringUtils.isNotEmpty(this.getLoginUserInfo().getName())){
@@ -102,5 +113,20 @@
    public R delete(@RequestParam("id") Long id) {
        return this.communityService.comActColumnDelete(id);
    }

    /**
     * 项目分类级联查询
     */
    @ApiOperation("项目分类级联查询")
    @PostMapping("/queryLevel")
    public R queryLevel(@RequestBody ComActColumnVO comActColumnVO){
        if(this.getLoginUserInfo().getStreetId()!=null){
            comActColumnVO.setStreetId(this.getLoginUserInfo().getStreetId());
        }
        else {
            comActColumnVO.setCommunityId(this.getCommunityId());
        }
        return this.communityService.queryLevel(comActColumnVO);
    }
}


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

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


import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.raffle.ComActRaffleVO;
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;

/**
 * 抽奖活动表(ComActRaffle)表控制层
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 抽奖活动表相关功能
 *
 * @author zzj
 * @since 2022-02-18 14:31:20
 */
@Slf4j
@Api(tags = {"抽奖活动"})
@RestController
@RequestMapping("comActRaffle")
public class ComActRaffleApi extends BaseController {
    /**
     * 服务对象
     */
    @Resource
    private CommunityService communityService;

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @ApiOperation(value = "分页查询",response = ComActRaffleVO.class)
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        commonPage.setCommunityId(this.getCommunityId());
        return this.communityService.selectAllComActRaffle(commonPage);
    }

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @ApiOperation(value = "详情",response = ComActRaffleVO.class)
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Long id) {
        return this.communityService.selectOneComActRaffle(id,0L);
    }

    /**
     * 新增数据
     *
     * @param comActRaffleVO 实体对象
     * @return 新增结果
     */
    @ApiOperation(value = "新增数据")
    @PostMapping
    public R insert(@RequestBody ComActRaffleVO comActRaffleVO) {
        comActRaffleVO.setCommunityId(this.getCommunityId());
        comActRaffleVO.setCreateBy(this.getUserId());
        return this.communityService.insertComActRaffle(comActRaffleVO);
    }

    /**
     * 修改数据
     *
     * @param comActRaffleVO 实体对象
     * @return 修改结果
     */
    @ApiOperation(value = "修改数据")
    @PostMapping("/update")
    public R update(@RequestBody ComActRaffleVO comActRaffleVO) {
        return this.communityService.updateComActRaffle(comActRaffleVO);
    }

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @ApiOperation(value = "删除数据")
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return this.communityService.deleteComActRaffle(id);
    }
}

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

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


import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.ExcelWriter;
import com.alibaba.excel.write.metadata.WriteSheet;
import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
import com.alibaba.fastjson.JSONArray;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.raffle.ComActRaffleRecordExcelVO;
import com.panzhihua.common.model.vos.community.raffle.ComActRaffleRecordVO;
import com.panzhihua.common.model.vos.community.warehouse.ComActWarehouseApplyExcelVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.SFTPUtil;
import com.panzhihua.community_backstage.excel.CustomSheetWriteHandler;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
import java.io.Serializable;

/**
 * 抽奖活动中奖记录表(ComActRaffleRecord)表控制层
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 抽奖活动中奖记录表相关功能
 *
 * @author zzj
 * @since 2022-02-18 14:32:02
 */
@Slf4j
@Api(tags = {"获奖记录"})
@RestController
@RequestMapping("comActRaffleRecord")
public class ComActRaffleRecordApi {
    /**
     * 服务对象
     */
    @Resource
    private CommunityService communityService;

    @Value("${excel.userurl}")
    private String excelUrl;
    // FTP 登录用户名
    @Value("${ftp.username}")
    private String userName;
    // FTP 登录密码
    @Value("${ftp.password}")
    private String password;
    // FTP 服务器地址IP地址
    @Value("${ftp.host}")
    private String host;
    // FTP 端口
    @Value("${ftp.port}")
    private int port;

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @ApiOperation(value = "分页查询",response = ComActRaffleRecordVO.class)
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        return this.communityService.selectAllComActRaffleRecord(commonPage);
    }
    @ApiOperation(value = "根据抽奖活动id获取奖品统计")
    @GetMapping("/queryPrize")
    public R queryPrize(@RequestParam("id")Long id){
        return this.communityService.queryPrize(id);
    }
    @ApiOperation(value = "导出")
    @PostMapping("/export")
    public R export(@RequestBody CommonPage commonPage) {
        String name = "获奖名单.xlsx";
        String ftpUrl = "/mnt/data/web/excel/";
        // 用户搜索了就下载搜索的用户否则下载所有用户
        R r = communityService.exportComActRaffleRecord(commonPage);
        if (R.isOk(r)) {
            try {
                SFTPUtil sftp = new SFTPUtil(userName, password, host, port);
                sftp.login();
                boolean existDir = sftp.isExistDir(ftpUrl + name);
                if (!existDir) {
                    String property = System.getProperty("user.dir");
                    String fileName = property + File.separator + name;
                    // 这里 需要指定写用哪个class去写
                    ExcelWriter excelWriter = null;
                    InputStream inputStream = null;
                    try {
                        excelWriter = EasyExcel.write(fileName, ComActRaffleRecordExcelVO.class)
                                .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                                .registerWriteHandler(new CustomSheetWriteHandler()).build();
                        WriteSheet writeSheet = EasyExcel.writerSheet( "导出").build();
                        excelWriter.write(JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComActRaffleRecordExcelVO.class), writeSheet);


                        excelWriter.finish();
                        File file = new File(fileName);
                        inputStream = new FileInputStream(file);
                        sftp.uploadMore(ftpUrl, name, inputStream);
                        sftp.logout();
                        inputStream.close();
                        String absolutePath = file.getAbsolutePath();
                        boolean delete = file.delete();
                        log.info("删除excel【{}】结果【{}】", absolutePath, delete);
                    } finally {
                        // 千万别忘记finish 会帮忙关闭流
                        if (inputStream != null) {
                            inputStream.close();
                        }
                        if (excelWriter != null) {
                            excelWriter.finish();
                        }
                    }
                }
                return R.ok(excelUrl + name);
            } catch (Exception e) {
                e.printStackTrace();
                log.error("文件传输失败【{}】", e.getMessage());
                return R.fail();
            }
        }
        return r;
    }
}

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

@@ -1,23 +1,24 @@
package com.panzhihua.community_backstage.api;

import java.io.*;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.net.URLConnection;
import java.util.*;

import javax.annotation.Resource;

import com.lowagie.text.DocumentException;
import com.panzhihua.common.model.vos.community.ComActReserveCommitVO;
import com.panzhihua.common.model.vos.community.reserve.*;
import com.panzhihua.community_backstage.util.HtmlToPdfUtil;
import com.panzhihua.common.utlis.StringUtils;
import org.apache.poi.ss.usermodel.BorderStyle;
import org.apache.poi.ss.usermodel.HorizontalAlignment;
import org.apache.poi.ss.usermodel.VerticalAlignment;
import org.springframework.beans.BeanUtils;
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.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import org.thymeleaf.TemplateEngine;
import org.thymeleaf.context.Context;

import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.ExcelWriter;
@@ -31,49 +32,27 @@
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.enums.ReserveRecordStatusEnum;
import com.panzhihua.common.model.dtos.community.QuestnaireAnswersDTO;
import com.panzhihua.common.model.dtos.community.reserve.AddReserveAdminDTO;
import com.panzhihua.common.model.dtos.community.reserve.CancelReserveRecordDTO;
import com.panzhihua.common.model.dtos.community.reserve.ComActReserveMakeStatisticsDTO;
import com.panzhihua.common.model.dtos.community.reserve.ComActReserveRegisterStatisticsDTO;
import com.panzhihua.common.model.dtos.community.reserve.EditComActReserveInfoDTO;
import com.panzhihua.common.model.dtos.community.reserve.EditComActReserveStatusDTO;
import com.panzhihua.common.model.dtos.community.reserve.EditReserveAdminDTO;
import com.panzhihua.common.model.dtos.community.reserve.MakeHandleAdminDTO;
import com.panzhihua.common.model.dtos.community.reserve.PageReserveAdminDTO;
import com.panzhihua.common.model.dtos.community.reserve.PageReserveMakeAdminDTO;
import com.panzhihua.common.model.dtos.community.reserve.PageReserveMakeHandleAdminDTO;
import com.panzhihua.common.model.dtos.community.reserve.PageReserveRegisterDetailedAdminDTO;
import com.panzhihua.common.model.dtos.community.reserve.*;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActQuestnaireSubVO;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveListAdminVO;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveMakeDetailAdminVO;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveMakeDetailedExcelAdminVO;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveMakeHandleExcelAdminVO;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveMakeHandleListAdminVO;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveMakeListAdminVO;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveMakeRightExcelAdminVO;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveMakeRightStatisticsAdminVO;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveMakeStatisticsAdminVO;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveRegisterDetailedVO;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveRegisterExcelAdminVO;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveRegisterStatisticsAdminVO;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveSubListVO;
import com.panzhihua.common.model.vos.community.ComActReserveCommitVO;
import com.panzhihua.common.model.vos.community.reserve.*;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.AssemblyUtils;
import com.panzhihua.common.utlis.HomeQuarantineUtil;
import com.panzhihua.common.utlis.ForEachUtils;
import com.panzhihua.common.utlis.SFTPUtil;
import com.panzhihua.community_backstage.aop.RenheAssemblyUtils;
import com.panzhihua.community_backstage.config.SFTPConfig;
import com.panzhihua.community_backstage.excel.CustemSecondhandler;
import com.panzhihua.community_backstage.excel.Custemhandler;
import com.panzhihua.community_backstage.excel.CustomSheetWriteHandler;
import com.panzhihua.community_backstage.util.HtmlToPdfUtil;

import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.thymeleaf.TemplateEngine;
import org.thymeleaf.context.Context;

/**
 * @description: 预约登记接口
@@ -85,7 +64,10 @@
@RestController
@RequestMapping("/reserve")
public class ComActReserveApi extends BaseController {
    private static final String key="nahankeji1234567";
    private static final String key = "nahankeji1234567";

    @Value("${minio.url}")
    private String minioUrl;

    @Resource
    private CommunityService communityService;
@@ -95,11 +77,13 @@
    private SFTPConfig sftpConfig;
    @Resource
    private TemplateEngine templateEngine;
    @Resource
    private RenheAssemblyUtils assemblyUtils;

    @ApiOperation(value = "分页查询预约登记列表", response = ComActReserveListAdminVO.class)
    @PostMapping("/page")
    public R page(@RequestBody PageReserveAdminDTO pageReserveDTO) {
        if(pageReserveDTO.getCommunityId()==null){
        if (pageReserveDTO.getCommunityId() == null) {
            Long communityId = this.getCommunityId();
            pageReserveDTO.setCommunityId(communityId);
        }
@@ -200,14 +184,16 @@
        R r = communityService.makeStatisticsExportAdmin(makeStatisticsDTO);
        if (R.isOk(r)) {
            List<ComActReserveMakeRightExcelAdminVO> resultList = new ArrayList<>();
            List<ComActReserveMakeRightStatisticsAdminVO> rightStatisticsList = JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComActReserveMakeRightStatisticsAdminVO.class);
            List<ComActReserveMakeRightStatisticsAdminVO> rightStatisticsList = JSONArray
                .parseArray(JSONArray.toJSONString(r.getData()), ComActReserveMakeRightStatisticsAdminVO.class);
            rightStatisticsList.forEach(rightStatistics -> {
                ComActReserveMakeRightExcelAdminVO makeRightExcelAdminVO = new ComActReserveMakeRightExcelAdminVO();
                BeanUtils.copyProperties(rightStatistics, makeRightExcelAdminVO);
                resultList.add(makeRightExcelAdminVO);
            });
            try {
                SFTPUtil sftp = new SFTPUtil(sftpConfig.getUserName(), sftpConfig.getPassword(), sftpConfig.getHost(), sftpConfig.getPort());
                SFTPUtil sftp = new SFTPUtil(sftpConfig.getUserName(), sftpConfig.getPassword(), sftpConfig.getHost(),
                    sftpConfig.getPort());
                sftp.login();
                boolean existDir = sftp.isExistDir(ftpUrl + name);
                if (!existDir) {
@@ -218,8 +204,8 @@
                    InputStream inputStream = null;
                    try {
                        excelWriter = EasyExcel.write(fileName, ComActReserveMakeRightExcelAdminVO.class)
                                .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                                .registerWriteHandler(new CustomSheetWriteHandler()).build();
                            .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                            .registerWriteHandler(new CustomSheetWriteHandler()).build();
                        WriteSheet writeSheet = EasyExcel.writerSheet("预约登记统计汇总导出数据").build();
                        excelWriter.write(resultList, writeSheet);
                        excelWriter.finish();
@@ -283,14 +269,17 @@
        R r = communityService.exportMakeAdmin(pageMakeDTO);
        if (R.isOk(r)) {
            List<ComActReserveMakeDetailedExcelAdminVO> resultList = new ArrayList<>();
            List<ComActReserveMakeListAdminVO> rightStatisticsList = JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComActReserveMakeListAdminVO.class);
            List<ComActReserveMakeListAdminVO> rightStatisticsList =
                JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComActReserveMakeListAdminVO.class);
            rightStatisticsList.forEach(rightStatistics -> {
                ComActReserveMakeDetailedExcelAdminVO makeRightExcelAdminVO = new ComActReserveMakeDetailedExcelAdminVO();
                ComActReserveMakeDetailedExcelAdminVO makeRightExcelAdminVO =
                    new ComActReserveMakeDetailedExcelAdminVO();
                BeanUtils.copyProperties(rightStatistics, makeRightExcelAdminVO);
                resultList.add(makeRightExcelAdminVO);
            });
            try {
                SFTPUtil sftp = new SFTPUtil(sftpConfig.getUserName(), sftpConfig.getPassword(), sftpConfig.getHost(), sftpConfig.getPort());
                SFTPUtil sftp = new SFTPUtil(sftpConfig.getUserName(), sftpConfig.getPassword(), sftpConfig.getHost(),
                    sftpConfig.getPort());
                sftp.login();
                boolean existDir = sftp.isExistDir(ftpUrl + name);
                if (!existDir) {
@@ -301,8 +290,8 @@
                    InputStream inputStream = null;
                    try {
                        excelWriter = EasyExcel.write(fileName, ComActReserveMakeDetailedExcelAdminVO.class)
                                .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                                .registerWriteHandler(new CustomSheetWriteHandler()).build();
                            .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                            .registerWriteHandler(new CustomSheetWriteHandler()).build();
                        WriteSheet writeSheet = EasyExcel.writerSheet("预约明细导出数据").build();
                        excelWriter.write(resultList, writeSheet);
                        excelWriter.finish();
@@ -359,14 +348,16 @@
        R r = communityService.registerStatisticsExportAdmin(registerStatisticsDTO);
        if (R.isOk(r)) {
            List<ComActReserveRegisterExcelAdminVO> resultList = new ArrayList<>();
            List<ComActReserveRegisterStatisticsAdminVO> rightStatisticsList = JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComActReserveRegisterStatisticsAdminVO.class);
            List<ComActReserveRegisterStatisticsAdminVO> rightStatisticsList =
                JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComActReserveRegisterStatisticsAdminVO.class);
            rightStatisticsList.forEach(rightStatistics -> {
                ComActReserveRegisterExcelAdminVO makeRightExcelAdminVO = new ComActReserveRegisterExcelAdminVO();
                BeanUtils.copyProperties(rightStatistics, makeRightExcelAdminVO);
                resultList.add(makeRightExcelAdminVO);
            });
            try {
                SFTPUtil sftp = new SFTPUtil(sftpConfig.getUserName(), sftpConfig.getPassword(), sftpConfig.getHost(), sftpConfig.getPort());
                SFTPUtil sftp = new SFTPUtil(sftpConfig.getUserName(), sftpConfig.getPassword(), sftpConfig.getHost(),
                    sftpConfig.getPort());
                sftp.login();
                boolean existDir = sftp.isExistDir(ftpUrl + name);
                if (!existDir) {
@@ -377,8 +368,8 @@
                    InputStream inputStream = null;
                    try {
                        excelWriter = EasyExcel.write(fileName, ComActReserveRegisterExcelAdminVO.class)
                                .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                                .registerWriteHandler(new CustomSheetWriteHandler()).build();
                            .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                            .registerWriteHandler(new CustomSheetWriteHandler()).build();
                        WriteSheet writeSheet = EasyExcel.writerSheet("登记统计汇总导出数据").build();
                        excelWriter.write(resultList, writeSheet);
                        excelWriter.finish();
@@ -447,7 +438,8 @@
        R r = communityService.exportMakeHandleAdmin(pageMakeHandleDTO);
        if (R.isOk(r)) {
            List<ComActReserveMakeHandleExcelAdminVO> resultList = new ArrayList<>();
            List<ComActReserveMakeHandleListAdminVO> rightStatisticsList = JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComActReserveMakeHandleListAdminVO.class);
            List<ComActReserveMakeHandleListAdminVO> rightStatisticsList =
                JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComActReserveMakeHandleListAdminVO.class);
            rightStatisticsList.forEach(rightStatistics -> {
                ComActReserveMakeHandleExcelAdminVO makeRightExcelAdminVO = new ComActReserveMakeHandleExcelAdminVO();
                BeanUtils.copyProperties(rightStatistics, makeRightExcelAdminVO);
@@ -455,7 +447,8 @@
                resultList.add(makeRightExcelAdminVO);
            });
            try {
                SFTPUtil sftp = new SFTPUtil(sftpConfig.getUserName(), sftpConfig.getPassword(), sftpConfig.getHost(), sftpConfig.getPort());
                SFTPUtil sftp = new SFTPUtil(sftpConfig.getUserName(), sftpConfig.getPassword(), sftpConfig.getHost(),
                    sftpConfig.getPort());
                sftp.login();
                boolean existDir = sftp.isExistDir(ftpUrl + name);
                if (!existDir) {
@@ -466,8 +459,8 @@
                    InputStream inputStream = null;
                    try {
                        excelWriter = EasyExcel.write(fileName, ComActReserveMakeHandleExcelAdminVO.class)
                                .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                                .registerWriteHandler(new CustomSheetWriteHandler()).build();
                            .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                            .registerWriteHandler(new CustomSheetWriteHandler()).build();
                        WriteSheet writeSheet = EasyExcel.writerSheet("预约处理列表导出数据").build();
                        excelWriter.write(resultList, writeSheet);
                        excelWriter.finish();
@@ -502,6 +495,18 @@
    @ApiOperation(value = "导出登记明细")
    @PostMapping("/register/list/export")
    public R exportRegister(@RequestBody PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        if (loginUserInfo == null) {
            return R.fail("请先登录");
        }
        String regionCode = communityService.getActBelongRegionCode(loginUserInfo.getCommunityId());
        if (regionCode.equals("510411")) {
            ComActReserveDetailAdminVO reserverRecord =
                communityService.detailReserveAdmin(pageReserveRegisterDetailedAdminDTO.getReserveId()).getData();
            if (reserverRecord.getTitle().equals("返攀登记")) {
                return renheExportRegister(pageReserveRegisterDetailedAdminDTO);
            }
        }
        String ftpUrl = "/mnt/data/web/excel/";
        String name = "登记明细导出数据.xlsx";
        String noHaed = "承诺";
@@ -535,12 +540,17 @@
                    head1.add("登记时间");
                    headList.add(head1);
                    subVOList.forEach(sub -> {
                        if (sub.getType() != 5 && sub.getType() != 11) {
                        if (sub.getType() != 5) {
                            List<String> headn = new ArrayList<>();
                            headn.add(firstRowContent);
                            if(!sub.getContent().equals(noHaed)){
                            if(!sub.getContent().equals(noHaed)&& StringUtils.isNotEmpty(sub.getContent())){
                                if(sub.getType() == 11){
                                    headn.add(sub.getContent().substring(0, sub.getContent().indexOf("（")));
                                    if(sub.getContent().contains("（")){
                                        headn.add(sub.getContent().substring(0, sub.getContent().indexOf("（")));
                                    }
                                    else {
                                        headn.add(sub.getContent());
                                    }
                                }else{
                                    headn.add(sub.getContent());
                                }
@@ -608,13 +618,24 @@
        }
    }

    @ApiOperation(value = "导出居家隔离统计")
    @PostMapping("/register/list/export/homeQuarantine")
    public R exportRegisterHomeQuarantineStatistics(@RequestBody PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO) {
        String name= "居家隔离统计表.xlsx";
    @ApiOperation(value = "导出登记明细不带图片")
    @PostMapping("/register/list/exportNoImage")
    public R exportRegisterNoImage(@RequestBody PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        if (loginUserInfo == null) {
            return R.fail("请先登录");
        }
        String regionCode = communityService.getActBelongRegionCode(loginUserInfo.getCommunityId());
        if (regionCode.equals("510411")) {
            ComActReserveDetailAdminVO reserverRecord =
                    communityService.detailReserveAdmin(pageReserveRegisterDetailedAdminDTO.getReserveId()).getData();
            if (reserverRecord.getTitle().equals("返攀登记")) {
                return renheExportRegister(pageReserveRegisterDetailedAdminDTO);
            }
        }
        String ftpUrl = "/mnt/data/web/excel/";
        String name = "登记明细导出数据.xlsx";
        String noHaed = "承诺";
        List<List<Object>> datalist = new ArrayList<>();
        try {
            SFTPUtil sftp = new SFTPUtil(sftpConfig.getUserName(), sftpConfig.getPassword(), sftpConfig.getHost(), sftpConfig.getPort());
            sftp.login();
@@ -629,12 +650,13 @@
                     * 组合导出数据
                     * 用户问卷答案
                     */
                    R exportResultR = communityService.exportHomeQuarantine(pageReserveRegisterDetailedAdminDTO);
                    HomeQuarantineRegisterExportVO exportVO = JSON.parseObject(JSON.toJSONString(exportResultR.getData()), HomeQuarantineRegisterExportVO.class);
                    List<ComActQuestnaireSubVO> subVOList = exportVO.getSubs();
                    R QuestnaireAnswersDTOR = communityService.exportRegisterAdmin(pageReserveRegisterDetailedAdminDTO);
                    QuestnaireAnswersDTO questnaireAnswersDTOS = JSON.parseObject(JSON.toJSONString(QuestnaireAnswersDTOR.getData()), QuestnaireAnswersDTO.class);

                    List<ComActQuestnaireSubVO> subVOList = questnaireAnswersDTOS.getSubs();
                    //构造表头
                    List<List<String>> headList = new ArrayList<List<String>>();
                    String firstRowContent = "重点地区或高风险地区来攀返攀人员信息统计表（居家隔离表）";
                    String firstRowContent = "登记明细";
                    List<String> head0 = new ArrayList<>();
                    head0.add(firstRowContent);
                    head0.add("登记人昵称");
@@ -644,13 +666,17 @@
                    head1.add("登记时间");
                    headList.add(head1);
                    subVOList.forEach(sub -> {
                        if (sub.getType() != 5 && sub.getType() != 11 && !sub.getContent().contains("今日上午") &&
                                !sub.getContent().contains("今日下午") && !sub.getContent().contains("今日隔离情况")) {
                        if (sub.getType() != 5&&sub.getType() != 11) {
                            List<String> headn = new ArrayList<>();
                            headn.add(firstRowContent);
                            if(!sub.getContent().equals(noHaed)){
                            if(!sub.getContent().equals(noHaed)&& StringUtils.isNotEmpty(sub.getContent())){
                                if(sub.getType() == 11){
                                    headn.add(sub.getContent().substring(0, sub.getContent().indexOf("（")));
                                    if(sub.getContent().contains("（")){
                                        headn.add(sub.getContent().substring(0, sub.getContent().indexOf("（")));
                                    }
                                    else {
                                        headn.add(sub.getContent());
                                    }
                                }else{
                                    headn.add(sub.getContent());
                                }
@@ -658,12 +684,9 @@
                            }
                        }
                    });
                    List<String> head2 = new ArrayList<>();
                    head2.add(firstRowContent);
                    head2.add("隔离体温情况");
                    headList.add(head2);
                    //数据转换
                    datalist = exportVO.getDataList();
                    List<List<Object>> datalist = AssemblyUtils.ReserveDataNoImage(questnaireAnswersDTOS.getAnswers());

                    WriteCellStyle headWriteCellStyle = new WriteCellStyle();
                    //设置头居中
                    headWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER);
@@ -679,7 +702,7 @@
                    WriteFont writeFont = new WriteFont();
                    writeFont.setFontHeightInPoints((short)6);
                    //设置 水平居中
                    contentWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.LEFT);
                    contentWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER);
                    //设置 垂直居中
                    contentWriteCellStyle.setVerticalAlignment(VerticalAlignment.CENTER);
                    contentWriteCellStyle.setWriteFont(writeFont);
@@ -690,8 +713,226 @@


                    excelWriter = EasyExcel.write(fileName)
                            .registerWriteHandler(horizontalCellStyleStrategy).registerWriteHandler(new CustemSecondhandler())
                            .build();
                            .registerWriteHandler(horizontalCellStyleStrategy).registerWriteHandler(new Custemhandler())
                            .registerWriteHandler(new CustomSheetWriteHandler()).build();
                    WriteSheet writeSheet = EasyExcel.writerSheet("登记明细导出数据").head(headList).build();
                    excelWriter.write(datalist, writeSheet);
                    excelWriter.finish();
                    File file = new File(fileName);
                    inputStream = new FileInputStream(file);
                    sftp.uploadMore(ftpUrl, name, inputStream);
                    sftp.logout();
                    inputStream.close();
                    String absolutePath = file.getAbsolutePath();
                    boolean delete = file.delete();
                    log.info("删除excel【{}】结果【{}】", absolutePath, delete);
                } finally {
                    // 千万别忘记finish 会帮忙关闭流
                    if (inputStream != null) {
                        inputStream.close();
                    }
                    if (excelWriter != null) {
                        excelWriter.finish();
                    }
                }
            }
            return R.ok(sftpConfig.getExcelUrl() + name);
        } catch (Exception e) {
            e.printStackTrace();
            log.error("文件传输失败【{}】", e.getMessage());
            return R.fail();
        }
    }

    /**
     * 仁和区离攀返攀特别定制excel方法。对于其他区不适用。
     * 
     * @param pageReserveRegisterDetailedAdminDTO
     * @return
     */
    public R renheExportRegister(@RequestBody PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO) {
        String ftpUrl = "/mnt/data/web/excel/";
        String name = "仁和区入攀返攀人员信息统计表模板.xlsx";
        String noHaed = "承诺";
        try {
            SFTPUtil sftp = new SFTPUtil(sftpConfig.getUserName(), sftpConfig.getPassword(), sftpConfig.getHost(),
                sftpConfig.getPort());
            sftp.login();
            boolean existDir = sftp.isExistDir(ftpUrl + name);
            if (!existDir) {
                String property = System.getProperty("user.dir");
                String fileName = property + File.separator + name;
                ExcelWriter excelWriter = null;
                InputStream inputStream = null;
                try {
                    /**
                     * 组合导出数据 用户问卷答案new FileInputStream
                     */
                    R QuestnaireAnswersDTOR = communityService.exportRegisterAdmin(pageReserveRegisterDetailedAdminDTO);
                    QuestnaireAnswersDTO questnaireAnswersDTOS = JSON
                        .parseObject(JSON.toJSONString(QuestnaireAnswersDTOR.getData()), QuestnaireAnswersDTO.class);
                    // 数据转换
                    List<List<Object>> datalist = assemblyUtils.ReserveData(questnaireAnswersDTOS.getAnswers());
                    ForEachUtils.forEach(0, datalist, (index, data) -> {
                        data.set(0, index + 1);
                        ForEachUtils.forEach(1, data, (indexitem, item) -> {
                            if (indexitem == 18 && item.equals("√")) {
                                String number = "√ /".concat(data.get(20).toString());
                                data.set(18, number);
                            }
                        });
                        data.remove(20);
                    });
                    WriteCellStyle headWriteCellStyle = new WriteCellStyle();
                    // 设置头居中
                    headWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER);
                    // 设置头字体
                    WriteFont headWriteFont = new WriteFont();
                    headWriteFont.setFontHeightInPoints((short)8);
                    headWriteFont.setBold(true);
                    headWriteCellStyle.setWriteFont(headWriteFont);

                    WriteCellStyle contentWriteCellStyle = new WriteCellStyle();
                    // 设置表格内容字体
                    WriteFont writeFont = new WriteFont();
                    writeFont.setFontHeightInPoints((short)11);
                    // 设置 水平居中
                    contentWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER);
                    // 设置 垂直居中
                    contentWriteCellStyle.setVerticalAlignment(VerticalAlignment.CENTER);
                    contentWriteCellStyle.setWriteFont(writeFont);
                    // 设置边框
                    // 下边框
                    contentWriteCellStyle.setBorderBottom(BorderStyle.THIN);
                    // 左边框
                    contentWriteCellStyle.setBorderLeft(BorderStyle.THIN);
                    // 上边框
                    contentWriteCellStyle.setBorderTop(BorderStyle.THIN);
                    // 右边框
                    contentWriteCellStyle.setBorderRight(BorderStyle.THIN);
                    contentWriteCellStyle.setWrapped(true);
                    HorizontalCellStyleStrategy horizontalCellStyleStrategy =
                        new HorizontalCellStyleStrategy(headWriteCellStyle, contentWriteCellStyle);

                    URL url = new URL(minioUrl.replace("files/", "web/excel/仁和区入攀返攀人员信息统计表.xlsx"));
                    // 打开连接
                    URLConnection con = url.openConnection();
                    // 输入流
                    InputStream is = con.getInputStream();
                    excelWriter = EasyExcel.write(fileName).withTemplate(is)
                        .registerWriteHandler(horizontalCellStyleStrategy).build();
                    WriteSheet writeSheet = EasyExcel.writerSheet("登记明细导出数据").build();
                    writeSheet.setRelativeHeadRowIndex(0);
                    excelWriter.write(datalist, writeSheet);
                    excelWriter.finish();
                    File file = new File(fileName);
                    inputStream = new FileInputStream(file);
                    sftp.uploadMore(ftpUrl, name, inputStream);
                    sftp.logout();
                    inputStream.close();
                    String absolutePath = file.getAbsolutePath();
                    boolean delete = file.delete();
                    log.info("删除excel【{}】结果【{}】", absolutePath, delete);
                } finally {
                    // 千万别忘记finish 会帮忙关闭流
                    if (inputStream != null) {
                        inputStream.close();
                    }
                    if (excelWriter != null) {
                        excelWriter.finish();
                    }
                }
            }
            return R.ok(sftpConfig.getExcelUrl() + name);
        } catch (Exception e) {
            e.printStackTrace();
            log.error("文件传输失败【{}】", e.getMessage());
            return R.fail();
        }
    }
    @ApiOperation(value = "导出居家隔离统计")
    @PostMapping("/register/list/export/homeQuarantine")
    public R exportRegisterHomeQuarantineStatistics(
        @RequestBody PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO) {
        String name = "居家隔离统计表.xlsx";
        String ftpUrl = "/mnt/data/web/excel/";
        String noHaed = "承诺";
        List<List<Object>> datalist = new ArrayList<>();
        try {
            SFTPUtil sftp = new SFTPUtil(sftpConfig.getUserName(), sftpConfig.getPassword(), sftpConfig.getHost(),
                sftpConfig.getPort());
            sftp.login();
            boolean existDir = sftp.isExistDir(ftpUrl + name);
            if (!existDir) {
                String property = System.getProperty("user.dir");
                String fileName = property + File.separator + name;
                ExcelWriter excelWriter = null;
                InputStream inputStream = null;
                try {
                    /**
                     * 组合导出数据 用户问卷答案
                     */
                    R exportResultR = communityService.exportHomeQuarantine(pageReserveRegisterDetailedAdminDTO);
                    HomeQuarantineRegisterExportVO exportVO = JSON
                        .parseObject(JSON.toJSONString(exportResultR.getData()), HomeQuarantineRegisterExportVO.class);
                    List<ComActQuestnaireSubVO> subVOList = exportVO.getSubs();
                    // 构造表头
                    List<List<String>> headList = new ArrayList<List<String>>();
                    String firstRowContent = "重点地区或高风险地区来攀返攀人员信息统计表（居家隔离表）";
                    List<String> head0 = new ArrayList<>();
                    head0.add(firstRowContent);
                    head0.add("登记人昵称");
                    headList.add(head0);
                    List<String> head1 = new ArrayList<>();
                    head1.add(firstRowContent);
                    head1.add("登记时间");
                    headList.add(head1);
                    subVOList.forEach(sub -> {
                        if (sub.getType() != 5 && sub.getType() != 11 && !sub.getContent().contains("今日上午")
                            && !sub.getContent().contains("今日下午") && !sub.getContent().contains("今日隔离情况")) {
                            List<String> headn = new ArrayList<>();
                            headn.add(firstRowContent);
                            if (!sub.getContent().equals(noHaed)) {
                                if (sub.getType() == 11) {
                                    headn.add(sub.getContent().substring(0, sub.getContent().indexOf("（")));
                                } else {
                                    headn.add(sub.getContent());
                                }
                                headList.add(headn);
                            }
                        }
                    });
                    List<String> head2 = new ArrayList<>();
                    head2.add(firstRowContent);
                    head2.add("隔离体温情况");
                    headList.add(head2);
                    // 数据转换
                    datalist = exportVO.getDataList();
                    WriteCellStyle headWriteCellStyle = new WriteCellStyle();
                    // 设置头居中
                    headWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER);
                    // 设置头字体
                    WriteFont headWriteFont = new WriteFont();
                    headWriteFont.setFontHeightInPoints((short)6);
                    headWriteFont.setBold(true);
                    headWriteCellStyle.setWriteFont(headWriteFont);

                    WriteCellStyle contentWriteCellStyle = new WriteCellStyle();
                    // 设置表格内容字体
                    WriteFont writeFont = new WriteFont();
                    writeFont.setFontHeightInPoints((short)6);
                    // 设置 水平居中
                    contentWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.LEFT);
                    // 设置 垂直居中
                    contentWriteCellStyle.setVerticalAlignment(VerticalAlignment.CENTER);
                    contentWriteCellStyle.setWriteFont(writeFont);

                    contentWriteCellStyle.setWrapped(true);
                    HorizontalCellStyleStrategy horizontalCellStyleStrategy =
                        new HorizontalCellStyleStrategy(headWriteCellStyle, contentWriteCellStyle);

                    excelWriter = EasyExcel.write(fileName).registerWriteHandler(horizontalCellStyleStrategy)
                        .registerWriteHandler(new CustemSecondhandler()).build();
                    WriteSheet writeSheet = EasyExcel.writerSheet("居家隔离统计表").head(headList).build();
                    excelWriter.write(datalist, writeSheet);
                    excelWriter.finish();
@@ -742,16 +983,17 @@
    @ApiOperation(value = "导出登记明细列表", response = ComActReserveRegisterDetailedVO.class)
    @PostMapping("/register/detailed/list/export")
    public R registerDetailedListExport(@RequestBody PageReserveRegisterDetailedAdminDTO detailedAdminDTO) {
        R r=communityService.registerDetailedListAdminExport(detailedAdminDTO);
        if(r.getData()!=null){
            List<ReservePdfExportVO> reservePdfExportVOS = (List<ReservePdfExportVO>) r.getData();
            if(!reservePdfExportVOS.isEmpty()&&reservePdfExportVOS.size()<=100){
                String name="承诺书.pdf";
        R r = communityService.registerDetailedListAdminExport(detailedAdminDTO);
        if (r.getData() != null) {
            List<ReservePdfExportVO> reservePdfExportVOS = (List<ReservePdfExportVO>)r.getData();
            if (!reservePdfExportVOS.isEmpty() && reservePdfExportVOS.size() <= 100) {
                String name = "承诺书.pdf";
                String uuid = UUID.randomUUID().toString().replace("-", "");
                String ftpUrl = "/mnt/data/web/excel/"+uuid+"/";
                SFTPUtil sftp = new SFTPUtil(sftpConfig.getUserName(), sftpConfig.getPassword(), sftpConfig.getHost(), sftpConfig.getPort());
                String ftpUrl = "/mnt/data/web/excel/" + uuid + "/";
                SFTPUtil sftp = new SFTPUtil(sftpConfig.getUserName(), sftpConfig.getPassword(), sftpConfig.getHost(),
                    sftpConfig.getPort());
                sftp.login();
                boolean existDir = sftp.isExistDir(ftpUrl +name);
                boolean existDir = sftp.isExistDir(ftpUrl + name);
                if (!existDir) {
                    String property = System.getProperty("user.dir");
                    String fileName = property + File.separator + name;
@@ -759,13 +1001,13 @@
                    model.put("reservePdfExportVOS", reservePdfExportVOS);
                    Context ctx = new Context();
                    ctx.setVariables(model);
                    String htmlcontext =null;
                    if(detailedAdminDTO.getPdfType()==1){
                        htmlcontext=templateEngine.process("/gasSafety", ctx);
                    String htmlcontext = null;
                    if (detailedAdminDTO.getPdfType() == 1) {
                        htmlcontext = templateEngine.process("/gasSafety", ctx);
                    }
                    if(detailedAdminDTO.getPdfType()==2){
                        htmlcontext=templateEngine.process("/forestFire", ctx);
                     }
                    if (detailedAdminDTO.getPdfType() == 2) {
                        htmlcontext = templateEngine.process("/forestFire", ctx);
                    }
                    InputStream inputStream = null;
                    try {
                        HtmlToPdfUtil.topdf(htmlcontext, fileName);
@@ -790,10 +1032,10 @@
                        }
                    }
                }
                return R.ok(sftpConfig.getExcelUrl() +uuid+ "/" + name);
                return R.ok(sftpConfig.getExcelUrl() + uuid + "/" + name);
            }
        }
        return R.ok(null,"当前数据量太大，请根据筛选条件优化到100条以内");
        return R.ok(null, "当前数据量太大，请根据筛选条件优化到100条以内");
    }

    @ApiOperation(value = "查询登记明细详情", response = ComActReserveRegisterDetailedVO.class)
@@ -804,7 +1046,7 @@

    @ApiOperation("对外用户提交数据")
    @PostMapping("/commit/noToken")
    public R commitNoToken(@RequestBody ComActReserveCommitVO comActReserveCommitVO){
    public R commitNoToken(@RequestBody ComActReserveCommitVO comActReserveCommitVO) {
        return communityService.reserveCommitNoToken(comActReserveCommitVO);
    }

@@ -816,7 +1058,7 @@

    @ApiOperation(value = "删除预约登记记录")
    @GetMapping("/record/delete")
    public R deleteRecord(@RequestParam("recordId")Long recordId){
    public R deleteRecord(@RequestParam("recordId") Long recordId) {
        return communityService.deleteRecord(recordId);
    }
}

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

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


import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.ComActSocialMemberVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.social.ComActSocialProjectMemberVO;
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;

/**
 * 社会组织成员表(ComActSocialMember)表控制层
 *
 * @author makejava
 * @since 2021-10-22 09:52:47
 */
@Slf4j
@Api(tags = {"社会组织成员"})
@RestController
@RequestMapping("comActSocialMember")
public class ComActSocialMemberApi extends BaseController {
    /**
     * 服务对象
     */
    @Resource
    private CommunityService communityService;

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @ApiOperation(value = "分页查询所有数据",response = ComActSocialMemberVO.class)
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        return this.communityService.comActSocialMemberSelectAll(commonPage);
    }

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @ApiOperation("详情")
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Long id) {
        return this.communityService.comActSocialMemberSelectOne(id);
    }

    /**
     * 新增数据
     *
     * @param comActSocialMember 实体对象
     * @return 新增结果
     */
    @ApiOperation("新增数据")
    @PostMapping
    public R insert(@RequestBody ComActSocialMemberVO comActSocialMember) {
        return this.communityService.comActSocialMemberInsert(comActSocialMember);
    }
    /**
     * 修改数据
     *
     * @param comActSocialMember 实体对象
     * @return 修改结果
     */
    @ApiOperation("修改数据")
    @PostMapping("/update")
    public R update(@RequestBody ComActSocialMemberVO comActSocialMember) {
        return this.communityService.comActSocialMemberUpdate(comActSocialMember);
    }

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @ApiOperation("删除数据")
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return this.communityService.comActSocialMemberDelete(id);
    }
}

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

@@ -32,9 +32,37 @@
    @ApiOperation(value = "社会组织列表",response = ComActSocialOrgVO.class)
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        commonPage.setParamId(this.getCommunityId());
        if(this.getLoginUserInfo().getCommunityId()!=null){
            commonPage.setParamId(this.getCommunityId());
        }
        if(this.getLoginUserInfo().getStreetId()!=null){
            commonPage.setStreetId(this.getLoginUserInfo().getStreetId());
        }
        return this.communityService.comActSocialOrgSelectAll(commonPage);
    }

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @ApiOperation("通过主键查询单条数据")
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Long id){
        return this.communityService.comActSocialOrgSelectOne(id);
    }

    /**
     * 通过userId查询
     * @return 单条数据
     */
    @ApiOperation("通过userId查询单条数据")
    @GetMapping("/selectByUserId")
    public R selectOneByUserId() {
        return communityService.selectOneByUserId(this.getUserId());
    }

    /**
     * 新增数据
     *
@@ -44,7 +72,12 @@
    @ApiOperation("新增社会组织")
    @PostMapping
    public R insert(@RequestBody ComActSocialOrgVO comActSocialOrg) {
        comActSocialOrg.setCommunityId(this.getCommunityId());
        if(this.getLoginUserInfo().getCommunityId()!=null){
            comActSocialOrg.setCommunityId(this.getLoginUserInfo().getCommunityId());
        }
        if(this.getLoginUserInfo().getStreetId()!=null){
            comActSocialOrg.setStreetId(this.getLoginUserInfo().getStreetId());
        }
        return this.communityService.comActSocialOrgInsert(comActSocialOrg);
    }


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

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


import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.social.SocialProjectVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.StringUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;

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

/**
 * 三社联动项目表(ComActSocialProject)表控制层
 *
 * @author zzj
 * @since 2021-12-22 14:02:48
 */
@Slf4j
@Api(tags = {"项目管理"})
@RestController
@RequestMapping("comActSocialProject")
public class ComActSocialProjectApi extends BaseController {
    /**
     * 服务对象
     */
    @Resource
    private CommunityService communityService;

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @ApiOperation(value = "分页查询接口",response =SocialProjectVO.class )
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        if(this.getLoginUserInfo().getStreetId()!=null){
            commonPage.setStreetId(this.getLoginUserInfo().getStreetId());
        }
        else {
            commonPage.setCommunityId(this.getCommunityId());
        }
        return communityService.selectAllComActSocialProject(commonPage);
    }

    /**
     * 平台详情接口
     *
     * @param id 主键
     * @return 单条数据
     */
    @ApiOperation(value = "平台详情接口",response =SocialProjectVO.class )
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Long id) {
        return communityService.getAppletComActSocialProject(id);
    }
    /**
     * 根据项目id分页获取关联项目
     */
    @ApiOperation(value = "根据项目id分页获取关联项目")
    @PostMapping("/getRelation")
    public R getRelation(@RequestBody CommonPage commonPage){
        return communityService.getRelationComActSocialProject(commonPage);
    }

    /**
     * 新增数据
     *
     * @param socialProjectVO 实体对象
     * @return 新增结果
     */
    @ApiOperation(value = "新增数据")
    @PostMapping
    public R insert(@RequestBody SocialProjectVO socialProjectVO) {
        if(this.getLoginUserInfo().getStreetId()!=null){
            socialProjectVO.setStreetId(this.getLoginUserInfo().getStreetId());
        }
        else {
            socialProjectVO.setCommunityId(this.getCommunityId());
        }
        if(StringUtils.isNotEmpty(socialProjectVO.getResponsibility())){
            socialProjectVO.setStatus(3);
        }
        return communityService.insertComActSocialProject(socialProjectVO);
    }

    /**
     * 修改数据
     *
     * @param socialProjectVO 实体对象
     * @return 修改结果
     */
    @ApiOperation(value = "修改数据")
    @PostMapping("/update")
    public R update(@RequestBody SocialProjectVO socialProjectVO) {
        if(StringUtils.isNotEmpty(socialProjectVO.getResponsibility())){
            socialProjectVO.setStatus(3);
        }
        return communityService.updateComActSocialProject(socialProjectVO);
    }

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @ApiOperation(value = "删除数据")
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return communityService.deleteComActSocialProject(id);
    }

}

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

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


import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.social.ComActSocialProjectMemberVO;
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.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

/**
 * 项目人员(ComActSocialProjectMember)表控制层
 *
 * @author makejava
 * @since 2021-12-23 15:16:43
 */
@Slf4j
@Api(tags = {"项目成员管理"})
@RestController
@RequestMapping("comActSocialProjectMember")
public class ComActSocialProjectMemberApi extends BaseController {
    /**
     * 服务对象
     */
    @Resource
    private CommunityService communityService;

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @ApiOperation("分页查询所有数据")
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        return communityService.selectAllComActSocialProjectMember(commonPage);
    }

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @ApiOperation("通过主键查询单条数据")
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Long id) {
        return communityService.selectOneComActSocialProjectMember(id);
    }

    /**
     * 新增数据
     *
     * @param comActSocialProjectMemberVO 实体对象
     * @return 新增结果
     */
    @ApiOperation("新增数据")
    @PostMapping
    public R insert(@RequestBody ComActSocialProjectMemberVO comActSocialProjectMemberVO) {
        return communityService.insertComActSocialProjectMember(comActSocialProjectMemberVO);
    }
    /**
     * 批量新增数据
     *
     * @param comActSocialMember 实体对象
     * @return 新增结果
     */
    @ApiOperation("批量新增数据")
    @PostMapping("/batch")
    public R insertBatch(@RequestBody ComActSocialProjectMemberVO comActSocialMember) {
        return this.communityService.comActSocialMemberInsertBatch(comActSocialMember);
    }

    /**
     * 修改数据
     *
     * @param comActSocialProjectMemberVO 实体对象
     * @return 修改结果
     */
    @ApiOperation("修改数据")
    @PostMapping("/update")
    public R update(@RequestBody ComActSocialProjectMemberVO comActSocialProjectMemberVO) {
        return communityService.updateComActSocialProjectMember(comActSocialProjectMemberVO);
    }

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @ApiOperation("删除")
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return communityService.deleteComActSocialProjectMember(id);
    }
}

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

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


import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.social.ComActSocialProjectPublicityVO;
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.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;

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

/**
 * 项目宣传表(ComActSocialProjectPublicity)表控制层
 *
 * @author makejava
 * @since 2021-12-23 14:30:55
 */
@Slf4j
@Api(tags = {"项目宣传管理"})
@RestController
@RequestMapping("comActSocialProjectPublicity")
public class ComActSocialProjectPublicityApi {
    /**
     * 服务对象
     */
    @Resource
    private CommunityService communityService;

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @ApiOperation(value = "分页查询",response = ComActSocialProjectPublicityVO.class)
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        return communityService.selectAllComActSocialProjectPublicity(commonPage);
    }

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @ApiOperation("通过主键查询单条数据")
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Long id) {
        return communityService.selectOneComActSocialProjectPublicity(id);
    }

    /**
     * 新增数据
     *
     * @param comActSocialProjectPublicityVO 实体对象
     * @return 新增结果
     */
    @ApiOperation("新增数据")
    @PostMapping
    public R insert(@RequestBody ComActSocialProjectPublicityVO comActSocialProjectPublicityVO) {
        return communityService.insertComActSocialProjectPublicity(comActSocialProjectPublicityVO);
    }

    /**
     * 修改数据
     *
     * @param comActSocialProjectPublicityVO 实体对象
     * @return 修改结果
     */
    @ApiOperation("修改数据")
    @PostMapping("/update")
    public R update(@RequestBody ComActSocialProjectPublicityVO comActSocialProjectPublicityVO) {
        return communityService.updateComActSocialProjectPublicity(comActSocialProjectPublicityVO);
    }

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @ApiOperation("删除数据")
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return communityService.deleteComActSocialProjectPublicity(id);
    }
    /**
     * 多条删除数据
     *
     * @param ids 主键结合
     * @return 删除结果
     */
    @ApiOperation("多条删除数据")
    @PostMapping("delBatch")
    public R delBatch(@RequestBody List<Long> ids) {
        return communityService.delBatchComActSocialProjectPublicity(ids);
    }
}

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

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


import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.social.ComActSocialProjectScheduleVO;
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.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;

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

/**
 * 项目进度表(ComActSocialProjectSchedule)表控制层
 *
 * @author makejava
 * @since 2021-12-23 14:31:16
 */
@Slf4j
@Api(tags = {"项目进度管理"})
@RestController
@RequestMapping("comActSocialProjectSchedule")
public class ComActSocialProjectScheduleApi {
    /**
     * 服务对象
     */
    @Resource
    private CommunityService communityService;

    /**
     * 根据projectId查询所有进度
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @ApiOperation("分页查询")
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        return communityService.selectAllComActSocialProjectSchedule(commonPage);
    }

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @ApiOperation("通过主键查询单条数据")
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Long id) {
        return communityService.selectOneComActSocialProjectSchedule(id);
    }

    /**
     * 新增数据
     *
     * @param comActSocialProjectScheduleVO 实体对象
     * @return 新增结果
     */
    @ApiOperation("新增数据")
    @PostMapping
    public R insert(@RequestBody ComActSocialProjectScheduleVO comActSocialProjectScheduleVO) {
        return communityService.insertComActSocialProjectSchedule(comActSocialProjectScheduleVO);
    }

    /**
     * 修改数据
     *
     * @param comActSocialProjectScheduleVO 实体对象
     * @return 修改结果
     */
    @ApiOperation("修改数据")
    @PostMapping("/update")
    public R update(@RequestBody ComActSocialProjectScheduleVO comActSocialProjectScheduleVO) {
        return communityService.updateComActSocialProjectSchedule(comActSocialProjectScheduleVO);
    }

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @ApiOperation("删除数据")
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return communityService.deleteComActSocialProjectSchedule(id);
    }
}

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

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

import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.ExcelWriter;
import com.alibaba.excel.write.metadata.WriteSheet;
import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
import com.alibaba.fastjson.JSONArray;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.listen.ComActSocialWorkerExcelListen;
import com.panzhihua.common.listen.ComCvtServeExcelListen;
import com.panzhihua.common.model.dtos.civil.*;
import com.panzhihua.common.model.dtos.community.ExportUserDTO;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.dtos.user.EexcelUserDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.civil.ComActSocialWorkerDetailsVO;
import com.panzhihua.common.model.vos.civil.ComActSocialWorkerVO;
import com.panzhihua.common.model.vos.community.ComCvtServeExcelVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.ClazzUtils;
import com.panzhihua.common.utlis.SFTPUtil;
import com.panzhihua.community_backstage.excel.CustomSheetWriteHandler;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.List;
import java.util.UUID;

/**
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-06-03
 * */
@Slf4j
@RestController
@RequestMapping("/comactsocialworker")
@Api(tags = {"社工"})
public class ComActSocialWorkerApi extends BaseController {

    @Resource
    private CommunityService communityService;

    @Value("${excel.comactsocialworkerUrl}")
    private String comactsocialworkerUrl;
    /**
     * 新增社工
     * @param {classNameFirstLower}AddDTO 添加社工传递对象
     * @return 新增结果
     */
    @PostMapping()
    @ApiOperation(value = "新增社工", response = R.class)
    R add(@Validated @RequestBody ComActSocialWorkerAddDTO comActSocialWorkerAddDTO){
        ClazzUtils.setIfStringIsEmpty(comActSocialWorkerAddDTO);
        comActSocialWorkerAddDTO.setUserId(getUserId());
        comActSocialWorkerAddDTO.setCommunityId(getCommunityId());
        return communityService.addComactsocialworker(comActSocialWorkerAddDTO);
    }

    /**
     * 修改
     * @param comActSocialWorkerEditDTO 修改社工传递对象
     * @return 修改结果
     */
    @PutMapping()
    @ApiOperation(value = "编辑社工", response = R.class)
    R edit(@Validated @RequestBody ComActSocialWorkerEditDTO comActSocialWorkerEditDTO){
        comActSocialWorkerEditDTO.setUserId(getUserId());
        return communityService.editComactsocialworker(comActSocialWorkerEditDTO);
    }

    /**
     * 分页查找
     * @param pageComActSocialWorkerDTO 查找社工传递对象
     * @return 查找结果
     */
    @GetMapping()
    @ApiOperation(value = "查询社工", response= ComActSocialWorkerVO.class)
    R query(@Validated @ModelAttribute PageComActSocialWorkerDTO pageComActSocialWorkerDTO){
        if(this.getLoginUserInfo().getStreetId()!=null){
            pageComActSocialWorkerDTO.setStreetId(this.getLoginUserInfo().getStreetId().toString());
        }
        else {
            pageComActSocialWorkerDTO.setCommunityId(this.getCommunityId());
        }
        return communityService.queryComactsocialworker(pageComActSocialWorkerDTO);
    }

    /**
     * 删除
     * @param comActSocialWorkerDeleteDTO 删除社工传递对象
     * @return 删除结果
     */
    @DeleteMapping()
    @ApiOperation(value = "删除社工", response = R.class)
    R delete(@Validated @RequestBody ComActSocialWorkerDeleteDTO  comActSocialWorkerDeleteDTO){
        return communityService.deleteComactsocialworker(comActSocialWorkerDeleteDTO);
    }

    /**
     * 查询社工详细信息
     * @param id 社工 id
     * @return 查找结果
     */
    @GetMapping("/{id}")
    @ApiOperation(value = "查询社工详细信息")
    R<ComActSocialWorkerDetailsVO> details(@PathVariable("id") Long id){
        return communityService.comActSocialWorkerDetails(id);
    }

    /**
     * 导入社工名单
     * @return
     */
    @ApiOperation(value = "导入社工名单")
    @PostMapping(value = "/import", consumes = "multipart/*", headers = "content-type=multipart/form-data")
    public R downloadTemplate(@RequestParam MultipartFile file, HttpServletRequest request) {
        String fileName = file.getOriginalFilename();  //获取文件名
        log.info("传入文件名字【{}】",fileName);
        InputStream inputStream = null;
        try {
            inputStream = file.getInputStream();
            EasyExcel.read(inputStream, ComActSocialWorkerExcelVO.class, new ComActSocialWorkerExcelListen(communityService,this.getCommunityId())).sheet().doRead();
        } catch (IOException e) {
            e.printStackTrace();
            log.error("导入模板失败【{}】", e.getMessage());
            return R.fail("信息有误");
        }
        return R.ok();
    }


    @GetMapping("/getTemplate")
    @ApiOperation("获取模板")
    public R getTemplate(){
        return R.ok(comactsocialworkerUrl);
    }

    @ApiOperation("获取活动社工")
    @PostMapping("/activity")
    public R activity(@RequestBody CommonPage commonPage){
        return communityService.activity(commonPage);
    }
    @ApiOperation("根据社工获取活动")
    @PostMapping("/activityList")
    R activityList(@RequestBody CommonPage commonPage){
        return communityService.activityList(commonPage);
    }
}

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

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

import static java.util.Objects.isNull;
import static org.apache.commons.lang3.StringUtils.isNotBlank;

import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;

import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.data.redis.core.ValueOperations;
import org.springframework.web.bind.annotation.DeleteMapping;
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.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;

import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.ExcelWriter;
import com.alibaba.excel.write.metadata.WriteSheet;
import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
import com.alibaba.fastjson.JSONArray;
import com.panzhihua.common.constants.Constants;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.enums.PresetPictureType;
import com.panzhihua.common.listen.ComFmsServiceImportExcelListen;
import com.panzhihua.common.listen.ComFmsTeamMemberImportExcelListen;
import com.panzhihua.common.model.dtos.community.fms.AddFmsClassroomAdminDTO;
import com.panzhihua.common.model.dtos.community.fms.AddFmsServiceAdminDTO;
import com.panzhihua.common.model.dtos.community.fms.AddTeamDTO;
import com.panzhihua.common.model.dtos.community.fms.AddTeamMemberDTO;
import com.panzhihua.common.model.dtos.community.fms.AddTeamTypeDTO;
import com.panzhihua.common.model.dtos.community.fms.ApprovalFmsServiceAdminDTO;
import com.panzhihua.common.model.dtos.community.fms.DeleteTeamMemberDTO;
import com.panzhihua.common.model.dtos.community.fms.EditFmsClassroomAdminDTO;
import com.panzhihua.common.model.dtos.community.fms.EditTeamDTO;
import com.panzhihua.common.model.dtos.community.fms.EditTeamMemberDTO;
import com.panzhihua.common.model.dtos.community.fms.EditTeamTypeDTO;
import com.panzhihua.common.model.dtos.community.fms.PageFmsClassroomAdminDTO;
import com.panzhihua.common.model.dtos.community.fms.PageFmsEventAdminDTO;
import com.panzhihua.common.model.dtos.community.fms.PageFmsServiceAdminDTO;
import com.panzhihua.common.model.dtos.community.fms.PageTeamMemberDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActPictureLibraryVO;
import com.panzhihua.common.model.vos.community.fms.CascadeCommVO;
import com.panzhihua.common.model.vos.community.fms.ComFmsClassroomVO;
import com.panzhihua.common.model.vos.community.fms.ComFmsServiceImportMistakeExcelVO;
import com.panzhihua.common.model.vos.community.fms.ComFmsServiceVO;
import com.panzhihua.common.model.vos.community.fms.ComFmsTeamMemberExportExcelVO;
import com.panzhihua.common.model.vos.community.fms.ComFmsTeamMemberImportMistakeExcelVO;
import com.panzhihua.common.model.vos.community.fms.ComFmsTeamMemberVO;
import com.panzhihua.common.model.vos.community.fms.ComFmsTeamTypeVO;
import com.panzhihua.common.model.vos.community.fms.ComFmsTeamVO;
import com.panzhihua.common.model.vos.community.fms.FmsClassroomTopStatisticsVO;
import com.panzhihua.common.model.vos.community.fms.FmsEventTopStatisticsVO;
import com.panzhihua.common.model.vos.community.fms.FmsEventVO;
import com.panzhihua.common.model.vos.community.fms.FmsServiceTopStatisticsVO;
import com.panzhihua.common.model.vos.community.fms.TeamMemberTopStatisticsVO;
import com.panzhihua.common.model.vos.grid.EventDetailsVO;
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.SFTPUtil;
import com.panzhihua.common.utlis.ValidateUtils;
import com.panzhihua.community_backstage.excel.CustomSheetWriteHandler;

import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;

/**
 * @title: ComFmsApi
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 五微服务相关接口
 * @author: hans
 * @date: 2022/02/11 13:23
 */
@Slf4j
@Api(tags = {"五微服务"})
@RestController
@RequestMapping("/fms")
public class ComFmsApi extends BaseController {

    // FTP 登录用户名
    @Value("${ftp.username}")
    private String userName;
    // FTP 登录密码
    @Value("${ftp.password}")
    private String password;
    // FTP 服务器地址IP地址
    @Value("${ftp.host}")
    private String host;
    // FTP 端口
    @Value("${ftp.port}")
    private int port;
    @Value("${ftp.url}")
    private String url;
    @Value("${excel.userurl}")
    private String excelUrl;

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

    @ApiOperation("新增团队类型")
    @PostMapping("/teamType/add")
    public R addFmsTeamType(@RequestBody @Valid AddTeamTypeDTO addTeamTypeDTO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        addTeamTypeDTO.setCommunityId(loginUserInfo.getCommunityId());
        addTeamTypeDTO.setCreatedBy(loginUserInfo.getUserId());
        addTeamTypeDTO.setUpdatedBy(loginUserInfo.getUserId());
        return communityService.addFmsTeamType(addTeamTypeDTO);
    }

    @ApiOperation("修改团队类型")
    @PostMapping("/teamType/edit")
    public R editFmsTeamType(@RequestBody @Valid EditTeamTypeDTO editTeamTypeDTO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        editTeamTypeDTO.setCommunityId(loginUserInfo.getCommunityId());
        editTeamTypeDTO.setUpdatedBy(loginUserInfo.getUserId());
        return communityService.editFmsTeamType(editTeamTypeDTO);
    }

    @ApiOperation("删除团队类型")
    @ApiImplicitParam(name = "teamTypeId", value = "团队类型id", required = true)
    @DeleteMapping("/teamType/delete")
    public R deleteFmsTeamType(@RequestParam("teamTypeId") Long teamTypeId) {
        return communityService.deleteFmsTeamType(teamTypeId, this.getCommunityId());
    }

    @ApiOperation(value = "获取团队类型列表", response = ComFmsTeamTypeVO.class)
    @GetMapping("/teamType/list")
    public R listFmsTeamType() {
        return communityService.listFmsTeamType(this.getCommunityId());
    }

    @ApiOperation("新增团队")
    @PostMapping("/team/add")
    public R addFmsTeam(@RequestBody @Valid AddTeamDTO addTeamDTO) {
        if (isNotBlank(addTeamDTO.getPhone()) && !ValidateUtils.assertPhoneIsValid(addTeamDTO.getPhone())) {
            return R.fail("手机号格式错误");
        }
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        addTeamDTO.setCommunityId(loginUserInfo.getCommunityId());
        addTeamDTO.setCreatedBy(loginUserInfo.getUserId());
        addTeamDTO.setUpdatedBy(loginUserInfo.getUserId());
        return communityService.addFmsTeam(addTeamDTO);
    }

    @ApiOperation("修改团队信息")
    @PostMapping("/team/edit")
    public R editFmsTeam(@RequestBody @Valid EditTeamDTO editTeamDTO) {
        if (isNotBlank(editTeamDTO.getPhone()) && !ValidateUtils.assertPhoneIsValid(editTeamDTO.getPhone())) {
            return R.fail("手机号格式错误");
        }
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        editTeamDTO.setCommunityId(loginUserInfo.getCommunityId());
        editTeamDTO.setUpdatedBy(loginUserInfo.getUserId());
        return communityService.editFmsTeam(editTeamDTO);
    }

    @ApiOperation("删除团队")
    @ApiImplicitParam(name = "teamId", value = "团队id", required = true)
    @DeleteMapping("/team/delete")
    public R deleteFmsTeam(@RequestParam("teamId") Long teamId) {
        return communityService.deleteFmsTeam(teamId);
    }

    @ApiOperation(value = "获取团队列表", response = ComFmsTeamVO.class)
    @ApiImplicitParam(name = "teamTypeId", value = "团队类型id", required = true)
    @GetMapping("/team/list")
    public R listFmsTeam(@RequestParam("teamTypeId") Long teamTypeId) {
        return communityService.listFmsTeam(teamTypeId);
    }

    @ApiOperation(value = "获取团队详情", response = ComFmsTeamVO.class)
    @ApiImplicitParam(name = "teamId", value = "团队id", required = true)
    @GetMapping("/team/detail")
    public R detailFmsTeam(@RequestParam("teamId") Long teamId) {
        return communityService.detailFmsTeam(teamId);
    }


    @ApiOperation(value = "级联查询团队数据", response = CascadeCommVO.class)
    @GetMapping("/team/cascade")
    public R retrieveFmsTeamCascade() {
        return communityService.retrieveFmsTeamCascade(this.getCommunityId());
    }

    @ApiOperation("新增团队成员")
    @PostMapping("/teamMember/add")
    public R addFmsTeamMember(@RequestBody @Valid AddTeamMemberDTO addTeamMemberDTO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        addTeamMemberDTO.setCommunityId(loginUserInfo.getCommunityId());
        addTeamMemberDTO.setCreatedBy(loginUserInfo.getUserId());
        addTeamMemberDTO.setUpdatedBy(loginUserInfo.getUserId());
        return communityService.addFmsTeamMember(addTeamMemberDTO);
    }

    @ApiOperation("编辑团队成员")
    @PostMapping("/teamMember/edit")
    public R editFmsTeamMember(@RequestBody @Valid EditTeamMemberDTO editTeamMemberDTO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        editTeamMemberDTO.setCommunityId(loginUserInfo.getCommunityId());
        editTeamMemberDTO.setUpdatedBy(loginUserInfo.getUserId());
        return communityService.editFmsTeamMember(editTeamMemberDTO);
    }

    @ApiOperation("删除团队成员")
    @PostMapping("/teamMember/delete")
    public R deleteFmsTeamMember(@RequestBody @Valid DeleteTeamMemberDTO deleteTeamMemberDTO) {
        deleteTeamMemberDTO.setCommunityId(this.getCommunityId());
        return communityService.deleteFmsTeamMember(deleteTeamMemberDTO);
    }

    @ApiOperation(value = "分页查询团队成员", response = ComFmsTeamMemberVO.class)
    @PostMapping("/teamMember/page")
    public R pageFmsTeamMember(@RequestBody @Valid PageTeamMemberDTO pageTeamMemberDTO) {
        pageTeamMemberDTO.setCommunityId(this.getCommunityId());
        return communityService.pageFmsTeamMember(pageTeamMemberDTO);
    }

    @ApiOperation(value = "微团队顶部统计", response = TeamMemberTopStatisticsVO.class)
    @GetMapping("/teamMember/statistics")
    public R statisticsFmsTeamMember() {
        return communityService.statisticsFmsTeamMember(this.getCommunityId());
    }

    @ApiOperation(value = "下载团队成员导入模板")
    @GetMapping("/teamMember/template")
    public R getTeamMemberTemplate() {
        // 生成动态模板excel通过ftp工具上传到主节点，然后返回模板下载地址
        String ftpUrl = "/mnt/data/web/excel/";
        String name = "团队成员导入模板.xlsx";
        try {
            SFTPUtil sftp = new SFTPUtil(userName, password, host, port);
            sftp.login();
            boolean existDir = sftp.isExistDir(ftpUrl + name);
            if (!existDir) {
                String property = System.getProperty("user.dir");
                String fileName = property + File.separator + name;
                // 这里 需要指定写用哪个class去写
                ExcelWriter excelWriter = null;
                InputStream inputStream = null;
                try {
                    List<List<String>> list = new ArrayList<>();
                    list = headDataFilling();
                    EasyExcel.write(fileName).head(list).sheet("团队成员导入模板").doWrite(null);
                    File file = new File(fileName);
                    inputStream = new FileInputStream(file);
                    sftp.uploadMore(ftpUrl, name, inputStream);
                    sftp.logout();
                    inputStream.close();
                    String absolutePath = file.getAbsolutePath();
                    boolean delete = file.delete();
                    log.info("删除excel【{}】结果【{}】", absolutePath, delete);
                } finally {
                    // 千万别忘记finish 会帮忙关闭流
                    if (inputStream != null) {
                        inputStream.close();
                    }
                }
            }
            return R.ok(excelUrl + name);
        } catch (Exception e) {
            e.printStackTrace();
            log.error("文件传输失败【{}】", e.getMessage());
            return R.fail();
        }
    }

    @ApiOperation(value = "excel导入团队成员")
    @PostMapping(value = "/teamMember/import", consumes = "multipart/*", headers = "content-type=multipart/form-date")
    public R importTeamMember(@RequestParam MultipartFile file, HttpServletRequest request) {
        // 获取文件名
        String fileName = file.getOriginalFilename();
        log.info("传入文件名字【{}】", fileName);
        InputStream inputStream = null;
        try {
            inputStream = file.getInputStream();
            ComFmsTeamMemberImportExcelListen comFmsTeamMemberImportExcelListen = new ComFmsTeamMemberImportExcelListen(
                    communityService, this.getCommunityId(), this.getLoginUserInfo().getUserId(), stringRedisTemplate);
            EasyExcel.read(inputStream, null, comFmsTeamMemberImportExcelListen).sheet().doRead();
        } catch (IOException e) {
            log.error("导入失败【{}】", e.getMessage());
            e.printStackTrace();
        }
        return R.ok();
    }

    @ApiOperation(value = "导出团队成员")
    @PostMapping(value = "/teamMember/export")
    public R exportTeamMember(@RequestBody PageTeamMemberDTO pageTeamMemberDTO) {
        Long communityId = this.getLoginUserInfo().getCommunityId();
        pageTeamMemberDTO.setCommunityId(communityId);
        String ftpUrl = "/mnt/data/web/excel/";
        String nowDate = DateUtils.getCurrentDateString();
        String name = "团队成员导出数据" + nowDate + ".xlsx";
        try {
            SFTPUtil sftp = new SFTPUtil(userName, password, host, port);
            sftp.login();
            boolean existDir = sftp.isExistDir(ftpUrl + name);
            if (!existDir) {
                String property = System.getProperty("user.dir");
                String fileName = property + File.separator + name;
                // 这里 需要指定写用哪个class去写
                ExcelWriter excelWriter = null;
                InputStream inputStream = null;
                try {
                    R r = communityService.exportTeamMember(pageTeamMemberDTO);
                    List<ComFmsTeamMemberExportExcelVO> list = new ArrayList<>();
                    if (R.isOk(r)) {
                        list = JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComFmsTeamMemberExportExcelVO.class);
                    }
                    excelWriter = EasyExcel.write(fileName, ComFmsTeamMemberExportExcelVO.class)
                            .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                            .registerWriteHandler(new CustomSheetWriteHandler()).build();
                    WriteSheet writeSheet = EasyExcel.writerSheet("团队成员导出数据").build();
                    excelWriter.write(list, writeSheet);
                    excelWriter.finish();
                    File file = new File(fileName);
                    inputStream = new FileInputStream(file);
                    sftp.uploadMore(ftpUrl, name, inputStream);
                    sftp.logout();
                    inputStream.close();
                    String absolutePath = file.getAbsolutePath();
                    boolean delete = file.delete();
                    log.info("删除excel【{}】结果【{}】", absolutePath, delete);
                } finally {
                    // 千万别忘记finish 会帮忙关闭流
                    if (inputStream != null) {
                        inputStream.close();
                    }
                    if (excelWriter != null) {
                        excelWriter.finish();
                    }
                }
            }
            return R.ok(excelUrl + name);
        } catch (Exception e) {
            e.printStackTrace();
            log.error("文件传输失败【{}】", e.getMessage());
            return R.fail();
        }
    }

    @ApiOperation("后台新增微服务")
    @PostMapping("/service/add")
    public R addFmsService(@RequestBody @Valid AddFmsServiceAdminDTO adminDTO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        adminDTO.setCommunityId(loginUserInfo.getCommunityId());
        adminDTO.setCreatedBy(loginUserInfo.getUserId());
        adminDTO.setUpdatedBy(loginUserInfo.getUserId());
        return communityService.addFmsServiceAdmin(adminDTO);
    }

    @ApiOperation(value = "后台分页查询微服务", response = ComFmsServiceVO.class)
    @PostMapping("/service/page")
    public R pageFmsService(@RequestBody @Valid PageFmsServiceAdminDTO adminDTO) {
        adminDTO.setCommunityId(this.getCommunityId());
        return communityService.pageFmsServiceAdmin(adminDTO);
    }

    @ApiOperation("后台核实微服务")
    @PostMapping("/service/approval")
    public R approvalFmsService(@RequestBody @Valid ApprovalFmsServiceAdminDTO adminDTO) {
        if (adminDTO.getIsPass() && isNull(adminDTO.getMemberId())) {
            return R.fail("未分配服务人员");
        }
        adminDTO.setUpdatedBy(this.getUserId());
        return communityService.approvalFmsService(adminDTO);
    }

    @ApiOperation(value = "级联查询团队服务人员", response = CascadeCommVO.class)
    @GetMapping("/teamMember/cascade")
    public R retrieveFmsTeamMemberCascade() {
        return communityService.retrieveFmsTeamMemberCascade(this.getCommunityId());
    }

    @ApiOperation(value = "后台查看微服务详情", response = ComFmsServiceVO.class)
    @ApiImplicitParam(name = "serviceId", value = "服务id", required = true)
    @GetMapping("/service/detail")
    public R detailFmsService(@RequestParam("serviceId") Long serviceId) {
        return communityService.detailFmsServiceAdmin(serviceId);
    }

    @ApiOperation(value = "后台删除微服务")
    @ApiImplicitParam(name = "serviceId", value = "服务id", required = true)
    @DeleteMapping("/service/delete")
    public R deleteFmsService(@RequestParam("serviceId") Long serviceId) {
        return communityService.deleteFmsServiceAdmin(serviceId);
    }

    @ApiOperation(value = "微服务顶部统计", response = FmsServiceTopStatisticsVO.class)
    @GetMapping("/service/statistics")
    public R statisticsFmsService() {
        return communityService.statisticsFmsService(this.getCommunityId());
    }

    @ApiOperation(value = "下载微服务导入模板")
    @GetMapping("/service/template")
    public R getServiceTemplate() {
        // 生成动态模板excel通过ftp工具上传到主节点，然后返回模板下载地址
        String ftpUrl = "/mnt/data/web/excel/";
        String name = "微服务导入模板.xlsx";
        try {
            SFTPUtil sftp = new SFTPUtil(userName, password, host, port);
            sftp.login();
            boolean existDir = sftp.isExistDir(ftpUrl + name);
            if (!existDir) {
                String property = System.getProperty("user.dir");
                String fileName = property + File.separator + name;
                // 这里 需要指定写用哪个class去写
                ExcelWriter excelWriter = null;
                InputStream inputStream = null;
                try {
                    List<List<String>> list = new ArrayList<>();
                    list = fmsServiceHeadDataFilling();
                    EasyExcel.write(fileName).head(list).sheet("微服务导入模板").doWrite(null);
                    File file = new File(fileName);
                    inputStream = new FileInputStream(file);
                    sftp.uploadMore(ftpUrl, name, inputStream);
                    sftp.logout();
                    inputStream.close();
                    String absolutePath = file.getAbsolutePath();
                    boolean delete = file.delete();
                    log.info("删除excel【{}】结果【{}】", absolutePath, delete);
                } finally {
                    // 千万别忘记finish 会帮忙关闭流
                    if (inputStream != null) {
                        inputStream.close();
                    }
                }
            }
            return R.ok(excelUrl + name);
        } catch (Exception e) {
            e.printStackTrace();
            log.error("文件传输失败【{}】", e.getMessage());
            return R.fail();
        }
    }

    @ApiOperation(value = "excel导入微服务")
    @PostMapping(value = "/service/import", consumes = "multipart/*", headers = "content-type=multipart/form-date")
    public R importFmsService(@RequestParam MultipartFile file, HttpServletRequest request) {
        // 获取文件名
        String fileName = file.getOriginalFilename();
        log.info("传入文件名字【{}】", fileName);
        InputStream inputStream = null;
        try {
            inputStream = file.getInputStream();
            ComFmsServiceImportExcelListen fmsServiceImportExcelListen = new ComFmsServiceImportExcelListen(
                    communityService, this.getCommunityId(), this.getLoginUserInfo().getUserId(), stringRedisTemplate);
            EasyExcel.read(inputStream, null, fmsServiceImportExcelListen).sheet().doRead();
        } catch (IOException e) {
            log.error("导入失败【{}】", e.getMessage());
            e.printStackTrace();
        }
        return R.ok();
    }

    @ApiOperation("后台新增微讲堂")
    @PostMapping("/classroom/add")
    public R addFmsClassroom(@RequestBody @Valid AddFmsClassroomAdminDTO adminDTO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        adminDTO.setCommunityId(loginUserInfo.getCommunityId());
        adminDTO.setCreatedBy(loginUserInfo.getUserId());
        adminDTO.setUpdatedBy(loginUserInfo.getUserId());
        return communityService.addFmsClassroom(adminDTO);
    }

    @ApiOperation("后台编辑微讲堂")
    @PostMapping("/classroom/edit")
    public R editFmsClassroom(@RequestBody @Valid EditFmsClassroomAdminDTO adminDTO) {
        adminDTO.setUpdatedBy(this.getUserId());
        return communityService.editFmsClassroom(adminDTO);
    }

    @ApiOperation("后台删除微讲堂")
    @ApiImplicitParam(name = "id", value = "微讲堂id", required = true)
    @DeleteMapping("/classroom/delete")
    public R deleteFmsClassroom(@RequestParam("id") Long id) {
        return communityService.deleteFmsClassroom(id);
    }

    @ApiOperation(value = "后台获取微讲堂详情", response = ComFmsClassroomVO.class)
    @ApiImplicitParam(name = "id", value = "微讲堂id", required = true)
    @GetMapping("/classroom/detail")
    public R detailFmsClassroom(@RequestParam("id") Long id) {
        return communityService.detailFmsClassroom(id);
    }

    @ApiOperation(value = "后台分页查询微讲堂", response = ComFmsClassroomVO.class)
    @PostMapping("/classroom/page")
    public R pageFmsClassroom(@RequestBody @Valid PageFmsClassroomAdminDTO adminDTO) {
        adminDTO.setCommunityId(this.getCommunityId());
        return communityService.pageFmsClassroomAdmin(adminDTO);
    }

    @ApiOperation(value = "微讲堂顶部统计", response = FmsClassroomTopStatisticsVO.class)
    @GetMapping("/classroom/statistics")
    public R statisticsFmsClassroom() {
        return communityService.statisticsFmsClassroom(this.getCommunityId());
    }

    @ApiOperation(value = "获取预设图库",response = ComActPictureLibraryVO.class)
    @GetMapping("/picture/library")
    public R getPresetPictureLibrary() {
        return communityService.getPresetPictureLibrary(PresetPictureType.FMS_CLASSROOM, 0);
    }

    @ApiOperation(value = "后台分页查询微调节/微防控", response = FmsEventVO.class)
    @PostMapping("/event/page")
    public R pageFmsEvent(@RequestBody @Valid PageFmsEventAdminDTO adminDTO) {
        adminDTO.setCommunityId(this.getCommunityId());
        return communityService.pageFmsEvent(adminDTO);
    }

    @ApiOperation(value = "微调节/微防控顶部统计", response = FmsEventTopStatisticsVO.class)
    @ApiImplicitParam(name = "type", value = "查询类型（1.微调节数据2.微防控数）", required = true)
    @GetMapping("/event/statistics")
    public R statisticsFmsEvent(@RequestParam("type") Integer type) {
        return communityService.statisticsFmsEvent(type, this.getCommunityId());
    }

    @ApiOperation(value = "微调节/微防控事件详情", response = EventDetailsVO.class)
    @ApiImplicitParam(name = "eventId", value = "事件id", required = true)
    @GetMapping("/event/detail")
    public R detailFmsEvent(@RequestParam("eventId") Long eventId) {
        return gridService.eventDetails(eventId);
    }

    @ApiOperation(value = "下载导入错误数据")
    @PostMapping("/download/import/error")
    public R downloadErrorAuthRecord(@RequestParam(value = "key") String key) {
        String baseName = "导入错误数据";
        Class clazz = null;
        if (key.contains(Constants.FMS_MEMBER_ERROR_LIST)) {
            baseName = "团队成员导入错误数据";
            clazz = ComFmsTeamMemberImportMistakeExcelVO.class;
        } else if (key.contains(Constants.FMS_SERVICE_ERROR_LIST)) {
            baseName = "微服务导入错误数据";
            clazz = ComFmsServiceImportMistakeExcelVO.class;
        }
        List list = new ArrayList<>();
        Boolean isExits = stringRedisTemplate.hasKey(key);
        ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
        if (isExits) {
            String json = valueOperations.get(key);
            list = JSONArray.parseArray(json, clazz);
        }
        String ftpUrl = "/mnt/data/web/excel/";
        String nowDate = DateUtils.getCurrentDateString();
        String name = baseName + nowDate + ".xlsx";
        try {
            SFTPUtil sftp = new SFTPUtil(userName, password, host, port);
            sftp.login();
            boolean existDir = sftp.isExistDir(ftpUrl + name);
            if (!existDir) {
                String property = System.getProperty("user.dir");
                String fileName = property + File.separator + name;
                // 这里 需要指定写用哪个class去写
                ExcelWriter excelWriter = null;
                InputStream inputStream = null;
                try {
                    excelWriter = EasyExcel.write(fileName, clazz)
                            .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                            .registerWriteHandler(new CustomSheetWriteHandler()).build();
                    WriteSheet writeSheet = EasyExcel.writerSheet(baseName).build();
                    excelWriter.write(list, writeSheet);
                    excelWriter.finish();
                    File file = new File(fileName);
                    inputStream = new FileInputStream(file);
                    sftp.uploadMore(ftpUrl, name, inputStream);
                    sftp.logout();
                    inputStream.close();
                    String absolutePath = file.getAbsolutePath();
                    boolean delete = file.delete();
                    log.info("删除excel【{}】结果【{}】", absolutePath, delete);
                } finally {
                    // 千万别忘记finish 会帮忙关闭流
                    if (inputStream != null) {
                        inputStream.close();
                    }
                    if (excelWriter != null) {
                        excelWriter.finish();
                    }
                }
            }
            return R.ok(excelUrl + name);
        } catch (Exception e) {
            e.printStackTrace();
            log.error("文件传输失败【{}】", e.getMessage());
            return R.fail();
        }
    }

    @ApiOperation(value = "手动触发微服务自动评价定时任务")
    @PostMapping("/service/timeJob")
    public R timeJobFmsService() {
        return communityService.timedTaskFmsServiceDefaultPraise();
    }

    /**
     * 表头构建
     * @return  表头数据
     */
    private List<List<String>> headDataFilling() {
        List<List<String>> list = new ArrayList<List<String>>();
        List<String> head0 = new ArrayList<String>();
        head0.add("团队类型");
        List<String> head1 = new ArrayList<String>();
        head1.add("团队名称");
        List<String> head2 = new ArrayList<String>();
        head2.add("团队成员");
        List<String> head3 = new ArrayList<String>();
        head3.add("身份证号（非必填）");
        List<String> head4 = new ArrayList<String>();
        head4.add("联系电话");
        list.add(head0);
        list.add(head1);
        list.add(head2);
        list.add(head3);
        list.add(head4);
        return list;
    }

    private List<List<String>> fmsServiceHeadDataFilling() {
        List<List<String>> list = new ArrayList<List<String>>();
        List<String> head0 = new ArrayList<String>();
        head0.add("服务用户");
        List<String> head1 = new ArrayList<String>();
        head1.add("联系电话");
        List<String> head2 = new ArrayList<String>();
        head2.add("服务时间");
        List<String> head3 = new ArrayList<String>();
        head3.add("服务内容");
        List<String> head4 = new ArrayList<String>();
        head4.add("服务过程");
        list.add(head0);
        list.add(head1);
        list.add(head2);
        list.add(head3);
        list.add(head4);
        return list;
    }
}

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

@@ -20,6 +20,7 @@
import javax.annotation.Resource;
import javax.validation.Valid;

import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.community.ComActActivityTypeVO;
import com.panzhihua.common.model.vos.user.SysTemplateConfigVO;
import io.swagger.annotations.ApiImplicitParams;
@@ -48,18 +49,6 @@
import com.panzhihua.common.model.dtos.community.integral.admin.AddComActIntegralUserDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ActivitySignVO;
import com.panzhihua.common.model.vos.community.ComActActEvaluateExcelVO;
import com.panzhihua.common.model.vos.community.ComActActEvaluateVO;
import com.panzhihua.common.model.vos.community.ComActActPictureVO;
import com.panzhihua.common.model.vos.community.ComActActRegistExcelVO;
import com.panzhihua.common.model.vos.community.ComActActRegistVO;
import com.panzhihua.common.model.vos.community.ComActActSignExcelVO;
import com.panzhihua.common.model.vos.community.ComActActivityStatisticsVO;
import com.panzhihua.common.model.vos.community.ComActActivityVO;
import com.panzhihua.common.model.vos.community.ComActDynVO;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
import com.panzhihua.common.model.vos.community.ComActMicroWishVO;
import com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoClassifyVO;
import com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoStatisticsVO;
import com.panzhihua.common.model.vos.community.easyPhoto.ExportEasyPhotoVO;
@@ -131,20 +120,6 @@
    @ApiOperation(value = "新增社区活动")
    @PostMapping("activity")
    public R addActivity(@RequestBody @Validated(AddGroup.class) ComActActivityVO comActActivityVO) {
        if (comActActivityVO.getHaveIntegralReward().intValue() == 1) {
            if (isNull(comActActivityVO.getRewardWay())) {
                return R.fail("奖励方式不能为空");
            }
            if (isNull(comActActivityVO.getRewardIntegral())) {
                return R.fail("奖励积分不能为空");
            }
            if (comActActivityVO.getRewardWay().intValue() == 1 && isNull(comActActivityVO.getLimit())) {
                return R.fail("参与次数上限不能为空");
            }
        }
        if(nonNull(comActActivityVO.getVolunteerMax()) && comActActivityVO.getVolunteerMax().intValue() == 0) {
            return R.fail("志愿者参与上限不能为0");
        }
        Long communityId = this.getCommunityId();
        comActActivityVO.setCommunityId(communityId);
        comActActivityVO.setUserId(this.getLoginUserInfo().getUserId());
@@ -1125,4 +1100,16 @@
        }
        return communityService.listActivityType(communityId, type);
    }


    /**
     * 党员活动统计
     * @param year
     * @return
     */
    @ApiOperation(value = "党员活动统计",response = PartyActivityStatics.class)
    @GetMapping("activity/partyMemberCount")
    public R partyMemberCount(@RequestParam("year")String year){
        return communityService.partyMemberCount(this.getCommunityId(),year);
    }
}

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

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

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.PageComStreetDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComStreetVO;
import com.panzhihua.common.model.vos.user.AdministratorsUserVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.user.UserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

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

/**
 * @description: 街道管理
 * @author: llming
 **/
@Api(tags = {"街道管理"})
@RestController
@RequestMapping("/streetmanager/")
public class StreetApi extends BaseController {
    @Resource
    private CommunityService communityService;

    @ApiOperation(value = "分页查询街道", response = PageComStreetDTO.class)
    @PostMapping("pagestreet")
    public R pageStreet(@RequestBody PageComStreetDTO pageComStreetDTO) {
        return communityService.pageStreet(pageComStreetDTO);
    }

}

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

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

import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.ExcelWriter;
import com.alibaba.excel.write.metadata.WriteSheet;
import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
import com.alibaba.fastjson.JSONArray;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.listen.ComMngVolunteerExcelListen;
import com.panzhihua.common.model.dtos.common.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.common.ComMngVolunteerOrgTeamVo;
import com.panzhihua.common.model.vos.common.ComMngVolunteerServiceTypeVo;
import com.panzhihua.common.model.vos.common.ComMngVolunteerSkillVo;
import com.panzhihua.common.model.vos.common.ComMngVolunteerStatisticsVo;
import com.panzhihua.common.model.vos.community.volunteer.ComMngVolunteerErrorExcelVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.common.utlis.SFTPUtil;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.community_backstage.config.SFTPConfig;
import com.panzhihua.community_backstage.excel.CustomSheetWriteHandler;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.data.redis.core.ValueOperations;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;

/**
 * @author lyq
 * 志愿者模块
 */
@Slf4j
@Api(tags = {"志愿者模块"})
@RestController
@RequestMapping("/volunteer/")
public class VolunteerApi extends BaseController {

    @Resource
    private CommunityService communityService;
    @Resource
    private SFTPConfig sftpConfig;
    @Resource
    private StringRedisTemplate stringRedisTemplate;

    @ApiOperation(value = "分页查询志愿者组织", response = ComMngVolunteerOrgTeamVo.class)
    @PostMapping("/org/page")
    public R pageVolunteerOrgAdmin(@RequestBody PageComMngVolunteerOrgTeamDto orgTeamDto) {
        orgTeamDto.setParentId(0L);
        orgTeamDto.setCommunityId(this.getCommunityId());
        return communityService.pageVolunteerOrgAdmin(orgTeamDto);
    }

    @ApiOperation(value = "查询志愿者组织列表", response = ComMngVolunteerOrgTeamVo.class)
    @GetMapping("/org/list")
    public R listVolunteerOrgAdmin() {
        PageComMngVolunteerOrgTeamDto orgTeamDto = new PageComMngVolunteerOrgTeamDto();
        orgTeamDto.setParentId(0L);
        orgTeamDto.setCommunityId(this.getCommunityId());
        return communityService.listVolunteerOrgAdmin(orgTeamDto);
    }

    @ApiOperation(value = "分页查询志愿者组织下队伍列表", response = ComMngVolunteerOrgTeamVo.class)
    @PostMapping("/org/team/page")
    public R pageVolunteerOrgTeamAdmin(@RequestBody PageComMngVolunteerOrgTeamDto orgTeamDto) {
        orgTeamDto.setCommunityId(this.getCommunityId());
        return communityService.pageVolunteerOrgAdmin(orgTeamDto);
    }

    @ApiOperation(value = "新增志愿者组织")
    @PostMapping("/org/add")
    public R addVolunteerOrgAdmin(@RequestBody AddComMngVolunteerOrgTeamDto orgTeamDto) {
        if(StringUtils.isEmpty(orgTeamDto.getName())){
            return R.fail("参数错误");
        }
        orgTeamDto.setParentId(0L);
        orgTeamDto.setCommunityId(this.getCommunityId());
        return communityService.addVolunteerOrgAdmin(orgTeamDto);
    }

    @ApiOperation(value = "新增志愿者队伍")
    @PostMapping("/org/team/add")
    public R addVolunteerOrgTeamAdmin(@RequestBody AddComMngVolunteerOrgTeamDto orgTeamDto) {
        if(orgTeamDto.getParentId() == null || orgTeamDto.getServiceTypeId() == null || StringUtils.isEmpty(orgTeamDto.getName())){
            return R.fail("参数错误");
        }
        orgTeamDto.setCommunityId(this.getCommunityId());
        return communityService.addVolunteerOrgAdmin(orgTeamDto);
    }

    @ApiOperation(value = "编辑志愿者组织")
    @PostMapping("/org/edit")
    public R editVolunteerOrgAdmin(@RequestBody EditComMngVolunteerOrgTeamDto orgTeamDto) {
        if(StringUtils.isEmpty(orgTeamDto.getName()) || orgTeamDto.getId() == null){
            return R.fail("参数错误");
        }
        return communityService.editVolunteerOrgAdmin(orgTeamDto);
    }

    @ApiOperation(value = "编辑志愿者队伍")
    @PostMapping("/org/team/edit")
    public R editVolunteerOrgTeamAdmin(@RequestBody EditComMngVolunteerOrgTeamDto orgTeamDto) {
        if(orgTeamDto.getId() == null){
            return R.fail("参数错误");
        }
        return communityService.editVolunteerOrgAdmin(orgTeamDto);
    }

    @ApiOperation(value = "删除志愿者组织/队伍")
    @GetMapping("/org/delete")
    public R deleteVolunteerOrgAdmin(@RequestParam("id") Long id) {
        if(id == null){
            return R.fail("参数错误");
        }
        return communityService.deleteVolunteerOrgAdmin(id);
    }

    @ApiOperation(value = "分页查询服务类型", response = ComMngVolunteerOrgTeamVo.class)
    @PostMapping("/service/type/page")
    public R pageServiceTypeAdmin(@RequestBody PageComMngVolunteerServiceTypeDto serviceTypeDto) {
        serviceTypeDto.setCommunityId(this.getCommunityId());
        return communityService.pageServiceTypeAdmin(serviceTypeDto);
    }

    @ApiOperation(value = "新增服务类型")
    @PostMapping("/service/type/add")
    public R addServiceTypeAdmin(@RequestBody AddComMngVolunteerServiceTypeDto serviceTypeDto) {
        if(StringUtils.isEmpty(serviceTypeDto.getName())){
            return R.fail("参数错误");
        }
        serviceTypeDto.setCommunityId(this.getCommunityId());
        serviceTypeDto.setUserId(this.getUserId());
        return communityService.addServiceTypeAdmin(serviceTypeDto);
    }

    @ApiOperation(value = "编辑服务类型")
    @PostMapping("/service/type/edit")
    public R editServiceTypeAdmin(@RequestBody EditComMngVolunteerServiceTypeDto serviceTypeDto) {
        if(StringUtils.isEmpty(serviceTypeDto.getName()) || serviceTypeDto.getId() == null){
            return R.fail("参数错误");
        }
        serviceTypeDto.setUserId(this.getUserId());
        return communityService.editServiceTypeAdmin(serviceTypeDto);
    }

    @ApiOperation(value = "删除志愿者组织/队伍")
    @GetMapping("/service/type/delete")
    public R deleteServiceTypeAdmin(@RequestParam("id") Long id) {
        if(id == null){
            return R.fail("参数错误");
        }
        return communityService.deleteServiceTypeAdmin(id);
    }

    @ApiOperation(value = "分页查询志愿者技能列表", response = ComMngVolunteerSkillVo.class)
    @PostMapping("/skill/page")
    public R pageVolunteerSkillAdmin(@RequestBody PageComMngVolunteerSkillDto volunteerSkillDto) {
        volunteerSkillDto.setCommunityId(this.getCommunityId());
        return communityService.pageVolunteerSkillAdmin(volunteerSkillDto);
    }

    @ApiOperation(value = "新增志愿者技能列表")
    @PostMapping("/skill/add")
    public R addVolunteerSkillAdmin(@RequestBody AddComMngVolunteerSkillDto volunteerSkillDto) {
        if(StringUtils.isEmpty(volunteerSkillDto.getName())){
            return R.fail("参数错误");
        }
        volunteerSkillDto.setCommunityId(this.getCommunityId());
        volunteerSkillDto.setUserId(this.getUserId());
        return communityService.addVolunteerSkillAdmin(volunteerSkillDto);
    }

    @ApiOperation(value = "编辑志愿者技能列表")
    @PostMapping("/skill/edit")
    public R editVolunteerSkillAdmin(@RequestBody EditComMngVolunteerSkillDto volunteerSkillDto) {
        if(StringUtils.isEmpty(volunteerSkillDto.getName()) || volunteerSkillDto.getId() == null){
            return R.fail("参数错误");
        }
        volunteerSkillDto.setUserId(this.getUserId());
        return communityService.editVolunteerSkillAdmin(volunteerSkillDto);
    }

    @ApiOperation(value = "删除志愿者技能列表")
    @GetMapping("/skill/delete")
    public R deleteVolunteerSkillAdmin(@RequestParam("id") Long id) {
        if(id == null){
            return R.fail("参数错误");
        }
        return communityService.deleteVolunteerSkillAdmin(id);
    }

    @ApiOperation(value = "查询志愿者服务类型列表", response = ComMngVolunteerServiceTypeVo.class)
    @GetMapping("/service/type/list")
    public R listVolunteerServiceTypeAdmin() {
        PageComMngVolunteerServiceTypeDto serviceTypeDto = new PageComMngVolunteerServiceTypeDto();
        serviceTypeDto.setCommunityId(this.getCommunityId());
        return communityService.listServiceTypeAdmin(serviceTypeDto);
    }

    @ApiOperation(value = "查询志愿者技能列表", response = ComMngVolunteerSkillVo.class)
    @GetMapping("/skill/list")
    public R listVolunteerSkillAdmin() {
        PageComMngVolunteerSkillDto volunteerSkillDto = new PageComMngVolunteerSkillDto();
        volunteerSkillDto.setCommunityId(this.getCommunityId());
        return communityService.listVolunteerSkillAdmin(volunteerSkillDto);
    }

    @ApiOperation(value = "志愿者组织统计接口", response = ComMngVolunteerStatisticsVo.class)
    @GetMapping("/org/statistics")
    public R statisticsVolunteerOrgAdmin() {
        return communityService.statisticsVolunteerOrgAdmin(this.getCommunityId());
    }

    @ApiOperation(value = "志愿者导入模板下载")
    @GetMapping("/import/template/download")
    public R importTemplateDownload() {
        return R.ok(sftpConfig.getExcelUrl() + "志愿者导入模板.xlsx");
    }

    @ApiOperation(value = "志愿者导入")
    @PostMapping("/import")
    public R importAdmin(@RequestParam MultipartFile file, HttpServletRequest request) {
        // 获取文件名
        String fileName = file.getOriginalFilename();
        log.info("传入文件名字【{}】", fileName);
        InputStream inputStream = null;
        try {
            inputStream = file.getInputStream();
            ComMngVolunteerExcelListen clusterMemberExcelListen = new ComMngVolunteerExcelListen(
                    communityService, this.getCommunityId(), this.getUserId(), stringRedisTemplate);
            EasyExcel.read(inputStream, null, clusterMemberExcelListen).sheet().doRead();
        } catch (IOException e) {
            log.error("导入模板失败【{}】", e.getMessage());
            e.printStackTrace();
        }
        return R.ok();
    }

    @ApiOperation(value = "下载导入失败志愿者错误数据")
    @PostMapping("/download/error")
    public R downloadErrorDrugPopulation(@RequestParam(value = "key") String key) {
        List<ComMngVolunteerErrorExcelVO> list = new ArrayList<>();
        Boolean isExits = stringRedisTemplate.hasKey(key);
        ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
        if (isExits) {
            String json = valueOperations.get(key);
            list = JSONArray.parseArray(json, ComMngVolunteerErrorExcelVO.class);
        }
        String ftpUrl = "/mnt/data/web/excel/";
        String nowDate = DateUtils.getCurrentDateString();
        String name = "导入志愿者错误数据" + nowDate + ".xlsx";
        try {
            SFTPUtil sftp = new SFTPUtil(sftpConfig.getUserName(), sftpConfig.getPassword(), sftpConfig.getHost(), sftpConfig.getPort());
            sftp.login();
            boolean existDir = sftp.isExistDir(ftpUrl + name);
            if (!existDir) {
                String property = System.getProperty("user.dir");
                String fileName = property + File.separator + name;
                // 这里 需要指定写用哪个class去写
                ExcelWriter excelWriter = null;
                InputStream inputStream = null;
                try {
                    excelWriter = EasyExcel.write(fileName, ComMngVolunteerErrorExcelVO.class)
                            .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
                            .registerWriteHandler(new CustomSheetWriteHandler()).build();
                    WriteSheet writeSheet = EasyExcel.writerSheet("导入志愿者错误数据").build();
                    excelWriter.write(list, writeSheet);
                    excelWriter.finish();
                    File file = new File(fileName);
                    inputStream = new FileInputStream(file);
                    sftp.uploadMore(ftpUrl, name, inputStream);
                    sftp.logout();
                    inputStream.close();
                    String absolutePath = file.getAbsolutePath();
                    boolean delete = file.delete();
                    log.info("删除excel【{}】结果【{}】", absolutePath, delete);
                } finally {
                    // 千万别忘记finish 会帮忙关闭流
                    if (inputStream != null) {
                        inputStream.close();
                    }
                    if (excelWriter != null) {
                        excelWriter.finish();
                    }
                }
            }
            return R.ok(sftpConfig.getExcelUrl() + name);
        } catch (Exception e) {
            e.printStackTrace();
            log.error("文件传输失败【{}】", e.getMessage());
            return R.fail();
        }
    }

}

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

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

import javax.annotation.Resource;

import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.service_community.service.ComActService;
import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.dtos.community.convenient.PagePopularMerchantDTO;
@@ -356,4 +357,20 @@
    public R pageEventList(@RequestBody PageBaseDTO pageBaseDTO) {
        return bigScreenStatisticsService.pageEventList(pageBaseDTO);
    }
    @PostMapping("/hmk/baseInfo")
    public R getHmkBaseInfo(@RequestBody CommonPage commonPage){
        return bigScreenStatisticsService.hmkBaseInfo(commonPage);
    }
    @GetMapping("/hmk/partyProjectActivityLine")
    public R partyActivityLine(){
        return bigScreenStatisticsService.partyProjectActivityLine();
    }
    @PostMapping("/hmk/projectActivityTop")
    public R projectActivityTop(@RequestBody CommonPage commonPage){
        return bigScreenStatisticsService.projectActivityProject(commonPage);
    }
    @GetMapping("/hmk/projectType")
    public R projectType(@RequestParam("name") String name){
        return bigScreenStatisticsService.projectType(name);
    }
}

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

@@ -49,7 +49,7 @@
     * @return 单条数据
     */
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Serializable id) {
    public R selectOne(@PathVariable("id") Long id) {
        return R.ok(this.comActColumnService.getById(id));
    }

@@ -79,8 +79,6 @@
        return R.ok(this.comActColumnService.updateById(comActColumn));
    }



    /**
     * 删除数据
     *
@@ -91,4 +89,12 @@
    public R delete(@RequestParam("id") Long id) {
        return this.comActColumnService.delete(id);
    }

    /**
     * 项目分类级联查询
     */
    @PostMapping("/queryLevel")
    public R queryLevel(@RequestBody ComActColumnVO comActColumnVO){
        return this.comActColumnService.queryLevel(comActColumnVO);
    }
}

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

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


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.api.ApiController;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.community.raffle.ComActRaffleVO;
import com.panzhihua.service_community.entity.ComActRaffle;
import com.panzhihua.service_community.service.ComActRaffleService;
import org.springframework.web.bind.annotation.*;

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

/**
 * 抽奖活动表(ComActRaffle)表控制层
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 抽奖活动表相关功能
 *
 * @author zzj
 * @since 2022-02-18 14:31:20
 */
@RestController
@RequestMapping("comActRaffle")
public class ComActRaffleApi {
    /**
     * 服务对象
     */
    @Resource
    private ComActRaffleService comActRaffleService;

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        return this.comActRaffleService.pageList(commonPage);
    }

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("/detail")
    public R selectOne(@RequestParam("id") Long id,@RequestParam("userId")Long userId) {
        return this.comActRaffleService.selectById(id,userId);
    }

    /**
     * 新增数据
     *
     * @param comActRaffleVO 实体对象
     * @return 新增结果
     */
    @PostMapping
    public R insert(@RequestBody ComActRaffleVO comActRaffleVO) {
        return this.comActRaffleService.insert(comActRaffleVO);
    }

    /**
     * 修改数据
     *
     * @param comActRaffleVO 实体对象
     * @return 修改结果
     */
    @PostMapping("/update")
    public R update(@RequestBody ComActRaffleVO comActRaffleVO) {
        return this.comActRaffleService.update(comActRaffleVO);
    }

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return this.comActRaffleService.delete(id);
    }
}

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

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


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.api.ApiController;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.service_community.entity.ComActRafflePrize;
import com.panzhihua.service_community.service.ComActRafflePrizeService;
import org.springframework.web.bind.annotation.*;

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

/**
 * 抽奖活动奖品表(ComActRafflePrize)表控制层
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 抽奖活动奖品表相关功能
 *
 * @author zzj
 * @since 2022-02-18 14:31:46
 */
@RestController
@RequestMapping("comActRafflePrize")
public class ComActRafflePrizeApi {
    /**
     * 服务对象
     */
    @Resource
    private ComActRafflePrizeService comActRafflePrizeService;

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        return this.comActRafflePrizeService.pageList(commonPage);
    }

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Long id) {
        return R.ok(this.comActRafflePrizeService.getById(id));
    }

    /**
     * 新增数据
     *
     * @param comActRafflePrize 实体对象
     * @return 新增结果
     */
    @PostMapping
    public R insert(@RequestBody ComActRafflePrize comActRafflePrize) {
        return R.ok(this.comActRafflePrizeService.save(comActRafflePrize));
    }

    /**
     * 修改数据
     *
     * @param comActRafflePrize 实体对象
     * @return 修改结果
     */
    @PostMapping("/update")
    public R update(@RequestBody ComActRafflePrize comActRafflePrize) {
        return R.ok(this.comActRafflePrizeService.updateById(comActRafflePrize));
    }

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return R.ok(this.comActRafflePrizeService.removeById(id));
    }
}

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

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


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.api.ApiController;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.community.raffle.ComActRaffleRecordVO;
import com.panzhihua.common.model.vos.community.warehouse.QRCodeVO;
import com.panzhihua.service_community.entity.ComActRaffleRecord;
import com.panzhihua.service_community.service.ComActRaffleRecordService;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;

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

/**
 * 抽奖活动中奖记录表(ComActRaffleRecord)表控制层
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 抽奖活动中奖记录表相关功能
 *
 * @author zzj
 * @since 2022-02-18 14:32:02
 */
@RestController
@RequestMapping("comActRaffleRecord")
public class ComActRaffleRecordApi {
    /**
     * 服务对象
     */
    @Resource
    private ComActRaffleRecordService comActRaffleRecordService;

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        return this.comActRaffleRecordService.pageList(commonPage);
    }
    @GetMapping("/queryPrize")
    public R queryPrize(@RequestParam("id")Long id){
        return this.comActRaffleRecordService.queryPrize(id);
    }

    /**
     * 生成二维码
     * @param qrCodeVO
     * @return
     */
    @ApiOperation("生成二维码")
    @PostMapping("/getQRCode")
    public R getQRCode(@RequestBody QRCodeVO qrCodeVO){
        return this.comActRaffleRecordService.queryQrCode(qrCodeVO);
    }

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Long id) {
        return this.comActRaffleRecordService.selectById(id);
    }

    /**
     * 新增数据
     *
     * @param comActRaffleRecordVO 实体对象
     * @return 新增结果
     */
    @PostMapping
    public R insert(@RequestBody ComActRaffleRecordVO comActRaffleRecordVO) {
        ComActRaffleRecord comActRaffleRecord=new ComActRaffleRecord();
        BeanUtils.copyProperties(comActRaffleRecordVO,comActRaffleRecord);
        return R.ok(this.comActRaffleRecordService.save(comActRaffleRecord));
    }

    /**
     * 修改数据
     *
     * @param comActRaffleRecordVO 实体对象
     * @return 修改结果
     */
    @PostMapping("/update")
    public R update(@RequestBody ComActRaffleRecordVO comActRaffleRecordVO) {
        ComActRaffleRecord comActRaffleRecord=new ComActRaffleRecord();
        BeanUtils.copyProperties(comActRaffleRecordVO,comActRaffleRecord);
        return R.ok(this.comActRaffleRecordService.updateById(comActRaffleRecord));
    }

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return R.ok(this.comActRaffleRecordService.removeById(id));
    }

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @PostMapping("export")
    public R export(@RequestBody CommonPage commonPage) {
        return this.comActRaffleRecordService.export(commonPage);
    }
}

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

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

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.util.List;

import javax.annotation.Resource;

import org.springframework.web.bind.annotation.*;

import com.panzhihua.common.model.dtos.community.CancelRecordDTO;
import com.panzhihua.common.model.dtos.community.OperationDetailDTO;
import com.panzhihua.common.model.dtos.community.PageUserReserveDTO;
import com.panzhihua.common.model.dtos.community.reserve.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActReserveCommitVO;
import com.panzhihua.service_community.dao.ComActReserveOperationRecordMapper;
import com.panzhihua.service_community.model.dos.ComActReserveOperationRecordDO;
import com.panzhihua.service_community.model.dos.ComActReserveRecordDO;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveDetailAdminVO;
import com.panzhihua.service_community.service.*;
import com.panzhihua.common.model.dtos.community.reserve.*;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.List;
import lombok.extern.slf4j.Slf4j;

/**
 * 预约登记
@@ -94,7 +92,7 @@
     * @return  预约登记详情
     */
    @GetMapping("/admin/detail")
    public R detailReserveAdmin(@RequestParam("reserveId") Long reserveId){
    public R<ComActReserveDetailAdminVO> detailReserveAdmin(@RequestParam("reserveId") Long reserveId) {
        return comActReserveService.detailReserveAdmin(reserveId);
    }

@@ -306,6 +304,17 @@
    }

    /**
     * 查询预约登记题目下属选择项列表
     * 
     * @param reserveSubId
     *            预约登记id
     * @return 查询预约登记题目下属选择项列表
     */
    @GetMapping("/admin/subject/selection/list")
    public List<String> subjectSelectionListAdmin(@RequestParam("reserveSubId") Long reserveSubId) {
        return comActReserveSubService.subjectSelectionListAdmin(reserveSubId);
    }
    /**
     * 分页查询登记明细列表
     * @param detailedAdminDTO  请求参数
     * @return  登记明细列表

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

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


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.api.ApiController;
import com.panzhihua.common.model.vos.ComActSocialMemberVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.service_community.entity.ComActSocialMember;
import com.panzhihua.service_community.service.ComActSocialMemberService;
import org.springframework.web.bind.annotation.*;

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

/**
 * 社会组织成员表(ComActSocialMember)表控制层
 *
 * @author makejava
 * @since 2021-10-22 09:52:47
 */
@RestController
@RequestMapping("comActSocialMember")
public class ComActSocialMemberApi {
    /**
     * 服务对象
     */
    @Resource
    private ComActSocialMemberService comActSocialMemberService;

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        return this.comActSocialMemberService.pageList(commonPage);
    }

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Long id) {
        return this.comActSocialMemberService.detail(id);
    }

    /**
     * 新增数据
     *
     * @param comActSocialMember 实体对象
     * @return 新增结果
     */
    @PostMapping
    public R insert(@RequestBody ComActSocialMemberVO comActSocialMember) {
        return this.comActSocialMemberService.insert(comActSocialMember);
    }

    /**
     * 修改数据
     *
     * @param comActSocialMember 实体对象
     * @return 修改结果
     */
    @PostMapping("/update")
    public R update(@RequestBody ComActSocialMemberVO comActSocialMember) {
        return this.comActSocialMemberService.update(comActSocialMember);
    }

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return this.comActSocialMemberService.delete(id);
    }
}

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

@@ -40,6 +40,28 @@
    public R selectAll(@RequestBody CommonPage commonPage) {
        return this.comActSocialOrgService.pageList(commonPage);
    }

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Long id) {
        return this.comActSocialOrgService.selectById(id);
    }

    /**
     * 通过userId查询
     *
     * @param userId 主键
     * @return 单条数据
     */
    @GetMapping("/selectByUserId")
    public R selectOneByUserId(@RequestParam("userId") Long userId) {
        return R.ok(this.comActSocialOrgService.getOne(new QueryWrapper<ComActSocialOrg>().lambda().eq(ComActSocialOrg::getUserId,userId)));
    }
    /**
     * 新增数据
     *

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

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


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.api.ApiController;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.community.social.SocialProjectVO;
import com.panzhihua.service_community.entity.ComActSocialProject;
import com.panzhihua.service_community.service.ComActSocialProjectService;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;

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

/**
 * 三社联动项目表(ComActSocialProject)表控制层
 *
 * @author makejava
 * @since 2021-12-22 14:02:48
 */
@RestController
@RequestMapping("comActSocialProject")
public class ComActSocialProjectApi {
    /**
     * 服务对象
     */
    @Resource
    private ComActSocialProjectService comActSocialProjectService;

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        return this.comActSocialProjectService.pageList(commonPage);
    }

    /**
     * 平台详情接口
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Long id) {
        return this.comActSocialProjectService.getByBackstage(id);
    }
    /**
     * 根据项目id分页获取关联项目
     */
    @PostMapping("/getRelation")
    public R getRelation(@RequestBody CommonPage commonPage){
        return this.comActSocialProjectService.getProject(commonPage);
    }

    /**
     * 新增数据
     *
     * @param socialProjectVO 实体对象
     * @return 新增结果
     */
    @PostMapping
    public R insert(@RequestBody SocialProjectVO socialProjectVO) {
        ComActSocialProject comActSocialProject=new ComActSocialProject();
        BeanUtils.copyProperties(socialProjectVO,comActSocialProject);
        comActSocialProject.setCreateTime(new Date());
        if(socialProjectVO.getLevel()>1){
            ComActSocialProject comActSocialProject1=comActSocialProjectService.getById(socialProjectVO.getParentId());
            comActSocialProject.setColumnId(comActSocialProject1.getColumnId());
            comActSocialProject.setSecondColumnId(comActSocialProject1.getSecondColumnId());
        }
        return R.ok(this.comActSocialProjectService.save(comActSocialProject));
    }

    /**
     * 修改数据
     *
     * @param socialProjectVO 实体对象
     * @return 修改结果
     */
    @PostMapping("/update")
    public R update(@RequestBody SocialProjectVO socialProjectVO) {
        ComActSocialProject comActSocialProject=new ComActSocialProject();
        BeanUtils.copyProperties(socialProjectVO,comActSocialProject);
        return R.ok(this.comActSocialProjectService.updateById(comActSocialProject));
    }

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return R.ok(this.comActSocialProjectService.removeById(id));
    }

    /**
     * 小程序详情接口
     * @param id
     * @return
     */
    @GetMapping("/getApplet")
    public R getApplet(@RequestParam("id") Long id){
        return this.comActSocialProjectService.getByApplet(id);
    }
}

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

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


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.api.ApiController;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.community.social.ComActSocialProjectMemberVO;
import com.panzhihua.service_community.entity.ComActSocialProjectMember;
import com.panzhihua.service_community.service.ComActSocialProjectMemberService;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;

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

/**
 * 项目人员(ComActSocialProjectMember)表控制层
 *
 * @author makejava
 * @since 2021-12-23 15:16:43
 */
@RestController
@RequestMapping("comActSocialProjectMember")
public class ComActSocialProjectMemberApi {
    /**
     * 服务对象
     */
    @Resource
    private ComActSocialProjectMemberService comActSocialProjectMemberService;

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        return this.comActSocialProjectMemberService.pageList(commonPage);
    }

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Long id) {
        return R.ok(this.comActSocialProjectMemberService.getById(id));
    }

    /**
     * 新增数据
     *
     * @param comActSocialProjectMemberVO 实体对象
     * @return 新增结果
     */
    @PostMapping
    public R insert(@RequestBody ComActSocialProjectMemberVO comActSocialProjectMemberVO) {
        return this.comActSocialProjectMemberService.insert(comActSocialProjectMemberVO);
    }

    /**
     * 修改数据
     *
     * @param comActSocialProjectMemberVO 实体对象
     * @return 修改结果
     */
    @PostMapping("/update")
    public R update(@RequestBody ComActSocialProjectMemberVO comActSocialProjectMemberVO) {
        ComActSocialProjectMember comActSocialProjectMember=new ComActSocialProjectMember();
        BeanUtils.copyProperties(comActSocialProjectMemberVO,comActSocialProjectMember);
        return R.ok(this.comActSocialProjectMemberService.updateById(comActSocialProjectMember));
    }

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return R.ok(this.comActSocialProjectMemberService.removeById(id));
    }

    @PostMapping("/batch")
    public R insertBatch(@RequestBody ComActSocialProjectMemberVO comActSocialProjectMemberVO){
        return R.ok(this.comActSocialProjectMemberService.insertBatch(comActSocialProjectMemberVO));
    }
}

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

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


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.api.ApiController;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.community.social.ComActSocialProjectPublicityVO;
import com.panzhihua.service_community.entity.ComActSocialProjectPublicity;
import com.panzhihua.service_community.service.ComActSocialProjectPublicityService;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;

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

/**
 * 项目宣传表(ComActSocialProjectPublicity)表控制层
 *
 * @author makejava
 * @since 2021-12-23 14:30:55
 */
@RestController
@RequestMapping("comActSocialProjectPublicity")
public class ComActSocialProjectPublicityApi {
    /**
     * 服务对象
     */
    @Resource
    private ComActSocialProjectPublicityService comActSocialProjectPublicityService;

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        return this.comActSocialProjectPublicityService.pageList(commonPage);
    }

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Long id) {
        return R.ok(this.comActSocialProjectPublicityService.getById(id));
    }

    /**
     * 小程序通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("/getByApplet/{id}")
    public R getByApplet(@PathVariable("id") Long id) {
        ComActSocialProjectPublicity comActSocialProjectPublicity=this.comActSocialProjectPublicityService.getById(id);
        comActSocialProjectPublicity.setViews(comActSocialProjectPublicity.getViews()+1);
        this.comActSocialProjectPublicityService.updateById(comActSocialProjectPublicity);
        return this.comActSocialProjectPublicityService.selectOne(id);
    }

    /**
     * 新增数据
     *
     * @param comActSocialProjectPublicityVO 实体对象
     * @return 新增结果
     */
    @PostMapping
    public R insert(@RequestBody ComActSocialProjectPublicityVO comActSocialProjectPublicityVO) {
        ComActSocialProjectPublicity comActSocialProjectPublicity=new ComActSocialProjectPublicity();
        BeanUtils.copyProperties(comActSocialProjectPublicityVO,comActSocialProjectPublicity);
        comActSocialProjectPublicity.setCreateTime(new Date());
        return R.ok(this.comActSocialProjectPublicityService.save(comActSocialProjectPublicity));
    }

    /**
     * 修改数据
     *
     * @param comActSocialProjectPublicityVO 实体对象
     * @return 修改结果
     */
    @PostMapping("/update")
    public R update(@RequestBody ComActSocialProjectPublicityVO comActSocialProjectPublicityVO) {
        ComActSocialProjectPublicity comActSocialProjectPublicity=new ComActSocialProjectPublicity();
        BeanUtils.copyProperties(comActSocialProjectPublicityVO,comActSocialProjectPublicity);
        return R.ok(this.comActSocialProjectPublicityService.updateById(comActSocialProjectPublicity));
    }

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return R.ok(this.comActSocialProjectPublicityService.removeById(id));
    }
    /**
     * 多条删除数据
     *
     * @param ids 主键结合
     * @return 删除结果
     */
    @GetMapping("delBatch")
    public R delBatch(@RequestParam("ids") List<Long> ids) {
        return R.ok(this.comActSocialProjectPublicityService.removeByIds(ids));
    }
}

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

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


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.api.ApiController;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.community.social.ComActSocialProjectPublicityVO;
import com.panzhihua.common.model.vos.community.social.ComActSocialProjectScheduleVO;
import com.panzhihua.service_community.entity.ComActSocialProjectSchedule;
import com.panzhihua.service_community.service.ComActSocialProjectScheduleService;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;

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

/**
 * 项目进度表(ComActSocialProjectSchedule)表控制层
 *
 * @author makejava
 * @since 2021-12-23 14:31:16
 */
@RestController
@RequestMapping("comActSocialProjectSchedule")
public class ComActSocialProjectScheduleApi {
    /**
     * 服务对象
     */
    @Resource
    private ComActSocialProjectScheduleService comActSocialProjectScheduleService;

    /**
     * 根据projectId查询所有进度
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        return this.comActSocialProjectScheduleService.pageList(commonPage);
    }

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Long id) {
        return R.ok(this.comActSocialProjectScheduleService.getById(id));
    }

    /**
     * 新增数据
     *
     * @param comActSocialProjectScheduleVO 实体对象
     * @return 新增结果
     */
    @PostMapping
    public R insert(@RequestBody ComActSocialProjectScheduleVO comActSocialProjectScheduleVO) {
        ComActSocialProjectSchedule comActSocialProjectSchedule=new ComActSocialProjectSchedule();
        BeanUtils.copyProperties(comActSocialProjectScheduleVO,comActSocialProjectSchedule);
        comActSocialProjectSchedule.setCreateTime(new Date());
        return R.ok(this.comActSocialProjectScheduleService.save(comActSocialProjectSchedule));
    }

    /**
     * 修改数据
     *
     * @param comActSocialProjectScheduleVO 实体对象
     * @return 修改结果
     */
    @PostMapping("/update")
    public R update(@RequestBody ComActSocialProjectScheduleVO comActSocialProjectScheduleVO) {
        ComActSocialProjectSchedule comActSocialProjectSchedule=new ComActSocialProjectSchedule();
        BeanUtils.copyProperties(comActSocialProjectScheduleVO,comActSocialProjectSchedule);
        return R.ok(this.comActSocialProjectScheduleService.updateById(comActSocialProjectSchedule));
    }

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return R.ok(this.comActSocialProjectScheduleService.removeById(id));
    }
}

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

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


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.api.ApiController;
import com.panzhihua.common.model.dtos.civil.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.civil.ComActSocialWorkerDetailsVO;
import com.panzhihua.common.model.vos.civil.ComActSocialWorkerVO;
import com.panzhihua.service_community.entity.ComActSocialWorker;
import com.panzhihua.service_community.service.ComActSocialWorkerService;
import org.springframework.web.bind.annotation.*;

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

/**
 * 社工(ComActSocialWorker)表控制层
 *
 * @author makejava
 * @since 2021-10-25 10:56:48
 */
@RestController
@RequestMapping("comActSocialWorker")
public class ComActSocialWorkerApi {
    /**
     * 服务对象
     */
    @Resource
    private ComActSocialWorkerService comActSocialWorkerService;

    /**
     * 新增社工
     * @param comActSocialWorkerAddDTO
     * @return 新增结果
     */
    @PostMapping("/add")
    R add(@RequestBody ComActSocialWorkerAddDTO comActSocialWorkerAddDTO){
        return comActSocialWorkerService.add(comActSocialWorkerAddDTO);
    };

    /**
     * 修改社工
     * @param comActSocialWorkerEditDTO
     * @return 维护结果
     */
    @PostMapping("/edit")
    R edit(@RequestBody ComActSocialWorkerEditDTO comActSocialWorkerEditDTO){
        return comActSocialWorkerService.edit(comActSocialWorkerEditDTO);
    };

    /**
     * 分页查找社工
     * @param pageComActSocialWorkerDTO
     * @return 维护结果
     */
    @PostMapping("/page")
    R<IPage<ComActSocialWorkerVO>> query(@RequestBody PageComActSocialWorkerDTO pageComActSocialWorkerDTO){
        return comActSocialWorkerService.query(pageComActSocialWorkerDTO);
    };

    /**
     * 删除社工
     * @param ComActSocialWorkerDeleteDTO
     * @return 平台用户信息
     */
    @PostMapping("/delete")
    R delete(@RequestBody ComActSocialWorkerDeleteDTO ComActSocialWorkerDeleteDTO){
        return comActSocialWorkerService.delete(ComActSocialWorkerDeleteDTO);
    };

    /**
     * 查询社工详细信息
     * @param id 社工 id
     * @return 查找结果
     */
    @PostMapping("/{id}")
    R<ComActSocialWorkerDetailsVO> comActSocialWorkerDetails(@PathVariable("id") Long id){
        return comActSocialWorkerService.comActSocialWorkerDetails(id);
    }

    /**
     * 导入社工名单
     * @param list
     * @param communityId
     * @return
     */
    @PostMapping("/input")
    R export(@RequestBody List<ComActSocialWorkerExcelVO> list, @RequestParam("communityId") Long communityId){
        return comActSocialWorkerService.export(list,communityId);
    }
    @PostMapping("/activity")
    R activity(@RequestBody CommonPage commonPage){
        return comActSocialWorkerService.activity(commonPage);
    }
    @PostMapping("/activityList")
    R activityList(@RequestBody CommonPage commonPage){
        return comActSocialWorkerService.activityList(commonPage);
    }
}



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

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


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.api.ApiController;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.community.social.ComActSocialWorkerServiceVO;
import com.panzhihua.service_community.entity.ComActSocialWorkerService;
import com.panzhihua.service_community.service.ComActSocialWorkerServiceService;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;

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

/**
 * 社工服务表(ComActSocialWorkerService)表控制层
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 社工服务表相关功能
 *
 * @author zzj
 * @since 2022-02-16 15:59:42
 */
@RestController
@RequestMapping("comActSocialWorkerService")
public class ComActSocialWorkerServiceApi {
    /**
     * 服务对象
     */
    @Resource
    private ComActSocialWorkerServiceService comActSocialWorkerServiceService;

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @PostMapping("queryAll")
    public R selectAll(@RequestBody CommonPage commonPage) {
        return this.comActSocialWorkerServiceService.pageList(commonPage);
    }

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("{id}")
    public R selectOne(@PathVariable("id") Long id) {
        return this.comActSocialWorkerServiceService.selectById(id);
    }

    /**
     * 新增数据
     *
     * @param comActSocialWorkerService 实体对象
     * @return 新增结果
     */
    @PostMapping
    public R insert(@RequestBody ComActSocialWorkerService comActSocialWorkerService) {
        return R.ok(this.comActSocialWorkerServiceService.save(comActSocialWorkerService));
    }

    /**
     * 修改数据
     *
     * @param comActSocialWorkerServiceVO 实体对象
     * @return 修改结果
     */
    @PostMapping("/update")
    public R update(@RequestBody ComActSocialWorkerServiceVO comActSocialWorkerServiceVO) {
        ComActSocialWorkerService comActSocialWorkerService=new ComActSocialWorkerService();
        BeanUtils.copyProperties(comActSocialWorkerServiceVO,comActSocialWorkerService);
        return R.ok(this.comActSocialWorkerServiceService.updateById(comActSocialWorkerService));
    }

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @GetMapping("del")
    public R delete(@RequestParam("id") Long id) {
        return R.ok(this.comActSocialWorkerServiceService.removeById(id));
    }
}

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

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

import com.panzhihua.common.model.dtos.community.fms.AddFmsClassroomAdminDTO;
import com.panzhihua.common.model.dtos.community.fms.AddFmsServiceAdminDTO;
import com.panzhihua.common.model.dtos.community.fms.AddTeamDTO;
import com.panzhihua.common.model.dtos.community.fms.AddTeamMemberDTO;
import com.panzhihua.common.model.dtos.community.fms.AddTeamTypeDTO;
import com.panzhihua.common.model.dtos.community.fms.ApplyFmsServiceDTO;
import com.panzhihua.common.model.dtos.community.fms.ApprovalFmsServiceAdminDTO;
import com.panzhihua.common.model.dtos.community.fms.DeleteTeamMemberDTO;
import com.panzhihua.common.model.dtos.community.fms.EditFmsClassroomAdminDTO;
import com.panzhihua.common.model.dtos.community.fms.EditTeamDTO;
import com.panzhihua.common.model.dtos.community.fms.EditTeamMemberDTO;
import com.panzhihua.common.model.dtos.community.fms.EditTeamTypeDTO;
import com.panzhihua.common.model.dtos.community.fms.EvaluationFmsServiceDTO;
import com.panzhihua.common.model.dtos.community.fms.FeedbackFmsServiceDTO;
import com.panzhihua.common.model.dtos.community.fms.PageFmsClassroomAdminDTO;
import com.panzhihua.common.model.dtos.community.fms.PageFmsEventAdminDTO;
import com.panzhihua.common.model.dtos.community.fms.PageFmsServiceAdminDTO;
import com.panzhihua.common.model.dtos.community.fms.PageFmsServiceAppletsDTO;
import com.panzhihua.common.model.dtos.community.fms.PageFmsTeamDTO;
import com.panzhihua.common.model.dtos.community.fms.PageTeamMemberDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.fms.ComFmsServiceImportExcelVO;
import com.panzhihua.common.model.vos.community.fms.ComFmsTeamMemberImportExcelVO;
import com.panzhihua.service_community.service.ComFmsClassroomService;
import com.panzhihua.service_community.service.ComFmsServiceEvaluationsService;
import com.panzhihua.service_community.service.ComFmsServiceService;
import com.panzhihua.service_community.service.ComFmsTeamMemberService;
import com.panzhihua.service_community.service.ComFmsTeamService;
import com.panzhihua.service_community.service.ComFmsTeamTypeService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.DeleteMapping;
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.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

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

/**
 * @title: ComFmsApi
 * @projectName: 成都呐喊信息技术有限公司-智慧社区项目
 * @description: 五微服务相关接口
 * @author: hans
 * @date: 2022/02/11 13:23
 */
@Slf4j
@RestController
@RequestMapping("/fms")
public class ComFmsApi {

    @Resource
    private ComFmsTeamTypeService comFmsTeamTypeService;
    @Resource
    private ComFmsTeamService comFmsTeamService;
    @Resource
    private ComFmsTeamMemberService comFmsTeamMemberService;
    @Resource
    private ComFmsServiceService comFmsServiceService;
    @Resource
    private ComFmsClassroomService comFmsClassroomService;
    @Resource
    private ComFmsServiceEvaluationsService comFmsServiceEvaluationsService;

    /**
     * 新增团队类型
     * @param addTeamTypeDTO
     * @return
     */
    @PostMapping("/teamType/add")
    public R addFmsTeamType(@RequestBody AddTeamTypeDTO addTeamTypeDTO) {
        return comFmsTeamTypeService.addFmsTeamType(addTeamTypeDTO);
    }

    /**
     * 修改团队类型
     * @param editTeamTypeDTO
     * @return
     */
    @PostMapping("/teamType/edit")
    public R editFmsTeamType(@RequestBody EditTeamTypeDTO editTeamTypeDTO) {
        return comFmsTeamTypeService.editFmsTeamType(editTeamTypeDTO);
    }

    /**
     * 删除团队类型
     * @param teamTypeId
     * @param communityId
     * @return
     */
    @DeleteMapping("/teamType/delete")
    public R deleteFmsTeamType(@RequestParam("teamTypeId") Long teamTypeId,
                        @RequestParam("communityId") Long communityId) {
        return comFmsTeamTypeService.deleteFmsTeamType(teamTypeId, communityId);
    }

    /**
     * 获取团队类型列表
     * @param communityId
     * @return
     */
    @GetMapping("/teamType/list")
    public R listFmsTeamType(@RequestParam("communityId") Long communityId) {
        return comFmsTeamTypeService.listFmsTeamType(communityId);
    }

    /**
     * 新增团队
     * @param addTeamDTO
     * @return
     */
    @PostMapping("/team/add")
    public R addFmsTeam(@RequestBody AddTeamDTO addTeamDTO) {
        return comFmsTeamService.addFmsTeam(addTeamDTO);
    }

    /**
     * 修改团队信息
     * @param editTeamDTO
     * @return
     */
    @PostMapping("/team/edit")
    public R editFmsTeam(@RequestBody EditTeamDTO editTeamDTO) {
        return comFmsTeamService.editFmsTeam(editTeamDTO);
    }

    /**
     * 删除团队
     * @param teamId
     * @return
     */
    @DeleteMapping("/team/delete")
    public R deleteFmsTeam(@RequestParam("teamId") Long teamId) {
        return comFmsTeamService.deleteFmsTeam(teamId);
    }

    /**
     * 获取团队列表
     * @param teamTypeId
     * @return
     */
    @GetMapping("/team/list")
    public R listFmsTeam(@RequestParam("teamTypeId") Long teamTypeId) {
        return comFmsTeamService.listFmsTeam(teamTypeId);
    }

    /**
     * 获取团队详情
     * @param teamId
     * @return
     */
    @GetMapping("/team/detail")
    public R detailFmsTeam(@RequestParam("teamId") Long teamId) {
        return comFmsTeamService.detailFmsTeam(teamId);
    }

    /**
     * 级联查询团队数据
     * @param communityId
     * @return
     */
    @GetMapping("/team/cascade")
    public R retrieveFmsTeamCascade(@RequestParam("communityId") Long communityId) {
        return comFmsTeamService.retrieveFmsTeamCascade(communityId);
    }

    /**
     * 新增团队成员
     * @param addTeamMemberDTO
     * @return
     */
    @PostMapping("/teamMember/add")
    public R addFmsTeamMember(@RequestBody AddTeamMemberDTO addTeamMemberDTO) {
        return comFmsTeamMemberService.addFmsTeamMember(addTeamMemberDTO);
    }

    /**
     * 编辑团队成员
     * @param editTeamMemberDTO
     * @return
     */
    @PostMapping("/teamMember/edit")
    public R editFmsTeamMember(@RequestBody EditTeamMemberDTO editTeamMemberDTO) {
        return comFmsTeamMemberService.editFmsTeamMember(editTeamMemberDTO);
    }

    /**
     * 删除团队成员
     * @param deleteTeamMemberDTO
     * @return
     */
    @PostMapping("/teamMember/delete")
    public R deleteFmsTeamMember(@RequestBody DeleteTeamMemberDTO deleteTeamMemberDTO) {
        return comFmsTeamMemberService.deleteFmsTeamMember(deleteTeamMemberDTO);
    }

    /**
     * 分页查询团队成员
     * @param pageTeamMemberDTO
     * @return
     */
    @PostMapping("/teamMember/page")
    public R pageFmsTeamMember(@RequestBody PageTeamMemberDTO pageTeamMemberDTO) {
        return comFmsTeamMemberService.pageFmsTeamMember(pageTeamMemberDTO);
    }

    /**
     * 微团队顶部统计
     * @param communityId
     * @return
     */
    @GetMapping("/teamMember/statistics")
    public R statisticsFmsTeamMember(@RequestParam("communityId") Long communityId) {
        return comFmsTeamMemberService.statisticsFmsTeamMember(communityId);
    }

    /**
     * 批量导入团队成员
     * @param voList
     * @param communityId
     * @param userId
     * @return
     */
    @PostMapping("/teamMember/import")
    public R listSaveFmsTeamMemberExcelVO(@RequestBody List<ComFmsTeamMemberImportExcelVO> voList,
                                   @RequestParam("communityId") Long communityId, @RequestParam("userId") Long userId) {
        return comFmsTeamMemberService.listSaveFmsTeamMemberExcelVO(voList, communityId, userId);
    }

    /**
     * 团队人员导出
     * @param pageTeamMemberDTO
     * @return
     */
    @PostMapping("/teamMember/export")
    public R exportTeamMember(@RequestBody PageTeamMemberDTO pageTeamMemberDTO) {
        return comFmsTeamMemberService.exportTeamMember(pageTeamMemberDTO);
    }

    /**
     * 后台新增微服务
     * @param adminDTO
     * @return
     */
    @PostMapping("/service/adminAdd")
    public R addFmsServiceAdmin(@RequestBody AddFmsServiceAdminDTO adminDTO) {
        return comFmsServiceService.addFmsServiceAdmin(adminDTO);
    }

    /**
     * 后台分页查询微服务
     * @param adminDTO
     * @return
     */
    @PostMapping("/service/adminPage")
    public R pageFmsServiceAdmin(@RequestBody PageFmsServiceAdminDTO adminDTO) {
        return comFmsServiceService.pageFmsServiceAdmin(adminDTO);
    }

    /**
     * 后台核实微服务
     * @param adminDTO
     * @return
     */
    @PostMapping("/service/approval")
    public R approvalFmsService(@RequestBody ApprovalFmsServiceAdminDTO adminDTO) {
        return comFmsServiceService.approvalFmsService(adminDTO);
    }

    /**
     * 级联查询团队服务人员
     * @param communityId
     * @return
     */
    @GetMapping("/teamMember/cascade")
    public R retrieveFmsTeamMemberCascade(@RequestParam("communityId") Long communityId) {
        return comFmsTeamMemberService.retrieveFmsTeamMemberCascade(communityId);
    }

    /**
     * 后台查看微服务详情
     * @param serviceId
     * @return
     */
    @GetMapping("/service/detailAdmin")
    public R detailFmsServiceAdmin(@RequestParam("serviceId") Long serviceId) {
        return comFmsServiceService.detailFmsServiceAdmin(serviceId);
    }

    /**
     * 后台删除微服务
     * @param serviceId
     * @return
     */
    @DeleteMapping("/service/delete")
    public R deleteFmsServiceAdmin(@RequestParam("serviceId") Long serviceId) {
        return comFmsServiceService.deleteFmsServiceAdmin(serviceId);
    }

    /**
     * 微服务顶部统计
     * @param communityId
     * @return
     */
    @GetMapping("/service/statistics")
    public R statisticsFmsService(@RequestParam("communityId") Long communityId) {
        return comFmsServiceService.statisticsFmsService(communityId);
    }

    /**
     * 后台导入微服务数据
     * @param voList
     * @param communityId
     * @param userId
     * @return
     */
    @PostMapping("/service/import")
    public R listSaveFmsServiceExcelVO(@RequestBody List<ComFmsServiceImportExcelVO> voList,
                                @RequestParam("communityId") Long communityId,
                                @RequestParam("userId") Long userId) {
        return comFmsServiceService.listSaveFmsServiceExcelVO(voList, communityId, userId);
    }

    /**
     * 后台新增微讲堂
     * @param adminDTO
     * @return
     */
    @PostMapping("/classroom/add")
    public R addFmsClassroom(@RequestBody AddFmsClassroomAdminDTO adminDTO) {
        return comFmsClassroomService.addFmsClassroom(adminDTO);
    }

    /**
     * 后台编辑微讲堂
     * @param adminDTO
     * @return
     */
    @PostMapping("/classroom/edit")
    public R editFmsClassroom(@RequestBody EditFmsClassroomAdminDTO adminDTO) {
        return comFmsClassroomService.editFmsClassroom(adminDTO);
    }

    /**
     * 后台删除微讲堂
     * @param id
     * @return
     */
    @DeleteMapping("/classroom/delete")
    public R deleteFmsClassroom(@RequestParam("id") Long id) {
        return comFmsClassroomService.deleteFmsClassroom(id);
    }

    /**
     * 后台获取微讲堂详情
     * @param id
     * @return
     */
    @GetMapping("/classroom/detail")
    public R detailFmsClassroom(@RequestParam("id") Long id) {
        return comFmsClassroomService.detailFmsClassroom(id);
    }

    /**
     * 后台分页查询微讲堂
     * @param adminDTO
     * @return
     */
    @PostMapping("/classroom/pageAdmin")
    public R pageFmsClassroomAdmin(@RequestBody PageFmsClassroomAdminDTO adminDTO) {
        return comFmsClassroomService.pageFmsClassroomAdmin(adminDTO);
    }

    /**
     * 微讲堂顶部统计
     * @param communityId
     * @return
     */
    @GetMapping("/classroom/statistics")
    public R statisticsFmsClassroom(@RequestParam("communityId") Long communityId) {
        return comFmsClassroomService.statisticsFmsClassroom(communityId);
    }

    /**
     * 后台分页查询微调节/微防控
     * @param adminDTO
     * @return
     */
    @PostMapping("/event/page")
    public R pageFmsEvent(@RequestBody PageFmsEventAdminDTO adminDTO) {
        return comFmsClassroomService.pageFmsEvent(adminDTO);
    }

    /**
     * 微调节/微防控顶部统计
     * @param type
     * @param communityId
     * @return
     */
    @GetMapping("/event/statistics")
    public R statisticsFmsEvent(@RequestParam("type") Integer type, @RequestParam("communityId") Long communityId) {
        return comFmsClassroomService.statisticsFmsEvent(type, communityId);
    }

    /**
     * 小程序分页查询团队信息
     * @param pageFmsTeamDTO
     * @return
     */
    @PostMapping("/team/pageApplets")
    public R pageFmsTeamApplets(@RequestBody PageFmsTeamDTO pageFmsTeamDTO) {
        return comFmsTeamService.pageFmsTeamApplets(pageFmsTeamDTO);
    }

    /**
     * 小程序获取微讲堂详情
     * @param id
     * @return
     */
    @GetMapping("/classroom/detailApplets")
    public R detailFmsClassroomApplets(@RequestParam("id") Long id) {
        return comFmsClassroomService.detailFmsClassroomApplets(id);
    }

    /**
     * 小程序分页查询微调节/微防控
     * @param adminDTO
     * @return
     */
    @PostMapping("/event/pageApplets")
    public R pageFmsEventApplets(@RequestBody PageFmsEventAdminDTO adminDTO) {
        return comFmsClassroomService.pageFmsEventApplets(adminDTO);
    }

    /**
     * 小程序分页查询微服务
     * @param adminDTO
     * @return
     */
    @PostMapping("/service/pageApplets")
    public R pageFmsServiceApplets(@RequestBody PageFmsServiceAppletsDTO adminDTO) {
        return comFmsServiceService.pageFmsServiceApplets(adminDTO);
    }

    /**
     * 小程序查看微服务详情
     * @param serviceId
     * @param userId
     * @return
     */
    @GetMapping("/service/detailApplets")
    public R detailFmsServiceApplets(@RequestParam("serviceId") Long serviceId, @RequestParam(value = "userId", required = false) Long userId) {
        return comFmsServiceService.detailFmsServiceApplets(serviceId, userId);
    }

    /**
     * 微服务申请
     * @param adminDTO
     * @return
     */
    @PostMapping("/service/apply")
    public R applyFmsService(@RequestBody ApplyFmsServiceDTO adminDTO) {
        return comFmsServiceService.applyFmsService(adminDTO);
    }

    /**
     * 分页查询我的微服务
     * @param adminDTO
     * @return
     */
    @PostMapping("/service/pageMy")
    public R pageMyFmsService(@RequestBody PageFmsServiceAppletsDTO adminDTO) {
        return comFmsServiceService.pageMyFmsService(adminDTO);
    }

    /**
     * 微服务评价
     * @param evaluationFmsServiceDTO
     * @return
     */
    @PostMapping("/service/evaluate")
    public R evaluateFmsService(@RequestBody EvaluationFmsServiceDTO evaluationFmsServiceDTO) {
        return comFmsServiceEvaluationsService.evaluateFmsService(evaluationFmsServiceDTO);
    }

    /**
     * 微团队成员分页查询服务处理
     * @param adminDTO
     * @return
     */
    @PostMapping("/service/pageDeal")
    public R pageDealFmsService(@RequestBody PageFmsServiceAppletsDTO adminDTO) {
        return comFmsServiceService.pageDealFmsService(adminDTO);
    }

    /**
     * 微团队成员服务反馈
     * @param adminDTO
     * @return
     */
    @PostMapping("/service/feedback")
    public R feedbackFmsService(@RequestBody FeedbackFmsServiceDTO adminDTO) {
        return comFmsServiceService.feedbackFmsService(adminDTO);
    }

    /**
     * 定时任务针对服务结束后3天还未评价的用户默认好评
     * @return
     */
    @PostMapping("/service/defaultPraise")
    public R timedTaskFmsServiceDefaultPraise() {
        return comFmsServiceService.defaultPraise();
    }
}

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

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

import com.panzhihua.common.model.dtos.common.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.service.ComMngVolunteerOrgTeamService;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

/**
 * 志愿者组织队伍表(ComMngVolunteerOrgTeam)表控制层
 *
 * @author lyq
 * @since 2021-10-30 15:51:21
 */
@RestController
@RequestMapping("comMngVolunteerOrgTeam")
public class ComMngVolunteerOrgTeamApi {
    /**
     * 服务对象
     */
    @Resource
    private ComMngVolunteerOrgTeamService comMngVolunteerOrgTeamService;

    /**
     * 分页查询
     *
     * @param comMngVolunteerOrgTeam 筛选条件
     * @return 查询结果
     */
    @PostMapping("/page")
    public R queryByPage(@RequestBody PageComMngVolunteerOrgTeamDto comMngVolunteerOrgTeam) {
        return this.comMngVolunteerOrgTeamService.queryByPage(comMngVolunteerOrgTeam);
    }

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("{id}")
    public R queryById(@PathVariable("id") Long id) {
        return this.comMngVolunteerOrgTeamService.queryById(id);
    }

    /**
     * 新增数据
     *
     * @param comMngVolunteerOrgTeam 实体
     * @return 新增结果
     */
    @PostMapping("/add")
    public R add(@RequestBody AddComMngVolunteerOrgTeamDto comMngVolunteerOrgTeam) {
        return this.comMngVolunteerOrgTeamService.insert(comMngVolunteerOrgTeam);
    }

    /**
     * 编辑数据
     *
     * @param comMngVolunteerOrgTeam 实体
     * @return 编辑结果
     */
    @PutMapping("/edit")
    public R edit(@RequestBody EditComMngVolunteerOrgTeamDto comMngVolunteerOrgTeam) {
        return this.comMngVolunteerOrgTeamService.update(comMngVolunteerOrgTeam);
    }

    /**
     * 删除数据
     *
     * @param id 主键
     * @return 删除是否成功
     */
    @GetMapping("/delete")
    public R deleteById(Long id) {
        return this.comMngVolunteerOrgTeamService.deleteById(id);
    }

    /**
     * 社区后台-查询志愿者组织列表
     * @param comMngVolunteerOrgTeam    请求参数
     * @return  志愿者组织列表
     */
    @PostMapping("/list")
    public R queryByList(@RequestBody PageComMngVolunteerOrgTeamDto comMngVolunteerOrgTeam) {
        return this.comMngVolunteerOrgTeamService.queryByList(comMngVolunteerOrgTeam);
    }

    /**
     * 社区后台-志愿者组织统计
     * @param communityId   社区id
     * @return  志愿者组织统计
     */
    @GetMapping("/statistics")
    public R statisticsVolunteerOrgAdmin(@RequestParam("communityId") Long communityId) {
        return this.comMngVolunteerOrgTeamService.statisticsVolunteerOrgAdmin(communityId);
    }

}


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

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

import com.panzhihua.common.model.dtos.common.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.service.ComMngVolunteerServiceTypeService;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

/**
 * 志愿者服务类型表(ComMngVolunteerServiceType)表控制层
 *
 * @author lyq
 * @since 2021-10-30 16:47:09
 */
@RestController
@RequestMapping("comMngVolunteerServiceType")
public class ComMngVolunteerServiceTypeApi {
    /**
     * 服务对象
     */
    @Resource
    private ComMngVolunteerServiceTypeService comMngVolunteerServiceTypeService;

    /**
     * 分页查询
     *
     * @param comMngVolunteerServiceType 筛选条件
     * @return 查询结果
     */
    @PostMapping("/page")
    public R queryByPage(@RequestBody PageComMngVolunteerServiceTypeDto comMngVolunteerServiceType) {
        return this.comMngVolunteerServiceTypeService.queryByPage(comMngVolunteerServiceType);
    }

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("{id}")
    public R queryById(@PathVariable("id") Long id) {
        return this.comMngVolunteerServiceTypeService.queryById(id);
    }

    /**
     * 新增数据
     *
     * @param comMngVolunteerServiceType 实体
     * @return 新增结果
     */
    @PostMapping("/add")
    public R add(@RequestBody AddComMngVolunteerServiceTypeDto comMngVolunteerServiceType) {
        return this.comMngVolunteerServiceTypeService.insert(comMngVolunteerServiceType);
    }

    /**
     * 编辑数据
     *
     * @param comMngVolunteerServiceType 实体
     * @return 编辑结果
     */
    @PutMapping("/edit")
    public R edit(@RequestBody EditComMngVolunteerServiceTypeDto comMngVolunteerServiceType) {
        return this.comMngVolunteerServiceTypeService.update(comMngVolunteerServiceType);
    }

    /**
     * 删除数据
     *
     * @param id 主键
     * @return 删除是否成功
     */
    @GetMapping("/delete")
    public R deleteById(Long id) {
        return this.comMngVolunteerServiceTypeService.deleteById(id);
    }

    /**
     * 社区后台-查询志愿者服务类型列表
     * @param comMngVolunteerServiceType    请求参数
     * @return  志愿者服务列表
     */
    @PostMapping("/list")
    public R queryByList(@RequestBody PageComMngVolunteerServiceTypeDto comMngVolunteerServiceType) {
        return this.comMngVolunteerServiceTypeService.queryByList(comMngVolunteerServiceType);
    }

}


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

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

import com.panzhihua.common.model.dtos.common.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.service.ComMngVolunteerSkillService;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

/**
 * 志愿者技能表(ComMngVolunteerSkill)表控制层
 *
 * @author lyq
 * @since 2021-10-30 16:47:36
 */
@RestController
@RequestMapping("comMngVolunteerSkill")
public class ComMngVolunteerSkillApi {
    /**
     * 服务对象
     */
    @Resource
    private ComMngVolunteerSkillService comMngVolunteerSkillService;

    /**
     * 分页查询
     *
     * @param comMngVolunteerSkill 筛选条件
     * @return 查询结果
     */
    @PostMapping("/page")
    public R queryByPage(@RequestBody PageComMngVolunteerSkillDto comMngVolunteerSkill) {
        return this.comMngVolunteerSkillService.queryByPage(comMngVolunteerSkill);
    }

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("{id}")
    public R queryById(@PathVariable("id") Long id) {
        return this.comMngVolunteerSkillService.queryById(id);
    }

    /**
     * 新增数据
     *
     * @param comMngVolunteerSkill 实体
     * @return 新增结果
     */
    @PostMapping("/add")
    public R add(@RequestBody AddComMngVolunteerSkillDto comMngVolunteerSkill) {
        return this.comMngVolunteerSkillService.insert(comMngVolunteerSkill);
    }

    /**
     * 编辑数据
     *
     * @param comMngVolunteerSkill 实体
     * @return 编辑结果
     */
    @PutMapping("/edit")
    public R edit(@RequestBody EditComMngVolunteerSkillDto comMngVolunteerSkill) {
        return this.comMngVolunteerSkillService.update(comMngVolunteerSkill);
    }

    /**
     * 删除数据
     *
     * @param id 主键
     * @return 删除是否成功
     */
    @GetMapping("/delete")
    public R deleteById(Long id) {
        return this.comMngVolunteerSkillService.deleteById(id);
    }

    /**
     * 社区后台-查询志愿者技能列表
     * @param comMngVolunteerSkill 请求参数
     * @return  志愿者技能列表
     */
    @PostMapping("/list")
    public R queryByList(@RequestBody PageComMngVolunteerSkillDto comMngVolunteerSkill) {
        return this.comMngVolunteerSkillService.queryByList(comMngVolunteerSkill);
    }

}


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

@@ -4,16 +4,12 @@

import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.*;

import javax.annotation.Resource;

import com.panzhihua.common.model.vos.community.ComActActivityTypeVO;
import com.panzhihua.common.model.vos.community.volunteer.ComMngVolunteerExcelVO;
import com.panzhihua.common.model.vos.user.SysTemplateConfigVO;
import com.panzhihua.service_community.dao.ComActActEvaluateDAO;
import com.panzhihua.service_community.model.dos.*;
@@ -22,14 +18,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
@@ -282,10 +271,12 @@
                    }
                    comActActivityVO1.setComActActPrizeVOList(comActActPrizeVOList);
                    Integer volunteerMax = comActActivityVO1.getVolunteerMax();
                    if (volunteerMax.intValue() != 0) {
                        comActActivityVO1.setType(1);
                    } else {
                        comActActivityVO1.setType(2);
                    if(comActActivityVO1.getType()==null){
                        if (volunteerMax.intValue() != 0) {
                            comActActivityVO1.setType(1);
                        } else {
                            comActActivityVO1.setType(2);
                        }
                    }
                    fillActivitySignList(id, comActActivityVO1);
                });
@@ -298,7 +289,7 @@

    /**
     * 社区后台分页查询社区活动
     * 
     *
     * @param comActActivityVO
     *            查询参数
     * @return 返回结果
@@ -906,7 +897,7 @@

    /**
     * 查询随手拍是否有活动
     * 
     *
     * @return 活动详情
     */
    @PostMapping("getEasyPhotoActivity")
@@ -1197,7 +1188,7 @@

    /**
     * 查询所有建筑类型
     * 
     *
     * @return 类型列表
     */
    @PostMapping("listbuildtype")
@@ -1207,7 +1198,7 @@

    /**
     * 分页查询 其他建筑
     * 
     *
     * @param comMngStructOtherBuildVO
     *            分页查询参数
     * @return 查询结果
@@ -1219,7 +1210,7 @@

    /**
     * 增加志愿者
     * 
     *
     * @param comMngVolunteerMngVO
     *            志愿者信息
     * @return 增加结果
@@ -1231,7 +1222,7 @@

    /**
     * 获取志愿者详情
     * 
     *
     * @param id
     * @return
     */
@@ -1409,8 +1400,8 @@
     */
    @PostMapping("listactivity")
    public R listActivity(@RequestParam("userId") Long userId,
                          @RequestParam(value = "status", required = false) Integer status) {
        return comActActivityService.listActivity(userId, status);
                          @RequestParam(value = "status", required = false) Integer status,@RequestParam(value = "type", required = false) Integer type) {
        return comActActivityService.listActivity(userId, status,type);
    }

    /**
@@ -2543,4 +2534,43 @@
    public R listMyActivityEvaluate(@RequestParam("userId") Long userId, @RequestParam("activityId") Long activityId) {
        return comActActEvaluateService.listMyActivityEvaluate(userId, activityId);
    }

    /**
     * 志愿者导入
     *
     * @param list        志愿者数据列表
     * @param communityId 社区id
     * @param userId      用户id
     * @return 导入结果
     */
    @PostMapping("/volunteer/import/admin")
    public R importVolunteerAdmin(@RequestBody List<ComMngVolunteerExcelVO> list,
                                  @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId) {
        return comMngVolunteerMngService.importVolunteerAdmin(list,communityId,userId);
    }

    /**
     * [方法描述] 根据社区ID查询所属城市所在区区域代码，
     *
     * @param communityId
     *            社区ID
     * @return String 区域code
     * @author manailin
     * @date 2022/2/17 10:09
     */
    @GetMapping("act/getActBelongRegionCode")
    public String getActBelongRegionCode(@RequestParam("communityId") Long communityId) {
        return comActActivityService.getActBelongRegionCode(communityId);
    }

    /**
     * 党员活动统计
     * @param communityId
     * @param year
     * @return
     */
    @GetMapping("activity/partyMemberCount")
    public R partyMemberCount(@RequestParam("communityId")Long communityId,@RequestParam("year")String year){
        return comActActivityService.partyMemberCount(communityId,year);
    }
}

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

@@ -37,7 +37,7 @@
     */
    @PostMapping("addstreet")
    @Transactional(rollbackFor = Exception.class)
    public R addStreet(@RequestBody ComStreetVO comStreetVO) {
    public R<ComStreetVO> addStreet(@RequestBody ComStreetVO comStreetVO) {
        return comStreetService.addStreet(comStreetVO);
    }


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/config/RabbitmqConfig.java

@@ -21,6 +21,10 @@
    public static final String Order_ROUTING_KEY="order.key";
    public static final String Order_EXCHANGE="order.exchange";

    public static final String RAFFLE_QUEUE="raffle.queue";
    public static final String RAFFLE_ROUTING_KEY="raffle.key";
    public static final String RAFFLE_EXCHANGE="raffle.exchange";

    public static final String McsOrder_QUEUE="mcsOrder.queue";
    public static final String McsOrder_ROUTING_KEY="mcsOrder.key";
    public static final String McsOrder_EXCHANGE="mcsOrder.exchange";
@@ -44,6 +48,23 @@
    }

    @Bean
    public Queue raffleQueue(){
        return new Queue(RAFFLE_QUEUE,true,false,false,null);
    }

    @Bean
    public Exchange raffleExchange(){
        Map<String, Object> arguments = new HashMap<>();
        arguments.put("x-delayed-type", ExchangeTypes.DIRECT);
        return new CustomExchange(RAFFLE_EXCHANGE,"x-delayed-message",true,false,arguments);
    }

    @Bean
    public Binding raffleBinding(){
        return BindingBuilder.bind(raffleQueue()).to(raffleExchange()).with(RAFFLE_ROUTING_KEY).noargs();
    }

    @Bean
    public Queue mcsOrderQueue(){
        return new Queue(McsOrder_QUEUE,true,false,false,null);
    }

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

@@ -4,10 +4,7 @@
import java.util.List;
import java.util.Map;

import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.vos.community.ComActActivityStatisticsVO;
import com.panzhihua.common.model.vos.community.ComActActivityTypeVO;
import com.panzhihua.common.model.vos.community.StatisticsCommVO;
import com.panzhihua.common.model.vos.community.*;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -16,9 +13,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.PageBaseDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityListDTO;
import com.panzhihua.common.model.vos.community.ComActActivityVO;
import com.panzhihua.common.model.vos.community.CommunityActivitiesVO;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.community.screen.work.ActActivityListVO;
import com.panzhihua.common.model.vos.screen.CarouselInfoVO;
import com.panzhihua.service_community.model.dos.ComActActivityDO;
@@ -46,7 +43,7 @@
        + "a.`status`, " + "a.is_qr_code, " + "a.publish_at, " + "a.begin_at, " + "a.cover, " + "a.end_at, " + "a.volunteer_max, "
        + "count(if(s.is_volunteer=1,s.id,null))volunteer_now, "
        + "count(if(s.is_volunteer=0,s.id,null))participant_now, " + "a.participant_max, " + "a.sign_up_begin, "
        + "a.sign_up_end, " + "ca.name as communityName  " + "FROM " + "com_act_activity a  "
        + "a.sign_up_end, " + "ca.name as communityName,a.type  " + "FROM " + "com_act_activity a  "
        + "left join sys_user u on a.sponsor_id=u.user_id " + "left join (select * from com_act_act_sign where `status` = 1) s on a.id=s.activity_id  "
        + "left join com_act ca on a.community_id=ca.community_id  " + " where 1=1 " +

@@ -64,10 +61,9 @@
        + "<if test='comActActivityVO.isApplets != null and comActActivityVO.isApplets ==1'>"
        + "AND a.`status` != 1 AND  a.`status` != 6   " + " </if> " + "<if test='comActActivityVO.beginAt != null '>"
        + "AND a.begin_at <![CDATA[ >= ]]> #{comActActivityVO.beginAt} AND a.end_at <![CDATA[ <= ]]> #{comActActivityVO.endAt}  "
        + " </if> " + "<if test='comActActivityVO.type != null and comActActivityVO.type==1 '>"
        + "AND a.volunteer_max!=0  " + " </if> "
        + "<if test='comActActivityVO.type != null and comActActivityVO.type==2 '>" + "AND a.volunteer_max=0  "
        + " </if> " + " group by a.id " + " order by a.status asc,a.publish_at desc " + "</script>")
        + " </if> " + "<if test='comActActivityVO.type != null'>"
        + "AND a.type=#{comActActivityVO.type} " + " </if> "
        + " group by a.id " + " ORDER BY a.status = 99 desc,a.publish_at DESC " + "</script>")
    IPage<ComActActivityVO> pageActivity(Page page, @Param("comActActivityVO") ComActActivityVO comActActivityVO);

//    @Select("SELECT  " + "u.name sponsorName, " + "ca.name communityName, "
@@ -270,4 +266,54 @@
    StatisticsCommVO getActTotalPolylineData(@Param("communityId") Long communityId, @Param("isResidentAct") boolean isResidentAct, @Param("date") String date);

    IPage<ComActActivityVO> indexActList(@Param("page") Page page, @Param("pageBaseDTO") PageBaseDTO pageBaseDTO, @Param("isResidentAct") boolean isResidentAct);

    /**
     * 查询项目活动列表
     * @param page
     * @return
     */
    IPage<ActActivityListVO> selectProjectActivity(Page page);

    /**
     * 根据社工id查询活动列表
     * @param page
     * @param id
     * @return
     */
    IPage<ActActivityListVO> selectActivityBySocialWorker(Page page,@Param("id")Long id);

    /**
     * [方法描述] 根据社区ID查询所属城市所在区区域代码，
     *
     * @param communityId
     *            社区ID
     * @return String 区域code
     * @author manailin
     * @date 2022/2/17 10:09
     */
    String getActBelongRegionCode(@Param("communityId") Long communityId);

    /**
     * 查询党员活动数量
     * @param communityId
     * @return
     */
    PartyActivityStatics selectActivityStatics(Long communityId);

    /**
     * 党员活动饼状图
     * @param communityId
     * @return
     */
    List<PartyActivityTypeChart> selectActivityChart(Long communityId);

    /**
     * 党员活动柱状图
     * @param communityId
     * @param year
     * @param date
     * @return
     */
    Integer selectActivityLine(@Param("communityId") Long communityId,@Param("year")String year,@Param("date")String date);

}

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

@@ -4,9 +4,13 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.community.ComActColumnLevelVO;
import com.panzhihua.common.model.vos.community.ComActColumnVO;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.ComActColumn;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * 分类列表(ComActColumn)表数据库访问层
@@ -24,4 +28,10 @@
     */
    IPage<ComActColumn> pageList(Page page, @Param("commonPage") CommonPage commonPage);

    /**
     * 项目级联查询
     * @param comActColumnVO
     * @return
     */
    List<ComActColumnLevelVO> queryLevel(ComActColumnVO comActColumnVO);
}

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

New file
@@ -0,0 +1,37 @@
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.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.raffle.ComActRaffleVO;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.ComActRaffle;
import org.apache.ibatis.annotations.Param;

/**
 * 抽奖活动表(ComActRaffle)表数据库访问层
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 抽奖活动表相关功能
 *
 * @author zzj
 * @since 2022-02-18 14:31:19
 */
@Mapper
public interface ComActRaffleDao extends BaseMapper<ComActRaffle> {
    /**
     * 分页查询列表
     * @param page
     * @param commonPage
     * @return
     */
    IPage<ComActRaffleVO> pageList(Page page, @Param("commonPage")CommonPage commonPage);

    /**
     * 详情
     * @param id
     * @return
     */
    ComActRaffleVO selectById(Long id);
}

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

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

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.common.model.vos.community.raffle.ComActRafflePrizeCount;
import com.panzhihua.common.model.vos.community.raffle.ComActRafflePrizeVO;
import com.panzhihua.common.model.vos.community.raffle.ComActRaffleRecordVO;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.ComActRafflePrize;

import java.util.List;

/**
 * 抽奖活动奖品表(ComActRafflePrize)表数据库访问层
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 抽奖活动奖品表相关功能
 *
 * @author zzj
 * @since 2022-02-18 14:31:45
 */
@Mapper
public interface ComActRafflePrizeDao extends BaseMapper<ComActRafflePrize> {
    /**
     * 根据抽奖id查询奖品列表
     * @param id
     * @return
     */
    List<ComActRafflePrizeVO> selectByRaffleId(Long id);

    /**
     *
     * 查询奖品统计
     * @param id
     * @return
     */
    ComActRafflePrizeCount selectCount(Long id);
}

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

New file
@@ -0,0 +1,64 @@
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.property.CommonPage;
import com.panzhihua.common.model.vos.community.raffle.ComActRaffleRecordExcelVO;
import com.panzhihua.common.model.vos.community.raffle.ComActRaffleRecordVO;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.ComActRaffleRecord;
import org.apache.ibatis.annotations.Param;
import org.springframework.web.bind.annotation.RequestParam;

import java.util.List;

/**
 * 抽奖活动中奖记录表(ComActRaffleRecord)表数据库访问层
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 抽奖活动中奖记录表相关功能
 *
 * @author zzj
 * @since 2022-02-18 14:32:01
 */
@Mapper
public interface ComActRaffleRecordDao extends BaseMapper<ComActRaffleRecord> {
    /**
     * 根据用户id活动id查询中奖情况
     * @param userId
     * @param raffleId
     * @return
     */
    ComActRaffleRecordVO selectByUserId(@Param("userId")Long userId,@Param("raffleId")Long raffleId);

    /**
     * 分页查询
     * @param page
     * @param commonPage
     * @return
     */
    IPage<ComActRaffleRecordVO> pageList(Page page, @Param("commonPage")CommonPage commonPage);

    /**
     * 导出
     * @param commonPage
     * @return
     */
    List<ComActRaffleRecordExcelVO> export(@Param("commonPage")CommonPage commonPage);


    /**
     * 根据id查询
     * @param id
     * @return
     */
    ComActRaffleRecordVO selectOneById(Long id);


    /**
     * 抽奖活动失效设置
     * @param id
     * @return
     */
    Integer updateStatusByRaffleId(Long id);
}

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

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

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveSubListVO;
import com.panzhihua.service_community.model.dos.ComActReserveAnswerContentDO;
import com.panzhihua.service_community.model.dos.ComActReserveSubDO;
import java.util.List;

import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveSubListVO;
import com.panzhihua.service_community.model.dos.ComActReserveSubDO;

/**
 * @auther lyq
@@ -25,5 +25,5 @@
    List<ComActReserveSubListVO> getReserveSubjectList(@Param("reserveId") Long reserveId);



    List<String> subjectSelectionListAdmin(@Param("reserveSubId") Long reserveSubId);
}

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

New file
@@ -0,0 +1,33 @@
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.property.CommonPage;
import com.panzhihua.common.model.vos.ComActSocialMemberVO;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.ComActSocialMember;
import org.apache.ibatis.annotations.Param;

/**
 * 社会组织成员表(ComActSocialMember)表数据库访问层
 *
 * @author makejava
 * @since 2021-10-22 09:52:46
 */
@Mapper
public interface ComActSocialMemberDao extends BaseMapper<ComActSocialMember> {
    /**
     * 分页查询
     * @param page
     * @param commonPage
     * @return
     */
    IPage<ComActSocialMemberVO> pageList(Page page, @Param("commonPage")CommonPage commonPage);

    /**
     * 详情
     * @return
     */
    ComActSocialMemberVO detail(Long id);
}

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

@@ -5,9 +5,13 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.community.ComActSocialOrgVO;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkProjectTypeInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkSocialOrgInfo;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.ComActSocialOrg;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * 社会组织(ComActSocialOrg)表数据库访问层
@@ -24,4 +28,24 @@
     * @return
     */
    IPage<ComActSocialOrgVO> pageList(Page page, @Param("commonPage")CommonPage commonPage);

    /**
     * 主键查询
     * @param id
     * @return
     */
    ComActSocialOrgVO detail(Long id);

    /**
     * 查询社会组织数据
     * @return
     */
    BigScreenHmkSocialOrgInfo selectInfo(Long communityId);


    /**
     * 查询社会组织饼状图
     * @return
     */
    List<BigScreenHmkProjectTypeInfo> selectType(Long communityId);
}

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

New file
@@ -0,0 +1,83 @@
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.property.CommonPage;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenActivityLine;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkBaseInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkProjectInfo;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkProjectTypeInfo;
import com.panzhihua.common.model.vos.community.social.SocialProjectVO;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.ComActSocialProject;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * 三社联动项目表(ComActSocialProject)表数据库访问层
 *
 * @author makejava
 * @since 2021-12-22 14:02:46
 */
@Mapper
public interface ComActSocialProjectDao extends BaseMapper<ComActSocialProject> {

    /**
     * 分页查询
     * @param page
     * @param commonPage
     * @return
     */
    IPage<SocialProjectVO> pageList(Page page, @Param("commonPage")CommonPage commonPage);

    /**
     * 小程序查询项目详情
     * @param id
     * @return
     */
    SocialProjectVO getByApplet(Long id);

    /**
     * 河门口大屏项目基础数据
     * @return
     */
    BigScreenHmkProjectInfo selectBaseInfo(Long communityId);

    /**
     * 河门口大屏项目分类
     * @param orgName
     * @param communityId
     * @return
     */
    List<BigScreenHmkProjectTypeInfo> selectType(@Param("orgName")String orgName,@Param("communityId")Long communityId);

    /**
     * 根据活动类型查询数量
     * @param type
     * @return
     */
    Integer selectActivity(@Param("type") Integer type,@Param("communityId")Long communityId);

    /**
     * 首页基础数据
     * @return
     */
    BigScreenHmkBaseInfo selectIndexBaseInfo();

    /**
     * 河门口大屏活动折线
     * @param date
     * @param year
     * @return
     */
    BigScreenActivityLine selectActivityCountMonth(@Param("date") String date,@Param("year") String year);

    /**
     * id查询
     * @param id
     * @return
     */
    SocialProjectVO selectByLevel(Long id);
}

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

New file
@@ -0,0 +1,28 @@
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.property.CommonPage;
import com.panzhihua.common.model.vos.community.social.ComActSocialProjectMemberVO;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.ComActSocialProjectMember;
import org.apache.ibatis.annotations.Param;

/**
 * 项目人员(ComActSocialProjectMember)表数据库访问层
 *
 * @author makejava
 * @since 2021-12-23 15:16:42
 */
@Mapper
public interface ComActSocialProjectMemberDao extends BaseMapper<ComActSocialProjectMember> {

    /**
     * 分页查询
     * @param page
     * @param commonPage
     * @return
     */
    IPage<ComActSocialProjectMemberVO> pageList(Page page, @Param("commonPage")CommonPage commonPage);
}

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

New file
@@ -0,0 +1,34 @@
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.property.CommonPage;
import com.panzhihua.common.model.vos.community.social.ComActSocialProjectPublicityVO;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.ComActSocialProjectPublicity;
import org.apache.ibatis.annotations.Param;

/**
 * 项目宣传表(ComActSocialProjectPublicity)表数据库访问层
 *
 * @author makejava
 * @since 2021-12-23 14:30:54
 */
@Mapper
public interface ComActSocialProjectPublicityDao extends BaseMapper<ComActSocialProjectPublicity> {
    /**
     * 分页查询
     * @param page
     * @param commonPage
     * @return
     */
    IPage<ComActSocialProjectPublicityVO> pageList(Page page, @Param("commonPage")CommonPage commonPage);

    /**
     * 详情
     * @param id
     * @return
     */
    ComActSocialProjectPublicityVO selectOne(Long id);
}

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

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

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

/**
 * 项目进度表(ComActSocialProjectSchedule)表数据库访问层
 *
 * @author makejava
 * @since 2021-12-23 14:31:15
 */
@Mapper
public interface ComActSocialProjectScheduleDao extends BaseMapper<ComActSocialProjectSchedule> {

}

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

New file
@@ -0,0 +1,66 @@
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.civil.ComActSocialExportVO;
import com.panzhihua.common.model.dtos.civil.ComActSocialWorkerExcelVO;
import com.panzhihua.common.model.dtos.civil.PageComActSocialWorkerDTO;
import com.panzhihua.common.model.vos.civil.ComActSocialWorkerVO;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkProjectTypeInfo;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.ComActSocialWorker;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * 社工(ComActSocialWorker)表数据库访问层
 *
 * @author makejava
 * @since 2021-10-25 10:56:47
 */
@Mapper
public interface ComActSocialWorkerDao extends BaseMapper<ComActSocialWorker> {
    /**
     * 分页查询
     * @param pageComActSocialWorkerDTO
     * @return
     */
    IPage<ComActSocialWorkerVO> findByPage(Page page, @Param("pageComActSocialWorkerDTO") PageComActSocialWorkerDTO pageComActSocialWorkerDTO);

    /**
     * 导出
     * @param comActSocialWorkerDO
     * @return
     */
    List<ComActSocialWorkerExcelVO> queryAll(ComActSocialExportVO comActSocialWorkerDO);

    /**
     * 查询社工人数
     * @param type
     * @return
     */
    Integer selectType(@Param("type") Integer type,@Param("communityId")Long communityId);

    /**
     * 社工技能分布查询
     * @return
     */
    List<BigScreenHmkProjectTypeInfo> selectSkillType(Long communityId);

    /**
     * 活动社工查询
     * @param page
     * @param id
     * @return
     */
    IPage<ComActSocialWorkerVO> selectActivity(Page page,@Param("id") Long id);

    /**
     * 查询社工详情
     * @param id
     * @return
     */
    ComActSocialWorkerVO selectOneById(Long id);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActSocialWorkerServiceDao.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.property.CommonPage;
import com.panzhihua.common.model.vos.community.social.ComActSocialWorkerServiceVO;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.ComActSocialWorkerService;
import org.apache.ibatis.annotations.Param;

/**
 * 社工服务表(ComActSocialWorkerService)表数据库访问层
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 社工服务表相关功能
 *
 * @author zzj
 * @since 2022-02-16 15:59:41
 */
@Mapper
public interface ComActSocialWorkerServiceDao extends BaseMapper<ComActSocialWorkerService> {
    /**
     * 根据userId获取服务信息
     * @param page
     * @param commonPage
     * @return
     */
    IPage<ComActSocialWorkerServiceVO> pageList(Page page, @Param("commonPage") CommonPage commonPage);

    /**
     * 详情
     * @param id
     * @return
     */
    ComActSocialWorkerServiceVO getById(Long id);
}

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

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

import java.util.List;

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.fms.PageFmsClassroomAdminDTO;
import com.panzhihua.common.model.dtos.community.fms.PageFmsEventAdminDTO;
import com.panzhihua.common.model.vos.community.fms.ComFmsClassroomVO;
import com.panzhihua.common.model.vos.community.fms.FmsClassroomTopStatisticsVO;
import com.panzhihua.common.model.vos.community.fms.FmsEventTopStatisticsVO;
import com.panzhihua.common.model.vos.community.fms.FmsEventVO;
import com.panzhihua.common.model.vos.grid.EventVO;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.ComFmsClassroom;

/**
 * 五微服务-微学堂(ComFmsClassroom)表数据库访问层
 *
 * @author makejava
 * @since 2022-02-11 13:35:51
 */
@Mapper
public interface ComFmsClassroomDAO extends BaseMapper<ComFmsClassroom> {

    /**
     * 批量新增数据（MyBatis原生foreach方法）
     *
     * @param entities
     *            List<ComFmsClassroom> 实例对象列表
     * @return 影响行数
     */
    int insertBatch(@Param("entities") List<ComFmsClassroom> entities);

    /**
     * 批量新增或按主键更新数据（MyBatis原生foreach方法）
     *
     * @param entities
     *            List<ComFmsClassroom> 实例对象列表
     * @return 影响行数
     * @throws org.springframework.jdbc.BadSqlGrammarException
     *             入参是空List的时候会抛SQL语句错误的异常，请自行校验入参
     */
    int insertOrUpdateBatch(@Param("entities") List<ComFmsClassroom> entities);

    /**
     * 后台分页查询微讲堂
     * @param page
     * @param adminDTO
     * @return
     */
    IPage<ComFmsClassroomVO> pageFmsClassroomAdmin(@Param("page") Page page, @Param("adminDTO") PageFmsClassroomAdminDTO adminDTO);

    /**
     * 微讲堂顶部统计数据查询
     * @param communityId
     * @return
     */
    FmsClassroomTopStatisticsVO statisticsFmsClassroom(@Param("communityId") Long communityId);

    /**
     * 后台分页查询微调节/微防控
     * @param page
     * @param adminDTO
     * @return
     */
    IPage<FmsEventVO> pageFmsEvent(@Param("page") Page page, @Param("adminDTO") PageFmsEventAdminDTO adminDTO);

    /**
     * 微调节/微防控顶部统计
     * @param type
     * @param communityId
     * @return
     */
    FmsEventTopStatisticsVO statisticsFmsEvent(@Param("type") Integer type, @Param("communityId") Long communityId);

    /**
     * 小程序分页查询微调节/微防控
     * @param page
     * @param adminDTO
     * @return
     */
    IPage<EventVO> pageFmsEventApplets(@Param("page") Page page, @Param("adminDTO") PageFmsEventAdminDTO adminDTO);
}

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

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

import java.util.List;

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.fms.PageFmsServiceAdminDTO;
import com.panzhihua.common.model.dtos.community.fms.PageFmsServiceAppletsDTO;
import com.panzhihua.common.model.vos.community.fms.ComFmsServiceVO;
import com.panzhihua.common.model.vos.community.fms.FmsServiceTopStatisticsVO;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.ComFmsService;

/**
 * 五微服务-微服务(ComFmsService)表数据库访问层
 *
 * @author makejava
 * @since 2022-02-11 13:35:52
 */
@Mapper
public interface ComFmsServiceDAO extends BaseMapper<ComFmsService> {

    /**
     * 批量新增数据（MyBatis原生foreach方法）
     *
     * @param entities
     *            List<ComFmsService> 实例对象列表
     * @return 影响行数
     */
    int insertBatch(@Param("entities") List<ComFmsService> entities);

    /**
     * 批量新增或按主键更新数据（MyBatis原生foreach方法）
     *
     * @param entities
     *            List<ComFmsService> 实例对象列表
     * @return 影响行数
     * @throws org.springframework.jdbc.BadSqlGrammarException
     *             入参是空List的时候会抛SQL语句错误的异常，请自行校验入参
     */
    int insertOrUpdateBatch(@Param("entities") List<ComFmsService> entities);

    /**
     * 后台分页查询微服务
     * @param page
     * @param adminDTO
     * @return
     */
    IPage<ComFmsServiceVO> pageFmsServiceAdmin(@Param("page") Page page, @Param("adminDTO") PageFmsServiceAdminDTO adminDTO);

    /**
     * 后台查看微服务详情
     * @param serviceId
     * @return
     */
    ComFmsServiceVO detailFmsServiceAdmin(@Param("serviceId") Long serviceId);

    /**
     * 微服务顶部统计数据查询
     * @param communityId
     * @return
     */
    FmsServiceTopStatisticsVO statisticsFmsService(@Param("communityId") Long communityId);

    /**
     * 小程序分页查询微服务
     * @param page
     * @param adminDTO
     * @return
     */
    IPage<ComFmsServiceVO> pageFmsServiceAdminApplets(@Param("page") Page page, @Param("adminDTO") PageFmsServiceAppletsDTO adminDTO);

    /**
     * 小程序查看微服务详情
     * @param serviceId
     * @return
     */
    ComFmsServiceVO detailFmsServiceApplets(@Param("serviceId") Long serviceId);

    /**
     * 分页查询我的微服务
     * @param page
     * @param adminDTO
     * @return
     */
    IPage<ComFmsServiceVO> pageMyFmsService(@Param("page") Page page, @Param("adminDTO") PageFmsServiceAppletsDTO adminDTO);

    /**
     * 微团队成员分页查询服务处理
     * @param page
     * @param adminDTO
     * @return
     */
    IPage<ComFmsServiceVO> pageDealFmsService(@Param("page") Page page, @Param("adminDTO") PageFmsServiceAppletsDTO adminDTO);
}

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

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

import java.util.List;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.ComFmsServiceEvaluations;

/**
 * 五微服务-服务评价(ComFmsServiceEvaluations)表数据库访问层
 *
 * @author makejava
 * @since 2022-02-11 13:35:53
 */
@Mapper
public interface ComFmsServiceEvaluationsDAO extends BaseMapper<ComFmsServiceEvaluations> {

    /**
     * 批量新增数据（MyBatis原生foreach方法）
     *
     * @param entities
     *            List<ComFmsServiceEvaluations> 实例对象列表
     * @return 影响行数
     */
    int insertBatch(@Param("entities") List<ComFmsServiceEvaluations> entities);

    /**
     * 批量新增或按主键更新数据（MyBatis原生foreach方法）
     *
     * @param entities
     *            List<ComFmsServiceEvaluations> 实例对象列表
     * @return 影响行数
     * @throws org.springframework.jdbc.BadSqlGrammarException
     *             入参是空List的时候会抛SQL语句错误的异常，请自行校验入参
     */
    int insertOrUpdateBatch(@Param("entities") List<ComFmsServiceEvaluations> entities);

}

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

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

import java.util.List;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.ComFmsServiceRecord;

/**
 * 五微服务-服务记录(ComFmsServiceRecord)表数据库访问层
 *
 * @author makejava
 * @since 2022-02-11 13:35:54
 */
@Mapper
public interface ComFmsServiceRecordDAO extends BaseMapper<ComFmsServiceRecord> {

    /**
     * 批量新增数据（MyBatis原生foreach方法）
     *
     * @param entities
     *            List<ComFmsServiceRecord> 实例对象列表
     * @return 影响行数
     */
    int insertBatch(@Param("entities") List<ComFmsServiceRecord> entities);

    /**
     * 批量新增或按主键更新数据（MyBatis原生foreach方法）
     *
     * @param entities
     *            List<ComFmsServiceRecord> 实例对象列表
     * @return 影响行数
     * @throws org.springframework.jdbc.BadSqlGrammarException
     *             入参是空List的时候会抛SQL语句错误的异常，请自行校验入参
     */
    int insertOrUpdateBatch(@Param("entities") List<ComFmsServiceRecord> entities);

}

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

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

import java.util.List;

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.fms.PageFmsTeamDTO;
import com.panzhihua.common.model.vos.community.fms.ComFmsTeamVO;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.ComFmsTeam;

/**
 * 五微服务-微团队(ComFmsTeam)表数据库访问层
 *
 * @author makejava
 * @since 2022-02-11 13:35:54
 */
@Mapper
public interface ComFmsTeamDAO extends BaseMapper<ComFmsTeam> {

    /**
     * 批量新增数据（MyBatis原生foreach方法）
     *
     * @param entities
     *            List<ComFmsTeam> 实例对象列表
     * @return 影响行数
     */
    int insertBatch(@Param("entities") List<ComFmsTeam> entities);

    /**
     * 批量新增或按主键更新数据（MyBatis原生foreach方法）
     *
     * @param entities
     *            List<ComFmsTeam> 实例对象列表
     * @return 影响行数
     * @throws org.springframework.jdbc.BadSqlGrammarException
     *             入参是空List的时候会抛SQL语句错误的异常，请自行校验入参
     */
    int insertOrUpdateBatch(@Param("entities") List<ComFmsTeam> entities);

    /**
     * 小程序分页查询团队信息
     * @param page
     * @param pageFmsTeamDTO
     * @return
     */
    IPage<ComFmsTeamVO> pageFmsTeamApplets(@Param("page") Page page, @Param("pageFmsTeamDTO") PageFmsTeamDTO pageFmsTeamDTO);

    /**
     * 小程序查询团队信息
     * @param pageFmsTeamDTO
     * @return
     */
    List<ComFmsTeamVO> listFmsTeamApplets(@Param("pageFmsTeamDTO") PageFmsTeamDTO pageFmsTeamDTO);
}

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

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

import java.util.List;

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.fms.PageTeamMemberDTO;
import com.panzhihua.common.model.vos.community.fms.ComFmsTeamMemberExportExcelVO;
import com.panzhihua.common.model.vos.community.fms.ComFmsTeamMemberVO;
import com.panzhihua.common.model.vos.community.fms.TeamMemberTopStatisticsVO;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.ComFmsTeamMember;

/**
 * 五微服务-团队成员(ComFmsTeamMember)表数据库访问层
 *
 * @author makejava
 * @since 2022-02-11 13:35:55
 */
@Mapper
public interface ComFmsTeamMemberDAO extends BaseMapper<ComFmsTeamMember> {

    /**
     * 批量新增数据（MyBatis原生foreach方法）
     *
     * @param entities
     *            List<ComFmsTeamMember> 实例对象列表
     * @return 影响行数
     */
    int insertBatch(@Param("entities") List<ComFmsTeamMember> entities);

    /**
     * 批量新增或按主键更新数据（MyBatis原生foreach方法）
     *
     * @param entities
     *            List<ComFmsTeamMember> 实例对象列表
     * @return 影响行数
     * @throws org.springframework.jdbc.BadSqlGrammarException
     *             入参是空List的时候会抛SQL语句错误的异常，请自行校验入参
     */
    int insertOrUpdateBatch(@Param("entities") List<ComFmsTeamMember> entities);

    /**
     * 分页查询团队成员
     * @param page
     * @param pageTeamMemberDTO
     * @return
     */
    IPage<ComFmsTeamMemberVO> pageFmsTeamMember(@Param("page") Page page, @Param("pageTeamMemberDTO") PageTeamMemberDTO pageTeamMemberDTO);

    /**
     * 获取成员数量
     * @param communityId
     * @param idCard
     * @param phone
     * @return
     */
    Integer countMember(@Param("communityId") Long communityId, @Param("idCard") String idCard, @Param("phone") String phone);

    /**
     * 微团队顶部统计
     * @param communityId
     * @return
     */
    TeamMemberTopStatisticsVO statisticsFmsTeamMember(@Param("communityId") Long communityId);

    /**
     * 获取团队人员导出数据
     * @param pageTeamMemberDTO
     * @return
     */
    List<ComFmsTeamMemberExportExcelVO> exportTeamMember(@Param("pageTeamMemberDTO") PageTeamMemberDTO pageTeamMemberDTO);

    /**
     * 通过社区id获取团队成员
     * @param communityId
     * @return
     */
    List<ComFmsTeamMemberVO> selectListByCommunityId(@Param("communityId") Long communityId);

    /**
     * 通过团队id查询团队成员
     * @param teamId
     * @return
     */
    List<ComFmsTeamMemberVO> selectVOListByTeamId(@Param("teamId") Long teamId);
}

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

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

import java.util.List;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.ComFmsTeamMemberRelation;

/**
 * 五微服务-团队&成员关系表(ComFmsTeamMemberRelation)表数据库访问层
 *
 * @author makejava
 * @since 2022-02-14 14:41:35
 */
@Mapper
public interface ComFmsTeamMemberRelationDAO extends BaseMapper<ComFmsTeamMemberRelation> {

    /**
     * 批量新增数据（MyBatis原生foreach方法）
     *
     * @param entities
     *            List<ComFmsTeamMemberRelation> 实例对象列表
     * @return 影响行数
     */
    int insertBatch(@Param("entities") List<ComFmsTeamMemberRelation> entities);

    /**
     * 批量新增或按主键更新数据（MyBatis原生foreach方法）
     *
     * @param entities
     *            List<ComFmsTeamMemberRelation> 实例对象列表
     * @return 影响行数
     * @throws org.springframework.jdbc.BadSqlGrammarException
     *             入参是空List的时候会抛SQL语句错误的异常，请自行校验入参
     */
    int insertOrUpdateBatch(@Param("entities") List<ComFmsTeamMemberRelation> entities);

}

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

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

import java.util.List;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.ComFmsTeamType;

/**
 * 五微服务-团队类型(ComFmsTeamType)表数据库访问层
 *
 * @author makejava
 * @since 2022-02-11 13:35:56
 */
@Mapper
public interface ComFmsTeamTypeDAO extends BaseMapper<ComFmsTeamType> {

    /**
     * 批量新增数据（MyBatis原生foreach方法）
     *
     * @param entities
     *            List<ComFmsTeamType> 实例对象列表
     * @return 影响行数
     */
    int insertBatch(@Param("entities") List<ComFmsTeamType> entities);

    /**
     * 批量新增或按主键更新数据（MyBatis原生foreach方法）
     *
     * @param entities
     *            List<ComFmsTeamType> 实例对象列表
     * @return 影响行数
     * @throws org.springframework.jdbc.BadSqlGrammarException
     *             入参是空List的时候会抛SQL语句错误的异常，请自行校验入参
     */
    int insertOrUpdateBatch(@Param("entities") List<ComFmsTeamType> entities);

}

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

@@ -21,24 +21,13 @@
 **/
@Mapper
public interface ComMngVolunteerMngDAO extends BaseMapper<ComMngVolunteerMngDO> {
    // @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" + "id,\n" + "`name`,\n" + "photo_path,\n" + "phone,\n" + "integral,\n"
        + "create_at \n" + "FROM\n" + "com_mng_volunteer_mng \n"
        + " where state=2 and community_id = ${comMngVolunteerMngVO.communityId}"
        + "<if test='comMngVolunteerMngVO.name != null and comMngVolunteerMngVO.name.trim() != &quot;&quot;'>"
        + " and name like concat(#{comMngVolunteerMngVO.name},'%')  \n" + " </if> "
        + "<if test='comMngVolunteerMngVO.phone != null and comMngVolunteerMngVO.phone.trim() != &quot;&quot;'>"
        + "AND phone like concat(#{comMngVolunteerMngVO.phone},'%') " + " </if> "
        + " order by integral desc,create_at desc" + "</script>")

    /**
     * 分页查询志愿者列表
     * @param page  分页参数
     * @param comMngVolunteerMngVO  请求参数
     * @return  志愿者列表
     */
    IPage<ComMngVolunteerMngVO> pageVolunteer(Page page,
        @Param("comMngVolunteerMngVO") ComMngVolunteerMngVO comMngVolunteerMngVO);

@@ -63,4 +52,7 @@
    @Select("select user_id from sys_user where type=1 and phone=#{phone}")
    Long selectUserIdByPhone(String phone);

    @Select("select id_card from sys_user where type=1 and phone=#{idCard}")
    Long selectUserIdByIdCard(String idCard);

}

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

New file
@@ -0,0 +1,71 @@
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.common.*;
import com.panzhihua.common.model.vos.common.*;
import com.panzhihua.service_community.model.dos.ComMngVolunteerOrgTeam;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * 志愿者组织队伍表表数据库访问层
 *
 * @author lyq
 * @since 2021-10-30 16:20:44
 */
@Mapper
public interface ComMngVolunteerOrgTeamMapper extends BaseMapper<ComMngVolunteerOrgTeam>  {

    /**
     * 通过ID查询单条数据
     *
     * @param id 主键
     * @return 实例对象
     */
    ComMngVolunteerOrgTeamVo queryById(Long id);

    /**
     * 查询指定行数据
     *
     * @param comMngVolunteerOrgTeam 查询条件
     * @param page         分页对象
     * @return 对象列表
     */
    IPage<ComMngVolunteerOrgTeamVo> queryAllByLimit(@Param("dto") PageComMngVolunteerOrgTeamDto comMngVolunteerOrgTeam, Page page);

    /**
     * 批量新增数据（MyBatis原生foreach方法）
     *
     * @param entities List<ComMngVolunteerOrgTeam> 实例对象列表
     * @return 影响行数
     */
    int insertBatch(@Param("entities") List<ComMngVolunteerOrgTeam> entities);

    /**
     * 批量新增或按主键更新数据（MyBatis原生foreach方法）
     *
     * @param entities List<ComMngVolunteerOrgTeam> 实例对象列表
     * @return 影响行数
     * @throws org.springframework.jdbc.BadSqlGrammarException 入参是空List的时候会抛SQL语句错误的异常，请自行校验入参
     */
    int insertOrUpdateBatch(@Param("entities") List<ComMngVolunteerOrgTeam> entities);

    /**
     * 社区后台-查询志愿者组织列表
     * @param comMngVolunteerOrgTeam    请求参数
     * @return  志愿者组织列表
     */
    List<ComMngVolunteerOrgTeamVo> queryAll(@Param("dto") PageComMngVolunteerOrgTeamDto comMngVolunteerOrgTeam);

    /**
     * 社区后台-志愿者组织统计
     * @param communityId   社区id
     * @return  志愿者组织统计
     */
    ComMngVolunteerStatisticsVo statisticsVolunteerOrgAdmin(@Param("communityId") Long communityId);
}


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

New file
@@ -0,0 +1,64 @@
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.common.*;
import com.panzhihua.common.model.vos.common.*;
import com.panzhihua.service_community.model.dos.ComMngVolunteerServiceType;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * 志愿者服务类型表表数据库访问层
 *
 * @author lyq
 * @since 2021-10-30 16:47:09
 */
@Mapper
public interface ComMngVolunteerServiceTypeMapper extends BaseMapper<ComMngVolunteerServiceType> {

    /**
     * 通过ID查询单条数据
     *
     * @param id 主键
     * @return 实例对象
     */
    ComMngVolunteerServiceTypeVo queryById(Long id);

    /**
     * 查询指定行数据
     *
     * @param comMngVolunteerServiceType 查询条件
     * @param page                   分页对象
     * @return 对象列表
     */
    IPage<ComMngVolunteerServiceTypeVo> queryAllByLimit(@Param("dto") PageComMngVolunteerServiceTypeDto comMngVolunteerServiceType, Page page);

    /**
     * 批量新增数据（MyBatis原生foreach方法）
     *
     * @param entities List<ComMngVolunteerServiceType> 实例对象列表
     * @return 影响行数
     */
    int insertBatch(@Param("entities") List<ComMngVolunteerServiceType> entities);

    /**
     * 批量新增或按主键更新数据（MyBatis原生foreach方法）
     *
     * @param entities List<ComMngVolunteerServiceType> 实例对象列表
     * @return 影响行数
     * @throws org.springframework.jdbc.BadSqlGrammarException 入参是空List的时候会抛SQL语句错误的异常，请自行校验入参
     */
    int insertOrUpdateBatch(@Param("entities") List<ComMngVolunteerServiceType> entities);

    /**
     * 查询所有志愿者服务类型列表
     * @param comMngVolunteerServiceType    请求参数
     * @return  志愿者服务列表
     */
    List<ComMngVolunteerServiceTypeVo> queryAll(@Param("dto") PageComMngVolunteerServiceTypeDto comMngVolunteerServiceType);
}


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

New file
@@ -0,0 +1,64 @@
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.common.*;
import com.panzhihua.common.model.vos.common.*;
import com.panzhihua.service_community.model.dos.ComMngVolunteerSkill;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * 志愿者技能表表数据库访问层
 *
 * @author lyq
 * @since 2021-10-30 16:47:36
 */
@Mapper
public interface ComMngVolunteerSkillMapper extends BaseMapper<ComMngVolunteerSkill> {

    /**
     * 通过ID查询单条数据
     *
     * @param id 主键
     * @return 实例对象
     */
    ComMngVolunteerSkillVo queryById(Long id);

    /**
     * 查询指定行数据
     *
     * @param comMngVolunteerSkill 查询条件
     * @param page             分页对象
     * @return 对象列表
     */
    IPage<ComMngVolunteerSkillVo> queryAllByLimit(@Param("dto") PageComMngVolunteerSkillDto comMngVolunteerSkill, Page page);

    /**
     * 批量新增数据（MyBatis原生foreach方法）
     *
     * @param entities List<ComMngVolunteerSkill> 实例对象列表
     * @return 影响行数
     */
    int insertBatch(@Param("entities") List<ComMngVolunteerSkill> entities);

    /**
     * 批量新增或按主键更新数据（MyBatis原生foreach方法）
     *
     * @param entities List<ComMngVolunteerSkill> 实例对象列表
     * @return 影响行数
     * @throws org.springframework.jdbc.BadSqlGrammarException 入参是空List的时候会抛SQL语句错误的异常，请自行校验入参
     */
    int insertOrUpdateBatch(@Param("entities") List<ComMngVolunteerSkill> entities);

    /**
     * 社区后台-查询志愿者技能列表
     * @param comMngVolunteerSkill 请求参数
     * @return  志愿者技能列表
     */
    List<ComMngVolunteerSkillVo> queryAll(@Param("dto") PageComMngVolunteerSkillDto comMngVolunteerSkill);
}


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

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

import java.util.List;
import java.util.Map;

import com.panzhihua.service_community.model.dos.EventDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

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.bigscreen.event.ScreenEventListDTO;
import com.panzhihua.common.model.dtos.grid.GridEventStatisticsDTO;
import com.panzhihua.common.model.dtos.grid.PageEventDTO;
import com.panzhihua.common.model.dtos.grid.PageEventManageDTO;
import com.panzhihua.common.model.dtos.grid.PageEventSpecialPopulationDTO;
import com.panzhihua.common.model.dtos.grid.PagePublicityEventCommunityDTO;
import com.panzhihua.common.model.dtos.grid.PagePublicityEventDTO;
import com.panzhihua.common.model.vos.community.StatisticsCommVO;
import com.panzhihua.common.model.vos.community.screen.civil.CivilVillageStatisticsVO;
import com.panzhihua.common.model.vos.community.screen.event.EventComprehensiveGovernanceStatisticsVO;
import com.panzhihua.common.model.vos.community.screen.event.EventGridIncidentStatisticsVO;
import com.panzhihua.common.model.vos.community.screen.event.EventListVO;
import com.panzhihua.common.model.vos.grid.ComMapGridEventVO;
import com.panzhihua.common.model.vos.grid.EventSpecialPopulationVO;
import com.panzhihua.common.model.vos.grid.EventStatisticsAllAdminVO;
import com.panzhihua.common.model.vos.grid.EventVO;
import com.panzhihua.common.model.vos.grid.GridEventStatisticsDetailVO;
import com.panzhihua.common.model.vos.grid.GridEventStatisticsVO;
import com.panzhihua.common.model.vos.screen.DateScreenVO;
import com.panzhihua.common.model.vos.screen.EventDetailWorkVO;
import com.panzhihua.common.model.vos.screen.EventTypeWorkVO;
import com.panzhihua.common.model.vos.screen.EventWorkVO;
import com.panzhihua.common.model.vos.screen.ScreenDrawEventPopulationTotalVO;

/**
 * DAO
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @date 2021-05-26
 * @since 1.0
 */
@Mapper
public interface EventMapper extends BaseMapper<EventDO> {

    /**
     * 分页查询事件
     *
     * @param pageEventDTO
     * @return
     */
    IPage<EventVO> findByPage(Page page, @Param("pageEventDTO") PageEventDTO pageEventDTO);

    /**
     * 分页查询宣传教育
     *
     * @param pagePublicityEventDTO
     * @return
     */
    IPage<EventVO> findPublicityByPage(Page page,
                                       @Param("pagePublicityEventDTO") PagePublicityEventDTO pagePublicityEventDTO);

    /**
     * 地图模块-根据网格id查询网格办件事件
     *
     * @param gridId
     *            网格id
     * @return 网格办件事件
     */
    List<ComMapGridEventVO> getEventByGridId(@Param("gridId") Long gridId);

    /**
     * 根据网格员id查询网格员头像url
     *
     * @param gridMemberId
     *            网格员id
     * @return 头像url
     */
    Map<String, String> getGridMemberImageUrl(@Param("gridMemberId") Long gridMemberId);

    /**
     * 查询事件（管理）列表
     *
     * @param page
     * @param pageEventManageDTO
     * @return
     */
    IPage<EventVO> findToManageByPage(Page page, @Param("pageEventManageDTO") PageEventManageDTO pageEventManageDTO);

    /**
     * 查询事件（管理）列表
     *
     * @param page
     * @param pagePublicityEventCommunityDTO
     * @return
     */
    IPage<EventVO> findCommunityPublicityByPage(Page page,
                                                @Param("pagePublicityEventCommunityDTO") PagePublicityEventCommunityDTO pagePublicityEventCommunityDTO);

    /**
     * 后台管理-统计模块
     *
     * @param communityId
     *            社区id
     * @return 统计信息
     */
    EventStatisticsAllAdminVO eventStatistics(@Param("communityId") Long communityId);

    Integer getEventCountByGridIds(@Param("ids") List<Long> ids);

    /**
     * 根据网格id查询网格统计数据
     *
     * @param gridId
     *            网格id
     * @return 网格统计数据
     */
    GridEventStatisticsVO getGridEventStatisticsByApp(@Param("gridId") Long gridId);

    /**
     * 查询网格事件统计数据
     *
     * @param statisticsDTO
     *            请求参数
     * @return 网格事件统计数据
     */
    GridEventStatisticsDetailVO
        getGridEventDetailStatisticsByApp(@Param("statisticsDTO") GridEventStatisticsDTO statisticsDTO);

    /**
     * 查询时间发布者基本信息
     *
     * @param gridMemberId
     * @return
     */
    Map<String, Object> getUserBaseInfo(@Param("gridMemberId") Long gridMemberId);

    /**
     * 事件大屏查询事件列表
     *
     * @param eventListDTO
     *            请求参数
     * @return 事件列表
     */
    IPage<EventListVO> getScreenEventList(Page page, @Param("eventListDTO") ScreenEventListDTO eventListDTO);

    /**
     * 特殊人群上报-社区人口数据列表
     *
     * @param specialPopulationDTO
     *            请求参数
     * @return 社区人口数据列表
     */
    IPage<EventSpecialPopulationVO> specialPopulationList(Page page,
                                                          @Param("specialPopulationDTO") PageEventSpecialPopulationDTO specialPopulationDTO);

    Map<String, Long> countByCommunityId(@Param("communityId") Long communityId, @Param("nowDate") String nowDate);

    DateScreenVO countByAvgCommunityId(@Param("communityId") Long communityId);

    List<EventDetailWorkVO> getWorkScreenEventList(@Param("communityId") Long communityId);

    EventWorkVO countByTime(@Param("start") String start, @Param("end") String end,
                            @Param("communityId") Long communityId);

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

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

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

    List<EventGridIncidentStatisticsVO> getEventListByCommunityId(@Param("communityId") Long communityId);

    List<CivilVillageStatisticsVO> getCivilScreenVillageList(@Param("communityId") Long communityId);

    ScreenDrawEventPopulationTotalVO getVillagePopulationTotal(@Param("villageId") Long villageId);

    List<Map<String, Object>> getMemberBuildName(@Param("userId") Long userId);

    Integer getPopulationByLabelCount(@Param("floor") String floor, @Param("villageId") Long villageId);

    /**
     * 西区大数据分析平台-综合治理栏数据
     * @return
     */
    EventComprehensiveGovernanceStatisticsVO selectComprehensiveGovernanceStatics();

    List<EventGridIncidentStatisticsVO> getGridsGovernanceEventList(@Param("communityId") Long communityId);

    ScreenDrawEventPopulationTotalVO getVillagePopulationTotalNew(@Param("villageId") Long villageId);

    List<StatisticsCommVO> selectStatisticsForAge(@Param("villageIds") List<Long> villageIds);
}

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

@@ -84,4 +84,8 @@

    private Long communityId;

    private Long parentId;

    private Long streetId;

}

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

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

import java.util.Date;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
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;


/**
 * 抽奖活动表(ComActRaffle)表实体类
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 抽奖活动表相关功能
 *
 * @author zzj
 * @since 2022-02-18 14:31:19
 */
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@ApiModel("抽奖活动表")
public class ComActRaffle implements Serializable {

    private static final long serialVersionUID = -19557136291047637L;

    @TableId(type = IdType.AUTO)
    private Long id;

    /**
     * 名称
     */
    @ApiModelProperty(value = "名称")
    private String name;

    /**
     * 开始时间
     */
    @ApiModelProperty(value = "开始时间")
    private Date startTime;

    /**
     * 结束时间
     */
    @ApiModelProperty(value = "结束时间")
    private Date stopTime;

    /**
     * 开奖时间
     */
    @ApiModelProperty(value = "开奖时间")
    private Date lotteryTime;

    /**
     * 兑奖开始时间
     */
    @ApiModelProperty(value = "兑奖开始时间")
    private Date raffleStartTime;

    /**
     * 兑奖结束时间
     */
    @ApiModelProperty(value = "兑奖结束时间")
    private Date raffleStopTime;

    /**
     * 工作时间
     */
    @ApiModelProperty(value = "工作时间")
    private String workTime;

    /**
     * 地址
     */
    @ApiModelProperty(value = "地址")
    private String address;

    /**
     * 经度
     */
    @ApiModelProperty(value = "经度")
    private String longitude;

    /**
     * 纬度
     */
    @ApiModelProperty(value = "纬度")
    private String latitude;

    /**
     * 联系方式
     */
    @ApiModelProperty(value = "联系方式")
    private String phone;

    /**
     * 封面
     */
    @ApiModelProperty(value = "封面")
    private String cover;

    /**
     * 创建时间
     */
    @ApiModelProperty(value = "创建时间")
    private Date createTime;

    /**
     * 状态 0未开始 1报名中 2待开奖 3已开奖
     */
    @ApiModelProperty(value = "状态 0未开始 1报名中 2待开奖 3已开奖")
    private Integer status;

    /**
     * 创建人
     */
    @ApiModelProperty(value = "创建人")
    private Long createBy;

    /**
     * 社区id
     */
    @ApiModelProperty(value = "社区id")
    private Long communityId;

}

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

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

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
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;


/**
 * 抽奖活动奖品表(ComActRafflePrize)表实体类
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 抽奖活动奖品表相关功能
 *
 * @author zzj
 * @since 2022-02-18 14:31:45
 */
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@ApiModel("抽奖活动奖品表")
public class ComActRafflePrize implements Serializable {

    private static final long serialVersionUID = 706879121724104929L;

    @TableId(type = IdType.AUTO)
    private Long id;

    /**
     * 奖品名称
     */
    @ApiModelProperty(value = "奖品名称")
    private String name;

    /**
     * 总数
     */
    @ApiModelProperty(value = "总数")
    private Integer total;

    /**
     * 剩余
     */
    @ApiModelProperty(value = "剩余")
    private Integer surplus;

    /**
     * 图片
     */
    @ApiModelProperty(value = "图片")
    private String image;

    /**
     * 抽奖活动id
     */
    @ApiModelProperty(value = "抽奖活动id")
    private Long raffleId;

}

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

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

import java.util.Date;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
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;


/**
 * 抽奖活动中奖记录表(ComActRaffleRecord)表实体类
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 抽奖活动中奖记录表相关功能
 *
 * @author zzj
 * @since 2022-02-18 14:32:01
 */
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@ApiModel("抽奖活动中奖记录表")
public class ComActRaffleRecord implements Serializable {

    private static final long serialVersionUID = 201328912468431601L;

    @TableId(type = IdType.AUTO)
    private Long id;

    /**
     * 用户id
     */
    @ApiModelProperty(value = "用户id")
    private Long userId;

    /**
     * 创建时间
     */
    @ApiModelProperty(value = "创建时间")
    private Date createTime;

    /**
     * 奖品id
     */
    @ApiModelProperty(value = "奖品id")
    private Long prizeId;

    /**
     * 核销人
     */
    @ApiModelProperty(value = "核销人")
    private Long staffId;

    /**
     * 核销时间
     */
    @ApiModelProperty(value = "核销时间")
    private Date staffTime;

    @ApiModelProperty(value = "0 已参加 1待兑奖 2已兑奖 3已失效")
    private Integer status;

    @ApiModelProperty(value = "抽奖id")
    private Long raffleId;

}

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

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

import java.util.Date;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
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;


/**
 * 社会组织成员表(ComActSocialMember)表实体类
 *
 * @author makejava
 * @since 2021-10-22 09:52:46
 */
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@ApiModel("社会组织成员表")
public class ComActSocialMember implements Serializable {

    private static final long serialVersionUID = 279847158941704646L;

    @TableId(type = IdType.AUTO)
    private Long id;

    /**
     * 姓名
     */
    @ApiModelProperty(value = "姓名")
    private String name;

    /**
     * 手机号
     */
    @ApiModelProperty(value = "手机号")
    private String phone;

    /**
     * 社会组织id
     */
    @ApiModelProperty(value = "社会组织id")
    private Long orgId;

    /**
     * 职位
     */
    @ApiModelProperty(value = "职位")
    private String position;

    /**
     * 身份证号
     */
    @ApiModelProperty(value = "身份证号")
    private String idCard;

    /**
     * 账号
     */
    @ApiModelProperty(value = "账号")
    private String account;

    /**
     * 密码
     */
    @ApiModelProperty(value = "密码")
    private String password;

    /**
     * 状态1启用 0停用
     */
    @ApiModelProperty(value = "状态1启用 0停用")
    private Integer status;

    /**
     * 照片
     */
    @ApiModelProperty(value = "照片")
    private String image;

    /**
     * 创建时间
     */
    @ApiModelProperty(value = "创建时间")
    private Date createTime;

    /**
     * 街道id
     */
    @ApiModelProperty(value = "街道id")
    private Long streetId;

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

}

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

@@ -251,4 +251,25 @@

    private String password;

    @ApiModelProperty("状态")
    private Integer status;

    @ApiModelProperty("成立方式")
    private Integer buildType;

    @ApiModelProperty("经度")
    private String longitude;

    @ApiModelProperty("纬度")
    private String latitude;

    @ApiModelProperty("服务类型")
    private Long serviceType;

    @ApiModelProperty("街道id")
    private Long streetId;

    @ApiModelProperty("是否三社 0否1是")
    private Integer isSociety;

}

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

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

import java.util.Date;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
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;


/**
 * 三社联动项目表(ComActSocialProject)表实体类
 *
 * @author makejava
 * @since 2021-12-22 14:02:46
 */
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@ApiModel("三社联动项目表")
public class ComActSocialProject implements Serializable {

    private static final long serialVersionUID = -24945028672614601L;

    @TableId(type = IdType.AUTO)
    private Long id;

    /**
     * 项目名称
     */
    @ApiModelProperty(value = "项目名称")
    private String name;

    /**
     * 项目类型 1公共文化 2社会组织参与 3 社会企业带动 4其他
     */
    @ApiModelProperty(value = "项目类型 1公共文化 2社会组织参与 3 社会企业带动 4其他")
    private Integer type;

    /**
     * 项目状态  1初创项目 2公开发布 3运作中 4 已结束
     */
    @ApiModelProperty(value = "项目状态  1初创项目 2公开发布 3运作中 4 已结束")
    private Integer status;

    /**
     * 创建时间
     */
    @ApiModelProperty(value = "创建时间")
    private Date createTime;

    /**
     * 社区id
     */
    @ApiModelProperty(value = "社区id")
    private Long communityId;

    /**
     * 街道id
     */
    @ApiModelProperty(value = "街道id")
    private Long streetId;

    /**
     * 责任方
     */
    @ApiModelProperty(value = "责任方")
    private String responsibility;

    /**
     * 父项目id
     */
    @ApiModelProperty(value = "父项目id")
    private Long parentId;

    /**
     * 附件
     */
    @ApiModelProperty(value = "附件")
    private String url;

    /**
     * 封面
     */
    @ApiModelProperty(value = "封面")
    private String image;

    /**
     * 介绍
     */
    @ApiModelProperty(value = "介绍")
    private String content;

    /**
     * 项目等级
     */
     @ApiModelProperty(value = "项目等级")
    private Integer level;

    /**
     * 浏览量
     */
    @ApiModelProperty(value = "浏览量")
    private Integer views;

    /**
     * 分类id
     */
    @ApiModelProperty(value = "分类id")
    private Long columnId;

    /**
     * 二级分类id
     */
    @ApiModelProperty(value = "二级分类id")
    private Long secondColumnId;

    @ApiModelProperty(value = "责任方类型 1街道 2社区 3社会组织")
    private Integer responsibilityType;

    @ApiModelProperty(value = "责任方id")
    private Long responsibilityId;
}

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

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

import java.util.Date;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
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;


/**
 * 项目人员(ComActSocialProjectMember)表实体类
 *
 * @author makejava
 * @since 2021-12-23 15:16:42
 */
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@ApiModel("项目人员")
public class ComActSocialProjectMember implements Serializable {

    private static final long serialVersionUID = 982451898968415899L;

    @TableId(type = IdType.AUTO)
    private Long id;

    /**
     * 姓名
     */
    @ApiModelProperty(value = "姓名")
    private String name;

    /**
     * 年龄
     */
    @ApiModelProperty(value = "年龄")
    private Integer age;

    /**
     * 照片
     */
    @ApiModelProperty(value = "照片")
    private String image;

    /**
     * 手机号
     */
    @ApiModelProperty(value = "手机号")
    private String phone;

    /**
     * 类型 1社工 2志愿者
     */
    @ApiModelProperty(value = "类型 1社工 2志愿者")
    private Integer type;

    /**
     * 创建时间
     */
    @ApiModelProperty(value = "创建时间")
    private Date createTime;

    /**
     * 项目id
     */
    @ApiModelProperty(value = "项目id")
    private Long projectId;

    private Long communityId;

}

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

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

import java.util.Date;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
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;


/**
 * 项目宣传表(ComActSocialProjectPublicity)表实体类
 *
 * @author makejava
 * @since 2021-12-23 14:30:54
 */
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@ApiModel("项目宣传表")
public class ComActSocialProjectPublicity implements Serializable {

    private static final long serialVersionUID = -90937393082259077L;

    @TableId(type = IdType.AUTO)
    private Long id;

    /**
     * 标题
     */
    @ApiModelProperty(value = "标题")
    private String title;

    /**
     * 封面图
     */
    @ApiModelProperty(value = "封面图")
    private String image;

    /**
     * 内容
     */
    @ApiModelProperty(value = "内容")
    private String content;

    /**
     * 项目id
     */
    @ApiModelProperty(value = "项目id")
    private Long projectId;

    /**
     * 创建时间
     */
    @ApiModelProperty(value = "创建时间")
    private Date createTime;

    /**
     * 浏览量
     */
    @ApiModelProperty(value = "浏览量")
    private Integer views;

    /**
     * 是否置顶 0否 1是
     */
    @ApiModelProperty(value = "是否置顶")
    private Integer isTop;
}

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

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

import java.util.Date;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
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;


/**
 * 项目进度表(ComActSocialProjectSchedule)表实体类
 *
 * @author makejava
 * @since 2021-12-23 14:31:15
 */
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@ApiModel("项目进度表")
public class ComActSocialProjectSchedule implements Serializable {

    private static final long serialVersionUID = -17588094441653342L;

    @TableId(type = IdType.AUTO)
    private Long id;

    /**
     * 标题
     */
    @ApiModelProperty(value = "标题")
    private String title;

    /**
     * 内容
     */
    @ApiModelProperty(value = "内容")
    private String content;

    /**
     * 创建时间
     */
    @ApiModelProperty(value = "创建时间")
    private Date createTime;

    /**
     * 项目id
     */
    @ApiModelProperty(value = "项目id")
    private Long projectId;

}

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

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

import java.util.Date;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
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;


/**
 * 社工(ComActSocialWorker)表实体类
 *
 * @author makejava
 * @since 2021-10-25 13:50:43
 */
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@ApiModel("社工")
public class ComActSocialWorker implements Serializable {

    private static final long serialVersionUID = 624699365201103858L;

    /**
     * ID
     */
    @ApiModelProperty(value = "ID")
    @TableId(type = IdType.AUTO)
    private Long id;

    /**
     * 所属组织ID
     */
    @ApiModelProperty(value = "所属组织ID")
    private Long socialOrgId;

    /**
     * 姓名
     */
    @ApiModelProperty(value = "姓名")
    private String name;

    /**
     * 联系电话
     */
    @ApiModelProperty(value = "联系电话")
    private String telephone;

    /**
     * 性别0女1男
     */
    @ApiModelProperty(value = "性别0女1男")
    private Integer gen;

    /**
     * 所属街道
     */
    @ApiModelProperty(value = "所属街道")
    private Long streetId;

    /**
     * 所属社区
     */
    @ApiModelProperty(value = "所属社区")
    private Long communityId;

    /**
     * 创建人
     */
    @ApiModelProperty(value = "创建人")
    private Long createBy;

    /**
     * 创建时间
     */
    @ApiModelProperty(value = "创建时间")
    private Date createAt;

    /**
     * 更新人
     */
    @ApiModelProperty(value = "更新人")
    private Long updateBy;

    /**
     * 更新时间
     */
    @ApiModelProperty(value = "更新时间")
    private Date updateAt;

    /**
     * 身份证
     */
    @ApiModelProperty(value = "身份证")
    private String idCard;

    /**
     * 分类id
     */
    @ApiModelProperty(value = "分类id")
    private String skillType;
    /**
     * 分类名称
     */
    @ApiModelProperty(value = "分类id")
    private String skillTypeName;
    /**
     * 入职时间
     */
    @ApiModelProperty(value = "入职时间")
    private Date joinTime;

    /**
     * 住址
     */
    @ApiModelProperty(value = "住址")
    private String address;

    /**
     * 图片
     */
    @ApiModelProperty(value = "图片")
    private String image;

    /**
     * 学历
     */
    @ApiModelProperty(value = "学历")
    private String education;

    /**
     * 政治面貌
     */
    @ApiModelProperty(value = "政治面貌")
    private String politicalOutlook;

    /**
     * 民族
     */
    @ApiModelProperty(value = "民族")
    private String nation;

    /**
     * 是否证件 0否 1是
     */
    @ApiModelProperty(value = "是否证件 0否 1是")
    private Integer credential;

    /**
     * 年龄
     */
    private Integer age;

}

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

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

import java.util.Date;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
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;


/**
 * 社工服务表(ComActSocialWorkerService)表实体类
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 社工服务表相关功能
 *
 * @author zzj
 * @since 2022-02-16 15:59:41
 */
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@ApiModel("社工服务表")
public class ComActSocialWorkerService implements Serializable {

    private static final long serialVersionUID = 984587632214927218L;

    @TableId(type = IdType.AUTO)
    private Long id;

    /**
     * 社工id
     */
    @ApiModelProperty(value = "社工id")
    private Long workerId;

    /**
     * 发起人id
     */
    @ApiModelProperty(value = "发起人id")
    private Long senderId;

    /**
     * 服务状态 0待执行 1已完成
     */
    @ApiModelProperty(value = "服务状态 0待执行 1已完成")
    private Integer status;

    /**
     * 内容id
     */
    @ApiModelProperty(value = "内容id")
    private Long serviceId;

    /**
     * 服务类型 1微心愿 2随手拍
     */
    @ApiModelProperty(value = "服务类型 1微心愿 2随手拍")
    private Integer serviceType;

    /**
     * 创建时间
     */
    @ApiModelProperty(value = "创建时间")
    private Date createTime;

    /**
     * 汇报内容
     */
    @ApiModelProperty(value = "汇报内容")
    private String resultContent;

    /**
     * 汇报图片
     */
    @ApiModelProperty(value = "汇报图片")
    private String resultUrl;

    /**
     * 得分
     */
    @ApiModelProperty(value = "得分")
    private Integer score;

}

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

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


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

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

/**
 * 五微服务-微学堂(ComFmsClassroom)表实体类
 *
 * @author makejava
 * @since 2022-02-16 14:00:59
 */
@Data
@TableName(value = "com_fms_classroom")
@SuppressWarnings("serial")
public class ComFmsClassroom implements Serializable {
    private static final long serialVersionUID = 478204526855062234L;
    /**
     * 主键
     */
    private Long id;
    /**
     * 标题
     */
    private String title;
    /**
     * 参与学习人数
     */
    private Integer scholars;
    /**
     * 封面
     */
    private String cover;
    /**
     * 内容
     */
    private String content;
    /**
     * 浏览量
     */
    private Integer viewNum;
    /**
     * 创建时间
     */
    private Date createdAt;
    /**
     * 创建者
     */
    private Long createdBy;
    /**
     * 更新时间
     */
    private Date updatedAt;
    /**
     * 由谁更新
     */
    private Long updatedBy;
    /**
     * 所属社区
     */
    private Long communityId;

}

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

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

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

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

/**
 * 五微服务-微服务(ComFmsService)表实体类
 *
 * @author makejava
 * @since 2022-02-16 13:57:58
 */
@Data
@TableName(value = "com_fms_service")
@SuppressWarnings("serial")
public class ComFmsService implements Serializable {
    private static final long serialVersionUID = -29895236382912525L;
    /**
     * 主键
     */
    private Long id;
    /**
     * 用户姓名
     */
    private String userName;
    /**
     * 用户关联id
     */
    private Long userId;
    /**
     * 联系电话
     */
    private String phone;
    /**
     * 服务内容
     */
    private String serviceContent;
    /**
     * 服务内容图片
     */
    private String serviceImage;
    /**
     * 反馈内容
     */
    private String approvalContent;
    /**
     * 审核时间
     */
    private Date approvalAt;
    /**
     * 团队服务人员关联id
     */
    private Long memberId;
    /**
     * 服务状态（1.待核实2.进行中3.待评价4.已完成5.未通过）
     */
    private Integer serviceStatus;
    /**
     * 服务时间
     */
    private Date serviceAt;
    /**
     * 创建时间
     */
    private Date createdAt;
    /**
     * 创建者
     */
    private Long createdBy;
    /**
     * 更新时间
     */
    private Date updatedAt;
    /**
     * 由谁更新
     */
    private Long updatedBy;

    /**
     * 所属社区
     */
    private Long communityId;

    /**
     * 服务状态（1.待核实2.进行中3.待评价4.已完成5.未通过）
     */
    public interface ServiceStatus {
        int dhs = 1;
        int jxz = 2;
        int dpj = 3;
        int ywc = 4;
        int wtg = 5;
    }

}

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

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

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

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

/**
 * 五微服务-服务评价(ComFmsServiceEvaluations)表实体类
 *
 * @author makejava
 * @since 2022-02-11 13:35:53
 */
@Data
@TableName(value = "com_fms_service_evaluations")
@SuppressWarnings("serial")
public class ComFmsServiceEvaluations implements Serializable {
    private static final long serialVersionUID = -73970369473437007L;
    /**
     * 主键
     */
    private Long id;
    /**
     * 服务关联id
     */
    private Long serviceId;
    /**
     * 用户关联id
     */
    private Long userId;
    /**
     * 评分星级（1.非常差2.差3.一般4.满意5.非常满意）
     */
    private Integer starLevel;
    /**
     * 评价内容
     */
    private String evaluateContent;
    /**
     * 图片
     */
    private String image;
    /**
     * 创建时间
     */
    private Date createdAt;

}

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

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

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

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

/**
 * 五微服务-服务记录(ComFmsServiceRecord)表实体类
 *
 * @author makejava
 * @since 2022-02-11 13:35:54
 */
@Data
@TableName(value = "com_fms_service_record")
@SuppressWarnings("serial")
public class ComFmsServiceRecord implements Serializable {
    private static final long serialVersionUID = -62643130900160237L;
    /**
     * 主键
     */
    private Long id;
    /**
     * 服务关联id
     */
    private Long serviceId;
    /**
     * 服务阶段
     */
    private String stage;
    /**
     * 内容
     */
    private String content;
    /**
     * 图片
     */
    private String image;
    /**
     * 创建时间
     */
    private Date createdAt;
    /**
     * 创建者
     */
    private Long createdBy;

    //服务阶段
    public interface Stage {
        String TJFWSQ = "提交服务申请";
        String SHTG = "审核通过，已分派服务人员";
        String FWFK = "服务反馈";
        String WCFW = "完成服务";
        String HSBTG = "核实不通过";
    }

}

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

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


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

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

/**
 * 五微服务-微团队(ComFmsTeam)表实体类
 *
 * @author makejava
 * @since 2022-02-14 11:26:00
 */
@Data
@TableName(value = "com_fms_team")
@SuppressWarnings("serial")
public class ComFmsTeam implements Serializable {
    private static final long serialVersionUID = -23489485985260679L;
    /**
     * 主键
     */
    private Long id;
    /**
     * 团队名称
     */
    private String name;
    /**
     * 服务电话
     */
    private String phone;
    /**
     * 所属团队类型
     */
    private Long teamType;
    /**
     * 创建时间
     */
    private Date createdAt;
    /**
     * 创建者
     */
    private Long createdBy;
    /**
     * 更新时间
     */
    private Date updatedAt;
    /**
     * 由谁更新
     */
    private Long updatedBy;
    /**
     * 社区id
     */
    private Long communityId;
    /**
     * 团队照片
     */
    private String image;

}

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

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


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

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

/**
 * 五微服务-团队成员(ComFmsTeamMember)表实体类
 *
 * @author makejava
 * @since 2022-02-14 16:55:39
 */
@Data
@TableName(value = "com_fms_team_member")
@SuppressWarnings("serial")
public class ComFmsTeamMember implements Serializable {
    private static final long serialVersionUID = 183663328661464263L;
    /**
     * 主键
     */
    private Long id;
    /**
     * 成员姓名
     */
    private String name;
    /**
     * 联系电话
     */
    private String phone;
    /**
     * 身份证号
     */
    private String idCard;
    /**
     * 所属社区
     */
    private Long communityId;
    /**
     * 创建时间
     */
    private Date createdAt;
    /**
     * 创建者
     */
    private Long createdBy;
    /**
     * 更新时间
     */
    private Date updatedAt;
    /**
     * 由谁更新
     */
    private Long updatedBy;
    /**
     * 团队级联关系
     */
    private String cascadeIds;
    /**
     * 性别（1.男2.女3.未知）
     */
    private Integer gender;

}

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

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

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

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

/**
 * 五微服务-团队&成员关系表(ComFmsTeamMemberRelation)表实体类
 *
 * @author makejava
 * @since 2022-02-14 14:41:36
 */
@Data
@TableName(value = "com_fms_team_member_relation")
@SuppressWarnings("serial")
public class ComFmsTeamMemberRelation implements Serializable {
    private static final long serialVersionUID = -75599228117060880L;
    /**
     * 团队id
     */
    private Long teamId;
    /**
     * 成员id
     */
    private Long memberId;

}

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

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

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

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

/**
 * 五微服务-团队类型(ComFmsTeamType)表实体类
 *
 * @author makejava
 * @since 2022-02-11 13:35:56
 */
@Data
@TableName(value = "com_fms_team_type")
@SuppressWarnings("serial")
public class ComFmsTeamType implements Serializable {
    private static final long serialVersionUID = -78377643285663874L;
    /**
     * 主键
     */
    private Long id;
    /**
     * 团队类型名称
     */
    private String name;
    /**
     * 所属社区
     */
    private Long communityId;
    /**
     * 创建时间
     */
    private Date createdAt;
    /**
     * 创建者
     */
    private Long createdBy;
    /**
     * 更新时间
     */
    private Date updatedAt;
    /**
     * 由谁更新
     */
    private Long updatedBy;

}

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

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

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.panzhihua.common.model.vos.community.social.SocialProjectVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

/**
 * @author zzj
 */
@Data
@ApiModel("相关项目")
public class ProjectRelationVO {
    @ApiModelProperty("一级父类项目")
    private SocialProjectVO fatherProjectLevelOne;
    @ApiModelProperty("二级父类项目")
    private SocialProjectVO fatherProjectLevelTwo;
    @ApiModelProperty("子类项目")
    private IPage<SocialProjectVO> socialProjectVOIPage;
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/message/RaffleMessage.java

New file
@@ -0,0 +1,97 @@
package com.panzhihua.service_community.message;

import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.panzhihua.common.model.vos.community.raffle.ComActRaffleVO;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.dao.ComActRaffleDao;
import com.panzhihua.service_community.dao.ComActRafflePrizeDao;
import com.panzhihua.service_community.dao.ComActRaffleRecordDao;
import com.panzhihua.service_community.entity.ComActRaffle;
import com.panzhihua.service_community.entity.ComActRafflePrize;
import com.panzhihua.service_community.entity.ComActRaffleRecord;
import org.springframework.amqp.rabbit.annotation.RabbitListener;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.stereotype.Component;

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

/**
 * @author zzj
 */
@Component
public class RaffleMessage {
    public static final String DELAYED_QUEUE="raffle.queue";

    @Resource
    private ComActRaffleDao comActRaffleDao;
    @Resource
    private ComActRaffleRecordDao comActRaffleRecordDao;
    @Resource
    private ComActRafflePrizeDao comActRafflePrizeDao;
    @Resource
    private RabbitTemplate rabbitTemplate;

    @RabbitListener(queues=DELAYED_QUEUE)
    public void doRaffle(ComActRaffle comActRaffleVO){
        ComActRaffle comActRaffle=comActRaffleDao.selectOne(new QueryWrapper<ComActRaffle>().lambda().eq(ComActRaffle::getId,comActRaffleVO.getId()));
        if(comActRaffle!=null&&comActRaffle.getStatus()==2&&comActRaffle.getLotteryTime().before(new Date())){
            List<ComActRafflePrize> comActRafflePrizeList=comActRafflePrizeDao.selectList(new QueryWrapper<ComActRafflePrize>().lambda().eq(ComActRafflePrize::getRaffleId,comActRaffleVO.getId()));
            if(StringUtils.isNotEmpty(comActRafflePrizeList)){
                List<ComActRaffleRecord> comActRaffleRecords=comActRaffleRecordDao.selectList(new QueryWrapper<ComActRaffleRecord>().lambda().eq(ComActRaffleRecord::getRaffleId,comActRaffleVO.getId()));
                if(StringUtils.isNotEmpty(comActRaffleRecords)){
                    Random random=new Random();
                    comActRafflePrizeList.forEach(comActRafflePrize -> {
                        int a=0;
                        for(int i=1;i<=comActRafflePrize.getSurplus();i++){
                            if(comActRaffleRecords.size()>0){
                                ComActRaffleRecord comActRaffleRecord=comActRaffleRecords.get(random.nextInt(comActRaffleRecords.size()));
                                comActRaffleRecord.setPrizeId(comActRafflePrize.getId());
                                comActRaffleRecord.setStatus(1);
                                comActRaffleRecordDao.updateById(comActRaffleRecord);
                                comActRaffleRecords.remove(comActRaffleRecord);
                                a++;
                            }
                        }
                        comActRafflePrize.setSurplus(comActRafflePrize.getSurplus()-a);
                        comActRafflePrizeDao.updateById(comActRafflePrize);
                    });

                }
            }
            comActRaffle.setStatus(3);
            comActRaffleDao.updateById(comActRaffle);
            rabbitTemplate.convertAndSend("raffle.exchange", "raffle.key", comActRaffleVO, message -> {
                message.getMessageProperties().setHeader("x-delay", dateToSecond(comActRaffle.getRaffleStopTime()));
                return message;
            });
        }
        if(comActRaffle!=null&&comActRaffle.getStatus()==0&&comActRaffle.getStartTime().before(new Date())){
            comActRaffle.setStatus(1);
            comActRaffleDao.updateById(comActRaffle);
            rabbitTemplate.convertAndSend("raffle.exchange", "raffle.key", comActRaffleVO, message -> {
                message.getMessageProperties().setHeader("x-delay", dateToSecond(comActRaffle.getStopTime()));
                return message;
            });
        }
        if(comActRaffle!=null&&comActRaffle.getStatus()==1&&comActRaffle.getStopTime().before(new Date())){
            comActRaffle.setStatus(2);
            comActRaffleDao.updateById(comActRaffle);
            rabbitTemplate.convertAndSend("raffle.exchange", "raffle.key", comActRaffleVO, message -> {
                message.getMessageProperties().setHeader("x-delay", dateToSecond(comActRaffle.getLotteryTime()));
                return message;
            });
        }
        if(comActRaffle!=null&&comActRaffle.getStatus()==3&&comActRaffle.getRaffleStopTime().before(new Date())){
            comActRaffleRecordDao.updateStatusByRaffleId(comActRaffle.getId());
        }
    }
    private Long dateToSecond(Date expireTime){
        return DateUtil.between(new Date(),expireTime, DateUnit.MS);
    }
}

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

@@ -209,12 +209,42 @@
     * 活动类型
     */
    private String activityType;

    /**
     * 是否居民活动
     */
    private Integer isProject;

    /**
     * 项目id
     */
    private Long projectId;

    /**
     * 1志愿者活动 2居民活动 3党员活动 4项目活动
     */
    private Integer type;

    /**
     * 党员参与者人数下线
     */
    private Integer partyMemberMin;

    /**
     * 党员参与者人数上限
     */
    private Integer partyMemberMax;
    /**
     * 签退范围，默认0无限制
     */
    private Integer signOutRange;
    /**
     * 单次活动时长
     */
    private Integer activityTime;

    /**
     * 单次活动时长（小时）
     */
    private Integer duration;
    /**
     * 类型（1.居民活动 2.志愿者活动）
     */
    private Integer type;
}

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

@@ -112,6 +112,8 @@
     */
    private Integer status;

    private Integer integralPartyTime;

    @Override
    public String toString() {
        return "ComActIntegralUserDO{" + "id=" + id + ", userId=" + userId + ", communityId=" + communityId

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

@@ -89,4 +89,28 @@
     * 申请提交人ID
     */
    private Long submitUserId;
    /**
     * 身份证号
     */
    private String idCard;
    /**
     * 组织id
     */
    private Long orgId;
    /**
     * 队伍id
     */
    private Long teamId;
    /**
     * 技能id
     */
    private Long skillId;
    /**
     * 是否是在校大学生（1.是 2.否）
     */
    private Integer isUniversity;
    /**
     * 大学名称
     */
    private String universityName;
}

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

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

import lombok.Data;

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

/**
 * 志愿者组织队伍表(ComMngVolunteerOrgTeam)实体类
 *
 * @author lyq
 * @since 2021-10-30 15:51:23
 */
@Data
public class ComMngVolunteerOrgTeam implements Serializable {
    private static final long serialVersionUID = -87266346603371467L;
    /**
     * 主键id
     */
    private Long id;
    /**
     * 社区id
     */
    private Long communityId;
    /**
     * 名称
     */
    private String name;
    /**
     * 父级id,为0时则为组织，不为0则为队伍
     */
    private Long parentId;
    /**
     * 服务类型
     */
    private Long serviceTypeId;
    /**
     * 创建时间
     */
    private Date createAt;
    /**
     * 修改时间
     */
    private Date updateAt;


}


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

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

import lombok.Data;

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

/**
 * 志愿者服务类型表(ComMngVolunteerServiceType)实体类
 *
 * @author lyq
 * @since 2021-10-30 16:47:09
 */
@Data
public class ComMngVolunteerServiceType implements Serializable {
    private static final long serialVersionUID = 884034720723106601L;
    /**
     * 主键id
     */
    private Long id;
    /**
     * 社区id
     */
    private Long communityId;
    /**
     * 名称
     */
    private String name;
    /**
     * 备注
     */
    private String remark;
    /**
     * 创建时间
     */
    private Date createAt;
    /**
     * 创建人id
     */
    private Long createBy;
    /**
     * 修改时间
     */
    private Date updateAt;
    /**
     * 修改人id
     */
    private Long updateBy;


}


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

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

import lombok.Data;

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

/**
 * 志愿者技能表(ComMngVolunteerSkill)实体类
 *
 * @author lyq
 * @since 2021-10-30 16:47:36
 */
@Data
public class ComMngVolunteerSkill implements Serializable {
    private static final long serialVersionUID = -32441531233450711L;
    /**
     * 主键id
     */
    private Long id;
    /**
     * 社区id
     */
    private Long communityId;
    /**
     * 名称
     */
    private String name;
    /**
     * 备注
     */
    private String remark;
    /**
     * 创建时间
     */
    private Date createAt;
    /**
     * 创建人id
     */
    private Long createBy;
    /**
     * 修改时间
     */
    private Date updateAt;
    /**
     * 修改人id
     */
    private Long updateBy;


}


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

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

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

import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;

import lombok.Data;

/**
 * 事件实体类
 *
 * @author cedoo email:cedoo(a)qq.com
 * @version 1.0
 * @since 1.0
 * @date 2021-05-26
 */
@Data
@TableName("event")
public class EventDO implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * id 列: id
     */
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;
    /**
     * 服务单号 列: order_sn
     */
    private String orderSn;
    /**
     * 1、办件事件2是宣传事件3是阅读事件 列: event_category
     */
    private Long eventCategory;
    /**
     * 网格员所处的街道 列: grid_member_street
     */
    private Long gridMemberStreet;
    /**
     * 网格员所处社区 列: grid_member_community
     */
    private Long gridMemberCommunity;
    /**
     * 网格ID 列: grid_id
     */
    private Long gridId;
    /**
     * 网格员 列: grid_member_id
     */
    private Long gridMemberId;
    /**
     * 网格员名字 列: grid_member_name
     */
    private String gridMemberName;
    /**
     * 网格员联系方式 列: grid_member_telephone
     */
    private String gridMemberTelephone;
    /**
     * 事件标题 列: event_title
     */
    private String eventTitle;
    /**
     * 宣传类型 列: propaganda_type
     */
    private String propagandaType;
    /**
     * 宣传时间 列: propaganda_time
     */
    private Date propagandaTime;
    /**
     * 当event_type_category是1填写事件分类1治安隐患、2公共服务、3矛盾纠纷、4不稳定因素、5突发事件、6特殊人群信息上报 列: event_type
     */
    private Integer eventType;
    /**
     * 事件类型 列: event_clazz
     */
    private String eventClazz;
    /**
     * 事件描述 列: event_des
     */
    private String eventDes;
    /**
     * 宣传对象 列: propaganda_object
     */
    private String propagandaObject;
    /**
     * 宣传人数 列: propaganda_num
     */
    private String propagandaNum;
    /**
     * 社区处理(0是无需社区1是社区处理) 列: community_process
     */
    private Integer communityProcess;
    /**
     * 发生时间 列: happen_time
     */
    private Date happenTime;
    /**
     * 事件发生地点备注 列: happent_address
     */
    private String happentAddress;
    /**
     * 事件发生地点 列: happen_address
     */
    private String happenAddress;
    /**
     * 发生的精度纬度信息（逗号隔开） 列: happent_lat_lng
     */
    private String happentLatLng;
    /**
     * 事件状态（1草稿箱2发布3逻辑删除4、撤销） 列: event_status
     */
    private Integer eventStatus;
    /**
     * 1待处理2已解决3待验证 列: event_process_status
     */
    private Integer eventProcessStatus;
    /**
     * 当前处理对象类型（1、网格员2、社区3、是街道） 列: process_type
     */
    private Integer processType;
    /**
     * 处理人ID 列: process_user_id
     */
    private Long processUserId;
    /**
     * 处理流程记录ID 列: process_record_id
     */
    private Long processRecordId;
    /**
     * 处理人名称 列: process_user_name
     */
    private String processUserName;
    /**
     * 处理时间 列: process_date
     */
    private Date processDate;
    /**
     * 解决人针对解决事件的处理描述 列: process_desc
     */
    private String processDesc;
    /**
     * 事件来源 列: event_resource
     */
    private String eventResource;
    /**
     * 危险级别 列: danger_level
     */
    private Integer dangerLevel;
    /**
     * 红牌 列: red_card
     */
    private Boolean redCard;
    /**
     * 黄牌 列: yellow_card
     */
    private Boolean yellowCard;
    /**
     * 是否有效 列: invalid
     */
    private Boolean invalid;
    /**
     * 是否重大 列: major
     */
    private Boolean major;
    /**
     * 死亡人数 列: deaths_number
     */
    private Integer deathsNumber;
    /**
     * 受伤人数 列: injuries_number
     */
    private Integer injuriesNumber;
    /**
     * 是否疑难事件 列: difficult
     */
    private Boolean difficult;
    /**
     * 是否紧急 列: urgent
     */
    private Boolean urgent;
    /**
     * 是否催办 列: urgent_dell
     */
    private Boolean urgentDell;
    /**
     * 上报提交时间 列: submit_date
     */
    private Date submitDate;
    /**
     * 事件处理状态 列: event_deal_status
     */
    private Integer eventDealStatus;
    /**
     * 创建人 列: create_by
     */
    private Long createBy;
    /**
     * 创建时间 列: create_at
     */
    @TableField(fill = FieldFill.INSERT)
    private Date createAt;
    /**
     * 修改人 列: update_by
     */
    private Long updateBy;
    /**
     * 修改时间 列: update_at
     */
    @TableField(fill = FieldFill.UPDATE)
    private Date updateAt;

    private Boolean upload;

    /**
     * 撤销人/社区ID 列: revoke_id
     */
    private Long revokeId;
    /**
     * 修改时间 列: revoke_type
     */
    private Integer revokeType;
}

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

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

import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.dtos.community.convenient.PagePopularMerchantDTO;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;

/**
@@ -166,4 +167,30 @@
     * @return
     */
    R pageEventList(PageBaseDTO pageBaseDTO);

    /**
     * 河门口大屏首页
     * @return
     */
    R hmkBaseInfo(CommonPage commonPage);

    /**
     * 河门口大屏折线图
     * @return
     */
    R partyProjectActivityLine();

    /**
     * 活动评分排名
     * @param commonPage
     * @return
     */
    R projectActivityProject(CommonPage commonPage);

    /**
     * 根据责任方名字查询项目类型饼状图
     * @param name
     * @return
     */
    R projectType(String name);
}

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

@@ -196,7 +196,7 @@
     * @param status
     * @return 活动列表
     */
    R listActivity(Long userId, Integer status);
    R listActivity(Long userId, Integer status,Integer type);

    /**
     * 查询志愿者参与的所有已经完成的活动
@@ -293,4 +293,23 @@
     * @return
     */
    R addActivityType(ComActActivityTypeVO comActActivityTypeVO);

    /**
     * [方法描述] 根据社区ID查询所属城市所在区区域代码，
     * 
     * @param communityId
     *            社区ID
     * @return String 区域code
     * @author manailin
     * @date 2022/2/17 10:09
     */
    String getActBelongRegionCode(Long communityId);

    /**
     * 党员活动统计
     * @param communityId
     * @param year
     * @return
     */
    R partyMemberCount(Long communityId,String year);
}

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

@@ -3,6 +3,7 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.vos.community.ComActColumnVO;
import com.panzhihua.service_community.entity.ComActColumn;

/**
@@ -26,4 +27,10 @@
     * @return
     */
    R delete(Long id);

    /**
     * 项目级联查询
     * @param comActColumnVO
     */
    R queryLevel(ComActColumnVO comActColumnVO);
}

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

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

import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.service_community.entity.ComActRafflePrize;

/**
 * 抽奖活动奖品表(ComActRafflePrize)表服务接口
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 抽奖活动奖品表相关功能
 *
 * @author zzj
 * @since 2022-02-18 14:31:45
 */
public interface ComActRafflePrizeService extends IService<ComActRafflePrize> {
    /**
     * 分页查询
     *
     * @param commonPage
     * @return
     */
    R pageList(CommonPage commonPage);
}

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

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

import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.vos.community.warehouse.QRCodeVO;
import com.panzhihua.service_community.entity.ComActRaffleRecord;

/**
 * 抽奖活动中奖记录表(ComActRaffleRecord)表服务接口
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 抽奖活动中奖记录表相关功能
 *
 * @author zzj
 * @since 2022-02-18 14:32:02
 */
public interface ComActRaffleRecordService extends IService<ComActRaffleRecord> {
    /**
     * 分页查询
     *
     * @param commonPage
     * @return
     */
    R pageList(CommonPage commonPage);

    /**
     * 查询奖品信息
     * @param id
     * @return
     */
    R queryPrize(Long id);

    /**
     * 生成二维码
     * @param qrCodeVO
     * @return
     */
    R queryQrCode(QRCodeVO qrCodeVO);

    /**
     * 导出
     *
     * @param commonPage
     * @return
     */
    R export(CommonPage commonPage);

    /**
     * 根据Id查询
     * @param id
     * @return
     */
    R selectById(Long id);
}

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

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

import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.vos.community.raffle.ComActRaffleVO;
import com.panzhihua.service_community.entity.ComActRaffle;

/**
 * 抽奖活动表(ComActRaffle)表服务接口
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 抽奖活动表相关功能
 *
 * @author zzj
 * @since 2022-02-18 14:31:20
 */
public interface ComActRaffleService extends IService<ComActRaffle> {
    /**
     * 分页查询
     *
     * @param commonPage
     * @return
     */
    R pageList(CommonPage commonPage);

    /**
     * 新增
     * @param comActRaffleVO
     * @return
     */
    R insert(ComActRaffleVO comActRaffleVO);

    /**
     * 修改
     * @param comActRaffleVO
     * @return
     */
    R update(ComActRaffleVO comActRaffleVO);

    /**
     * 删除
     * @param id
     * @return
     */
    R delete(Long id);

    /**
     * 详情
     * @param id
     * @param userId
     * @return
     */
    R selectById(Long id,Long userId);
}

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

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

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.community.reserve.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.dtos.community.PageUserReserveDTO;
import com.panzhihua.common.model.dtos.community.reserve.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActReserveCommitVO;
import com.panzhihua.common.model.vos.community.bigscreen.IndexReserve;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveDetailAdminVO;
import com.panzhihua.service_community.model.dos.ComActReserveDO;

/**
@@ -76,7 +76,7 @@
     * @param reserveId 预约登记id
     * @return  预约登记详情
     */
    R detailReserveAdmin(Long reserveId);
    R<ComActReserveDetailAdminVO> detailReserveAdmin(Long reserveId);

    /**
     * 社区后台-根据社区id统计预约类数据

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

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

import java.util.List;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.model.dos.ComActReserveSubDO;
@@ -18,4 +20,12 @@
     */
    R subjectListAdmin(Long reserveId);

    /**
     * 查询预约登记题目下属选择项列表
     * 
     * @param reserveSubId
     *            预约登记id
     * @return 查询预约登记题目下属选择项列表
     */
    List<String> subjectSelectionListAdmin(Long reserveSubId);
}

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

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

import com.panzhihua.common.model.vos.ComActSocialMemberVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.service_community.entity.ComActSocialMember;

/**
 * 社会组织成员表(ComActSocialMember)表服务接口
 *
 * @author makejava
 * @since 2021-10-22 09:52:46
 */
public interface ComActSocialMemberService extends IService<ComActSocialMember> {
    /**
     * 分页查询
     *
     * @param commonPage
     * @return
     */
    R pageList(CommonPage commonPage);

    /**
     * 新增
     * @param comActSocialMemberVO
     * @return
     */
    R insert(ComActSocialMemberVO comActSocialMemberVO);

    /**
     * 修改
     * @param comActSocialMemberVO
     * @return
     */
    R update(ComActSocialMemberVO comActSocialMemberVO);

    /**
     * 详情
     * @param id
     * @return
     */
    R detail(Long id);

    /**
     * 删除
     */
    R delete(Long id);
}

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

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

import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.vos.community.social.ComActSocialProjectMemberVO;
import com.panzhihua.service_community.entity.ComActSocialProjectMember;

/**
 * 项目人员(ComActSocialProjectMember)表服务接口
 *
 * @author makejava
 * @since 2021-12-23 15:16:43
 */
public interface ComActSocialProjectMemberService extends IService<ComActSocialProjectMember> {
    /**
     * 分页查询
     *
     * @param commonPage
     * @return
     */
    R pageList(CommonPage commonPage);

    /**
     * 添加人员
     * @param comActSocialProjectMemberVO
     * @return
     */
    R insert(ComActSocialProjectMemberVO comActSocialProjectMemberVO);

    /**
     * 批量添加
     * @param comActSocialProjectMemberVO
     * @return
     */
    R insertBatch(ComActSocialProjectMemberVO comActSocialProjectMemberVO);
}

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

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

import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.service_community.entity.ComActSocialProjectPublicity;

/**
 * 项目宣传表(ComActSocialProjectPublicity)表服务接口
 *
 * @author makejava
 * @since 2021-12-23 14:30:54
 */
public interface ComActSocialProjectPublicityService extends IService<ComActSocialProjectPublicity> {
    /**
     * 分页查询
     *
     * @param commonPage
     * @return
     */
    R pageList(CommonPage commonPage);

    /**
     * 详情
     * @param id
     * @return
     */
    R selectOne(Long id);
}

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

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

import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.service_community.entity.ComActSocialProjectSchedule;

/**
 * 项目进度表(ComActSocialProjectSchedule)表服务接口
 *
 * @author makejava
 * @since 2021-12-23 14:31:16
 */
public interface ComActSocialProjectScheduleService extends IService<ComActSocialProjectSchedule> {
    /**
     * 分页查询
     *
     * @param commonPage
     * @return
     */
    R pageList(CommonPage commonPage);
}

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

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

import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.service_community.entity.ComActSocialProject;

/**
 * 三社联动项目表(ComActSocialProject)表服务接口
 *
 * @author makejava
 * @since 2021-12-22 14:02:47
 */
public interface ComActSocialProjectService extends IService<ComActSocialProject> {
    /**
     * 分页查询
     *
     * @param commonPage
     * @return
     */
    R pageList(CommonPage commonPage);

    /**
     * 小程序获取详情
     * @param id
     * @return
     */
    R getByApplet(Long id);

    /**
     * 小程序获取详情
     * @param id
     * @return
     */
    R getByBackstage(Long id);

    /**
     * 根据项目id分页查询关联项目
     * @param commonPage
     * @return
     */
    R getProject(CommonPage commonPage);
}

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

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

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.panzhihua.common.model.dtos.civil.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.vos.civil.ComActSocialWorkerDetailsVO;
import com.panzhihua.common.model.vos.civil.ComActSocialWorkerVO;
import com.panzhihua.service_community.entity.ComActSocialWorker;

import java.util.List;

/**
 * 社工(ComActSocialWorker)表服务接口
 *
 * @author makejava
 * @since 2021-10-25 10:56:47
 */
public interface ComActSocialWorkerService extends IService<ComActSocialWorker> {
    /**
     * 新增社工
     * @param comActSocialWorkerAddDTO
     * @return 新增结果
     */
    R add(ComActSocialWorkerAddDTO comActSocialWorkerAddDTO);

    /**
     * 修改社工
     * @param comActSocialWorkerEditDTO
     * @return 维护结果
     */
    R edit(ComActSocialWorkerEditDTO comActSocialWorkerEditDTO);

    /**
     * 分页查找社工
     * @param pageComActSocialWorkerDTO
     * @return 维护结果
     */
    R<IPage<ComActSocialWorkerVO>> query(PageComActSocialWorkerDTO pageComActSocialWorkerDTO);

    /**
     * 删除社工
     * @param ComActSocialWorkerDeleteDTO
     * @return 平台用户信息
     */
    R delete(ComActSocialWorkerDeleteDTO ComActSocialWorkerDeleteDTO);

    /**
     * 查询社工详细信息
     * @param id 社工 id
     * @return 查找结果
     */
    R<ComActSocialWorkerDetailsVO> comActSocialWorkerDetails(Long id);

    /**
     * 导出
     * @param lis
     * @param communityId
     * @return
     */
    R export(List<ComActSocialWorkerExcelVO> lis, Long communityId);

    /**
     * 查询活动社工
     * @param commonPage
     * @return
     */
    R activity(CommonPage commonPage);

    /**
     * 根据社工查询活动
     * @param commonPage
     * @return
     */
    R activityList(CommonPage commonPage);
}

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

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

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.service_community.entity.ComActSocialWorkerService;

/**
 * 社工服务表(ComActSocialWorkerService)表服务接口
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 社工服务表相关功能
 *
 * @author zzj
 * @since 2022-02-16 15:59:42
 */
public interface ComActSocialWorkerServiceService extends IService<ComActSocialWorkerService> {
    /**
     * 分页查询
     * @param commonPage
     * @return
     */
    R pageList(CommonPage commonPage);

    /**
     * 详情
     * @param id
     * @return
     */
    R selectById(Long id);
}

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

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

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.community.fms.AddFmsClassroomAdminDTO;
import com.panzhihua.common.model.dtos.community.fms.EditFmsClassroomAdminDTO;
import com.panzhihua.common.model.dtos.community.fms.PageFmsClassroomAdminDTO;
import com.panzhihua.common.model.dtos.community.fms.PageFmsEventAdminDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.entity.ComFmsClassroom;

/**
 * 五微服务-微学堂(ComFmsClassroom)表服务接口
 *
 * @author makejava
 * @since 2022-02-11 13:35:52
 */
public interface ComFmsClassroomService extends IService<ComFmsClassroom> {

    /**
     * 后台新增微讲堂
     * @param adminDTO
     * @return
     */
    R addFmsClassroom(AddFmsClassroomAdminDTO adminDTO);

    /**
     * 后台编辑微讲堂
     * @param adminDTO
     * @return
     */
    R editFmsClassroom(EditFmsClassroomAdminDTO adminDTO);

    /**
     * 后台删除微讲堂
     * @param id
     * @return
     */
    R deleteFmsClassroom(Long id);

    /**
     * 后台获取微讲堂详情
     * @param id
     * @return
     */
    R detailFmsClassroom(Long id);

    /**
     * 后台分页查询微讲堂
     * @param adminDTO
     * @return
     */
    R pageFmsClassroomAdmin(PageFmsClassroomAdminDTO adminDTO);

    /**
     * 微讲堂顶部统计
     * @param communityId
     * @return
     */
    R statisticsFmsClassroom(Long communityId);

    /**
     * 后台分页查询微调节/微防控
     * @param adminDTO
     * @return
     */
    R pageFmsEvent(PageFmsEventAdminDTO adminDTO);

    /**
     * 微调节/微防控顶部统计
     * @param type
     * @param communityId
     * @return
     */
    R statisticsFmsEvent(Integer type, Long communityId);

    /**
     * 小程序获取微讲堂详情
     * @param id
     * @return
     */
    R detailFmsClassroomApplets(Long id);

    /**
     * 小程序分页查询微调节/微防控
     * @param adminDTO
     * @return
     */
    R pageFmsEventApplets(PageFmsEventAdminDTO adminDTO);
}

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

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

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.community.fms.EvaluationFmsServiceDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.entity.ComFmsServiceEvaluations;

/**
 * 五微服务-服务评价(ComFmsServiceEvaluations)表服务接口
 *
 * @author makejava
 * @since 2022-02-11 13:35:53
 */
public interface ComFmsServiceEvaluationsService extends IService<ComFmsServiceEvaluations> {

    /**
     * 微服务评价
     * @param evaluationFmsServiceDTO
     * @return
     */
    R evaluateFmsService(EvaluationFmsServiceDTO evaluationFmsServiceDTO);
}

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

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

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.service_community.entity.ComFmsServiceRecord;

/**
 * 五微服务-服务记录(ComFmsServiceRecord)表服务接口
 *
 * @author makejava
 * @since 2022-02-11 13:35:54
 */
public interface ComFmsServiceRecordService extends IService<ComFmsServiceRecord> {

}

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

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

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.community.fms.AddFmsServiceAdminDTO;
import com.panzhihua.common.model.dtos.community.fms.ApplyFmsServiceDTO;
import com.panzhihua.common.model.dtos.community.fms.ApprovalFmsServiceAdminDTO;
import com.panzhihua.common.model.dtos.community.fms.FeedbackFmsServiceDTO;
import com.panzhihua.common.model.dtos.community.fms.PageFmsServiceAdminDTO;
import com.panzhihua.common.model.dtos.community.fms.PageFmsServiceAppletsDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.fms.ComFmsServiceImportExcelVO;
import com.panzhihua.service_community.entity.ComFmsService;

import java.util.List;

/**
 * 五微服务-微服务(ComFmsService)表服务接口
 *
 * @author makejava
 * @since 2022-02-11 13:35:53
 */
public interface ComFmsServiceService extends IService<ComFmsService> {

    /**
     * 后台新增微服务
     * @param adminDTO
     * @return
     */
    R addFmsServiceAdmin(AddFmsServiceAdminDTO adminDTO);

    /**
     * 后台分页查询微服务
     * @param adminDTO
     * @return
     */
    R pageFmsServiceAdmin(PageFmsServiceAdminDTO adminDTO);

    /**
     * 后台核实微服务
     * @param adminDTO
     * @return
     */
    R approvalFmsService(ApprovalFmsServiceAdminDTO adminDTO);

    /**
     * 后台查看微服务详情
     * @param serviceId
     * @return
     */
    R detailFmsServiceAdmin(Long serviceId);

    /**
     * 后台删除微服务
     * @param serviceId
     * @return
     */
    R deleteFmsServiceAdmin(Long serviceId);

    /**
     * 微服务顶部统计
     * @param communityId
     * @return
     */
    R statisticsFmsService(Long communityId);

    /**
     * 后台导入微服务数据
     * @param voList
     * @param communityId
     * @param userId
     * @return
     */
    R listSaveFmsServiceExcelVO(List<ComFmsServiceImportExcelVO> voList, Long communityId, Long userId);

    /**
     * 小程序分页查询微服务
     * @param adminDTO
     * @return
     */
    R pageFmsServiceApplets(PageFmsServiceAppletsDTO adminDTO);

    /**
     * 小程序查看微服务详情
     * @param serviceId
     * @param userId
     * @return
     */
    R detailFmsServiceApplets(Long serviceId, Long userId);

    /**
     * 微服务申请
     * @param adminDTO
     * @return
     */
    R applyFmsService(ApplyFmsServiceDTO adminDTO);

    /**
     * 分页查询我的微服务
     * @param adminDTO
     * @return
     */
    R pageMyFmsService(PageFmsServiceAppletsDTO adminDTO);

    /**
     * 微团队成员分页查询服务处理
     * @param adminDTO
     * @return
     */
    R pageDealFmsService(PageFmsServiceAppletsDTO adminDTO);

    /**
     * 微团队成员服务反馈
     * @param adminDTO
     * @return
     */
    R feedbackFmsService(FeedbackFmsServiceDTO adminDTO);

    /**
     * 定时任务针对服务结束后3天还未评价的用户默认好评
     * @return
     */
    R defaultPraise();
}

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

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

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.service_community.entity.ComFmsTeamMemberRelation;

/**
 * 五微服务-团队&成员关系表(ComFmsTeamMemberRelation)表服务接口
 *
 * @author makejava
 * @since 2022-02-14 14:41:36
 */
public interface ComFmsTeamMemberRelationService extends IService<ComFmsTeamMemberRelation> {

}

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

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

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.community.fms.AddTeamMemberDTO;
import com.panzhihua.common.model.dtos.community.fms.DeleteTeamMemberDTO;
import com.panzhihua.common.model.dtos.community.fms.EditTeamMemberDTO;
import com.panzhihua.common.model.dtos.community.fms.PageTeamMemberDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.fms.ComFmsTeamMemberImportExcelVO;
import com.panzhihua.service_community.entity.ComFmsTeamMember;

import java.util.List;

/**
 * 五微服务-团队成员(ComFmsTeamMember)表服务接口
 *
 * @author makejava
 * @since 2022-02-11 13:35:55
 */
public interface ComFmsTeamMemberService extends IService<ComFmsTeamMember> {

    /**
     * 新增团队成员
     * @param addTeamMemberDTO
     * @return
     */
    R addFmsTeamMember(AddTeamMemberDTO addTeamMemberDTO);

    /**
     * 编辑团队成员
     * @param editTeamMemberDTO
     * @return
     */
    R editFmsTeamMember(EditTeamMemberDTO editTeamMemberDTO);

    /**
     * 删除团队成员
     * @param deleteTeamMemberDTO
     * @return
     */
    R deleteFmsTeamMember(DeleteTeamMemberDTO deleteTeamMemberDTO);

    /**
     * 分页查询团队成员
     * @param pageTeamMemberDTO
     * @return
     */
    R pageFmsTeamMember(PageTeamMemberDTO pageTeamMemberDTO);

    /**
     * 微团队顶部统计
     * @param communityId
     * @return
     */
    R statisticsFmsTeamMember(Long communityId);

    /**
     * 批量导入团队成员
     * @param voList
     * @param communityId
     * @param userId
     * @return
     */
    R listSaveFmsTeamMemberExcelVO(List<ComFmsTeamMemberImportExcelVO> voList, Long communityId, Long userId);

    /**
     * 团队人员导出
     * @param pageTeamMemberDTO
     * @return
     */
    R exportTeamMember(PageTeamMemberDTO pageTeamMemberDTO);

    /**
     * 级联查询团队服务人员
     * @param communityId
     * @return
     */
    R retrieveFmsTeamMemberCascade(Long communityId);
}

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

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

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.community.fms.AddTeamDTO;
import com.panzhihua.common.model.dtos.community.fms.EditTeamDTO;
import com.panzhihua.common.model.dtos.community.fms.PageFmsTeamDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.entity.ComFmsTeam;

/**
 * 五微服务-微团队(ComFmsTeam)表服务接口
 *
 * @author makejava
 * @since 2022-02-11 13:35:55
 */
public interface ComFmsTeamService extends IService<ComFmsTeam> {

    /**
     * 新增团队
     * @param addTeamDTO
     * @return
     */
    R addFmsTeam(AddTeamDTO addTeamDTO);

    /**
     * 修改团队信息
     * @param editTeamDTO
     * @return
     */
    R editFmsTeam(EditTeamDTO editTeamDTO);

    /**
     * 删除团队
     * @param teamId
     * @return
     */
    R deleteFmsTeam(Long teamId);

    /**
     * 获取团队列表
     * @param teamTypeId
     * @return
     */
    R listFmsTeam(Long teamTypeId);

    /**
     * 获取团队详情
     * @param teamId
     * @return
     */
    R detailFmsTeam(Long teamId);

    /**
     * 级联查询团队数据
     * @param communityId
     * @return
     */
    R retrieveFmsTeamCascade(Long communityId);

    /**
     * 小程序分页查询团队信息
     * @param pageFmsTeamDTO
     * @return
     */
    R pageFmsTeamApplets(PageFmsTeamDTO pageFmsTeamDTO);
}

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

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

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.community.fms.AddTeamTypeDTO;
import com.panzhihua.common.model.dtos.community.fms.EditTeamTypeDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.entity.ComFmsTeamType;

/**
 * 五微服务-团队类型(ComFmsTeamType)表服务接口
 *
 * @author makejava
 * @since 2022-02-11 13:35:56
 */
public interface ComFmsTeamTypeService extends IService<ComFmsTeamType> {

    /**
     * 新增团队类型
     * @param addTeamTypeDTO
     * @return
     */
    R addFmsTeamType(AddTeamTypeDTO addTeamTypeDTO);

    /**
     * 修改团队类型
     * @param editTeamTypeDTO
     * @return
     */
    R editFmsTeamType(EditTeamTypeDTO editTeamTypeDTO);

    /**
     * 删除团队类型
     * @param teamTypeId
     * @param communityId
     * @return
     */
    R deleteFmsTeamType(Long teamTypeId, Long communityId);

    /**
     * 获取团队类型列表
     * @param communityId
     * @return
     */
    R listFmsTeamType(Long communityId);
}

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

@@ -5,6 +5,7 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO;
import com.panzhihua.common.model.vos.community.TodoEventsVO;
import com.panzhihua.common.model.vos.community.volunteer.ComMngVolunteerExcelVO;
import com.panzhihua.common.model.vos.user.UserPhoneVO;

/**
@@ -16,7 +17,7 @@
public interface ComMngVolunteerMngService {
    /**
     * 增加志愿者
     * 
     *
     * @param comMngVolunteerMngVO
     *            志愿者信息
     * @return 增加结果
@@ -25,7 +26,7 @@

    /**
     * 删除志愿者
     * 
     *
     * @param comMngVolunteerMngVO
     *            手机号
     * @return 删除结果
@@ -34,7 +35,7 @@

    /**
     * 编辑志愿者
     * 
     *
     * @param comMngVolunteerMngVO
     *            编辑内容
     * @return 编辑结果
@@ -43,7 +44,7 @@

    /**
     * 分页展示志愿者
     * 
     *
     * @param comMngVolunteerMngVO
     *            查询参数
     * @return 分页集合返回
@@ -52,7 +53,7 @@

    /**
     * 分页展示志愿者审核
     * 
     *
     * @param comMngVolunteerMngVO
     *            查询参数
     * @return 查询结果
@@ -61,7 +62,7 @@

    /**
     * 志愿者审核详情
     * 
     *
     * @param id
     *            主键
     * @return 详情
@@ -70,7 +71,7 @@

    /**
     * 志愿者审核
     * 
     *
     * @param comMngVolunteerMngVO
     *            审核操作
     * @return 审核结果
@@ -79,7 +80,7 @@

    /**
     * 删除志愿者审核
     * 
     *
     * @param comMngVolunteerMngVO
     *            主键
     * @return 删除结果
@@ -88,7 +89,7 @@

    /**
     * 用户修改手机号对应的志愿者手机号也要修改
     * 
     *
     * @param userPhoneVO
     *            新旧手机号
     * @return 修改结果
@@ -97,7 +98,7 @@

    /**
     * 志愿者详情
     * 
     *
     * @param id
     *            主键
     * @return 志愿者
@@ -106,7 +107,7 @@

    /**
     * 社区后台数据看板
     * 
     *
     * @param communityId
     *            社区id
     * @param userId
@@ -117,9 +118,19 @@

    /**
     * 获取志愿者详情
     * 
     *
     * @param id
     * @return
     */
    R getVolunteerById(Long id);

    /**
     * 志愿者导入
     *
     * @param list        志愿者数据列表
     * @param communityId 社区id
     * @param userId      用户id
     * @return 导入结果
     */
    R importVolunteerAdmin(List<ComMngVolunteerExcelVO> list, Long communityId, Long userId);
}

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

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

import com.panzhihua.common.model.dtos.common.*;
import com.panzhihua.common.model.vos.R;

/**
 * 志愿者组织队伍表表服务接口
 *
 * @author lyq
 * @since 2021-10-30 15:51:23
 */
public interface ComMngVolunteerOrgTeamService {

    /**
     * 通过ID查询单条数据
     *
     * @param id 主键
     * @return 实例对象
     */
    R queryById(Long id);

    /**
     * 分页查询
     *
     * @param comMngVolunteerOrgTeam 筛选条件
     * @return 查询结果
     */
    R queryByPage(PageComMngVolunteerOrgTeamDto comMngVolunteerOrgTeam);

    /**
     * 新增数据
     *
     * @param comMngVolunteerOrgTeam 实例对象
     * @return 实例对象
     */
    R insert(AddComMngVolunteerOrgTeamDto comMngVolunteerOrgTeam);

    /**
     * 修改数据
     *
     * @param comMngVolunteerOrgTeam 实例对象
     * @return 实例对象
     */
    R update(EditComMngVolunteerOrgTeamDto comMngVolunteerOrgTeam);

    /**
     * 通过主键删除数据
     *
     * @param id 主键
     * @return 是否成功
     */
    R deleteById(Long id);

    /**
     * 社区后台-查询志愿者组织列表
     * @param comMngVolunteerOrgTeam    请求参数
     * @return  志愿者组织列表
     */
    R queryByList(PageComMngVolunteerOrgTeamDto comMngVolunteerOrgTeam);

    /**
     * 社区后台-志愿者组织统计
     * @param communityId   社区id
     * @return  志愿者组织统计
     */
    R statisticsVolunteerOrgAdmin(Long communityId);

}

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

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

import com.panzhihua.common.model.dtos.common.*;
import com.panzhihua.common.model.vos.R;

/**
 * 志愿者服务类型表表服务接口
 *
 * @author lyq
 * @since 2021-10-30 16:47:10
 */
public interface ComMngVolunteerServiceTypeService {

    /**
     * 通过ID查询单条数据
     *
     * @param id 主键
     * @return 实例对象
     */
    R queryById(Long id);

    /**
     * 分页查询
     *
     * @param comMngVolunteerServiceType 筛选条件
     * @return 查询结果
     */
    R queryByPage(PageComMngVolunteerServiceTypeDto comMngVolunteerServiceType);

    /**
     * 新增数据
     *
     * @param comMngVolunteerServiceType 实例对象
     * @return 实例对象
     */
    R insert(AddComMngVolunteerServiceTypeDto comMngVolunteerServiceType);

    /**
     * 修改数据
     *
     * @param comMngVolunteerServiceType 实例对象
     * @return 实例对象
     */
    R update(EditComMngVolunteerServiceTypeDto comMngVolunteerServiceType);

    /**
     * 通过主键删除数据
     *
     * @param id 主键
     * @return 是否成功
     */
    R deleteById(Long id);

    /**
     * 社区后台-查询志愿者服务类型列表
     * @param comMngVolunteerServiceType    请求参数
     * @return  志愿者服务列表
     */
    R queryByList(PageComMngVolunteerServiceTypeDto comMngVolunteerServiceType);

}

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

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

import com.panzhihua.common.model.dtos.common.*;
import com.panzhihua.common.model.vos.R;

/**
 * 志愿者技能表表服务接口
 *
 * @author lyq
 * @since 2021-10-30 16:47:36
 */
public interface ComMngVolunteerSkillService {

    /**
     * 通过ID查询单条数据
     *
     * @param id 主键
     * @return 实例对象
     */
    R queryById(Long id);

    /**
     * 分页查询
     *
     * @param comMngVolunteerSkill 筛选条件
     * @return 查询结果
     */
    R queryByPage(PageComMngVolunteerSkillDto comMngVolunteerSkill);

    /**
     * 新增数据
     *
     * @param comMngVolunteerSkill 实例对象
     * @return 实例对象
     */
    R insert(AddComMngVolunteerSkillDto comMngVolunteerSkill);

    /**
     * 修改数据
     *
     * @param comMngVolunteerSkill 实例对象
     * @return 实例对象
     */
    R update(EditComMngVolunteerSkillDto comMngVolunteerSkill);

    /**
     * 通过主键删除数据
     *
     * @param id 主键
     * @return 是否成功
     */
    R deleteById(Long id);

    /**
     * 社区后台-查询志愿者技能列表
     * @param comMngVolunteerSkill 请求参数
     * @return  志愿者技能列表
     */
    R queryByList(PageComMngVolunteerSkillDto comMngVolunteerSkill);

}

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

@@ -18,7 +18,7 @@
     *            街道信息
     * @return 新增结果
     */
    R addStreet(ComStreetVO comStreetVO);
    R<ComStreetVO> addStreet(ComStreetVO comStreetVO);

    /**
     * 查询社区

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

@@ -14,6 +14,10 @@

import javax.annotation.Resource;

import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.community.bigscreen.*;
import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.service_community.dao.*;
import org.springframework.stereotype.Service;

import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -102,6 +106,16 @@

    @Resource
    private ComActCommitteeDao comActCommitteeDao;

    @Resource
    private ComActSocialProjectDao comActSocialProjectDao;

    @Resource
    private ComActSocialOrgDao comActSocialOrgDao;

    @Resource
    private ComActSocialWorkerDao comActSocialWorkerDao;


    /**
     * 大数据分析平台-居民自治
@@ -632,6 +646,107 @@
        return R.ok(iPage);
    }

    @Override
    public R hmkBaseInfo(CommonPage commonPage) {
        BigScreenHmkBaseInfo bigScreenHmkBaseInfo=comActSocialProjectDao.selectIndexBaseInfo();
        //项目数据
        BigScreenHmkProjectInfo bigScreenHmkProjectInfo=comActSocialProjectDao.selectBaseInfo(commonPage.getCommunityId());
        List<BigScreenHmkProjectTypeInfo> typeInfo=comActSocialProjectDao.selectType(null,commonPage.getCommunityId());
        if(bigScreenHmkProjectInfo.getCount()>0){
            typeInfo.forEach(bigScreenHmkProjectTypeInfo -> {
                bigScreenHmkProjectTypeInfo.setPercent(bigScreenHmkProjectTypeInfo.getCount()/bigScreenHmkProjectInfo.getCount());
            });
        }
        bigScreenHmkProjectInfo.setTypeInfoList(typeInfo);
        //活动数据
        Integer countAll=comActSocialProjectDao.selectActivity(0,commonPage.getCommunityId());
        BigScreenHmkProjectTypeInfo jm=new BigScreenHmkProjectTypeInfo();
        jm.setName("居民活动");
        jm.setCount(comActSocialProjectDao.selectActivity(2,commonPage.getCommunityId()));
        if(countAll>0){
            jm.setPercent(jm.getCount()/countAll);
        }
        BigScreenHmkProjectTypeInfo zyz=new BigScreenHmkProjectTypeInfo();
        zyz.setName("志愿者活动");
        zyz.setCount(comActSocialProjectDao.selectActivity(1,commonPage.getCommunityId()));
        if(countAll>0){
            zyz.setPercent(zyz.getCount()/countAll);
        }
        List<BigScreenHmkProjectTypeInfo> activityList=new ArrayList<>();
        activityList.add(jm);
        activityList.add(zyz);
        bigScreenHmkProjectInfo.setActivityTypeInfoList(activityList);
        //社会组织数据
        BigScreenHmkSocialOrgInfo bigScreenHmkSocialOrgInfo=comActSocialOrgDao.selectInfo(commonPage.getCommunityId());
        List<BigScreenHmkProjectTypeInfo> typeInfoList= comActSocialOrgDao.selectType(commonPage.getCommunityId());
        if(bigScreenHmkSocialOrgInfo.getCount()>0){
            typeInfoList.forEach(bigScreenHmkProjectTypeInfo -> {
                bigScreenHmkProjectTypeInfo.setPercent(bigScreenHmkProjectTypeInfo.getCount()/bigScreenHmkSocialOrgInfo.getCount());
            });
        }
        bigScreenHmkSocialOrgInfo.setTypeInfoList(typeInfoList);
        bigScreenHmkBaseInfo.setBigScreenHmkSocialOrgInfo(bigScreenHmkSocialOrgInfo);
        //社工数据
        BigScreenHmkSocialWorkerInfo bigScreenHmkSocialWorkerInfo=new BigScreenHmkSocialWorkerInfo();
        List<BigScreenHmkProjectTypeInfo> socialWorkerList=new ArrayList<>();
        Integer socialAll=comActSocialWorkerDao.selectType(0,commonPage.getCommunityId());
        BigScreenHmkProjectTypeInfo ss=new BigScreenHmkProjectTypeInfo();
        ss.setName("30岁以下");
        ss.setCount(comActSocialWorkerDao.selectType(1,commonPage.getCommunityId()));
        if(socialAll>0){
            ss.setPercent(ss.getCount()/socialAll);
        }
        BigScreenHmkProjectTypeInfo wj=new BigScreenHmkProjectTypeInfo();
        wj.setName("30-59岁");
        wj.setCount(comActSocialWorkerDao.selectType(2,commonPage.getCommunityId()));
        if(socialAll>0){
            wj.setPercent(wj.getCount()/socialAll);
        }
        BigScreenHmkProjectTypeInfo ls=new BigScreenHmkProjectTypeInfo();
        ls.setName("60岁以上");
        ls.setCount(comActSocialWorkerDao.selectType(3,commonPage.getCommunityId()));
        if(socialAll>0){
            ls.setPercent(ls.getCount()/socialAll);
        }
        socialWorkerList.add(ss);
        socialWorkerList.add(wj);
        socialWorkerList.add(ls);
        bigScreenHmkSocialWorkerInfo.setSocialWorkerAge(socialWorkerList);
        List<BigScreenHmkProjectTypeInfo> socialWorkerSkill=comActSocialWorkerDao.selectSkillType(commonPage.getCommunityId());
        if(socialAll>0){
            socialWorkerSkill.forEach(bigScreenHmkProjectTypeInfo -> {
                bigScreenHmkProjectTypeInfo.setPercent(bigScreenHmkProjectTypeInfo.getCount()/socialAll);
            });
        }
        bigScreenHmkSocialWorkerInfo.setSocialWorkerSkill(socialWorkerSkill);
        bigScreenHmkBaseInfo.setBigScreenHmkSocialWorkerInfo(bigScreenHmkSocialWorkerInfo);
        bigScreenHmkBaseInfo.setBigScreenHmkProjectInfo(bigScreenHmkProjectInfo);
        return R.ok(bigScreenHmkBaseInfo);
    }

    @Override
    public R partyProjectActivityLine() {
        List<BigScreenActivityLine> bigScreenActivityLines=this.getPastMonth();
        bigScreenActivityLines.forEach(bigScreenActivityLine -> {
            BigScreenActivityLine bigScreenActivityLine1=comActSocialProjectDao.selectActivityCountMonth(bigScreenActivityLine.getX(),bigScreenActivityLine.getYear());
            bigScreenActivityLine.setY(bigScreenActivityLine1.getY());
            bigScreenActivityLine.setCountY(bigScreenActivityLine1.getCountY());
            bigScreenActivityLine.setX(bigScreenActivityLine.getYear().substring(2,4)+"-"+bigScreenActivityLine.getX());
        });

        return R.ok(bigScreenActivityLines);
    }

    @Override
    public R projectActivityProject(CommonPage commonPage) {
        return R.ok(comActActivityDAO.selectProjectActivity(new Page(commonPage.getPage(),commonPage.getSize())));
    }

    @Override
    public R projectType(String name) {
        return R.ok(comActSocialProjectDao.selectType(name,null));
    }

    private Page retrievePage(PageBaseDTO pageBaseDTO) {
        Long pageNum = pageBaseDTO.getPageNum();
        Long size = pageBaseDTO.getPageSize();
@@ -645,4 +760,16 @@
        }
        return page;
    }
    public List<BigScreenActivityLine> getPastMonth(){
        List<BigScreenActivityLine> bigScreenActivityLines=new ArrayList<>();
        for(int i=11;i>=0;i--){
            BigScreenActivityLine bigScreenActivityLine=new BigScreenActivityLine();
            String date=DateUtils.getDateFormatString(DateUtils.addMonth(new Date(),-i),"MM");
            String year=DateUtils.getDateFormatString(DateUtils.addMonth(new Date(),-i),"yyyy");
            bigScreenActivityLine.setX(date);
            bigScreenActivityLine.setYear(year);
            bigScreenActivityLines.add(bigScreenActivityLine);
        }
        return bigScreenActivityLines;
    }
}

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

@@ -10,23 +10,17 @@
import java.text.DecimalFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;

import javax.annotation.Resource;

import com.panzhihua.common.model.vos.user.SysTemplateConfigVO;
import com.panzhihua.service_community.dao.*;
import com.panzhihua.service_community.model.dos.*;
import com.panzhihua.common.model.vos.community.*;
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils;

import com.alibaba.fastjson.JSONObject;
@@ -42,21 +36,15 @@
import com.panzhihua.common.model.vos.IndexDataVO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ActivitySignVO;
import com.panzhihua.common.model.vos.community.ComActActEvaluateVO;
import com.panzhihua.common.model.vos.community.ComActActPictureVO;
import com.panzhihua.common.model.vos.community.ComActActRegistVO;
import com.panzhihua.common.model.vos.community.ComActActivityStatisticsVO;
import com.panzhihua.common.model.vos.community.ComActActivityTypeVO;
import com.panzhihua.common.model.vos.community.ComActActivityVO;
import com.panzhihua.common.model.vos.community.CommunityActivitiesVO;
import com.panzhihua.common.model.vos.community.CommunityGovernanceTrendsVO;
import com.panzhihua.common.model.vos.community.SignactivityVO;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.community.screen.work.ActActivityListVO;
import com.panzhihua.common.model.vos.user.SysTemplateConfigVO;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.WxUtil;
import com.panzhihua.common.utlis.WxXCXTempSend;
import com.panzhihua.service_community.dao.*;
import com.panzhihua.service_community.entity.ComActActivityCode;
import com.panzhihua.service_community.model.dos.*;
import com.panzhihua.service_community.service.ComActActivityCodeService;
import com.panzhihua.service_community.service.ComActActivityService;
import com.panzhihua.service_community.service.ComActIntegralUserTradeService;
@@ -129,7 +117,9 @@
                comActActivityDO.setStatus(3);
            }
        }

        if(comActActivityVO.getType()==4){
            comActActivityDO.setIsProject(1);
        }
        boolean save = this.save(comActActivityDO);
        if (!save) {
            return R.fail();
@@ -150,7 +140,7 @@
        ComActActivityCode comActActivityCode = new ComActActivityCode();
        comActActivityCode.setActivityId(comActActivityDO.getId().longValue());
        comActActivityCode.setCreateTime(new Date());
        comActActivityCode.setType(1);
        comActActivityCode.setType(comActActivityVO.getType());
        comActActivityCode.setStatus(1);
        comActActivityCodeService.save(comActActivityCode);
        return R.ok(activityId);
@@ -313,10 +303,22 @@
                    comActActivityVO.setIsVolunteer(comActActSignDO.getIsVolunteer());
                }
                List<ComActActRegistDO> regList = comActActRegistDAO.selectList(new QueryWrapper<ComActActRegistDO>().lambda()
                        .eq(ComActActRegistDO::getUserId, userId).eq(ComActActRegistDO::getActivityId, id).eq(ComActActRegistDO::getType, 1));
                        .eq(ComActActRegistDO::getUserId, userId).eq(ComActActRegistDO::getActivityId, id));
                if (!regList.isEmpty()) {
                    List<ComActActRegistDO> collect = regList.stream().sorted(Comparator.comparing(ComActActRegistDO::getId).reversed()).collect(Collectors.toList());
                    comActActivityVO.setTimes(collect.get(0).getTimes());
                    ComActActRegistDO comActActRegistDO=collect.get(0);
                    if(comActActRegistDO.getType()==2){
                        if(comActActRegistDO.getEndTime()==null){
                            comActActivityVO.setSignType(2);
                        }
                        else {
                            comActActivityVO.setSignType(1);
                        }
                    }
                }
                else {
                    comActActivityVO.setSignType(1);
                }
            }
        }
@@ -596,7 +598,7 @@
     * @return 活动列表
     */
    @Override
    public R listActivity(Long userId, Integer status) {
    public R listActivity(Long userId, Integer status,Integer type) {
        List<ActivitySignVO> activitySignVOList = comActActSignDAO.selectList(userId);
        if (ObjectUtils.isEmpty(activitySignVOList)) {
            return R.ok();
@@ -613,6 +615,9 @@
                comActActivityDOS = comActActivityDOS.stream()
                        .filter(activityDO -> activityDO.getStatus().equals(status)).collect(Collectors.toList());
            }
        }
        if(isNull(type)){
            comActActivityDOS=comActActivityDOS.stream().filter(comActActivityDO -> comActActivityDO.getType().equals(type)).collect(Collectors.toList());
        }
        if (!comActActivityDOS.isEmpty()) {
            comActActivityDOS.forEach(comActActivityDO -> {
@@ -900,7 +905,6 @@
        if (isNull(activityId)) {
            return R.fail("签到所属活动id不能为空！");
        }
        if(comActActRegistVO.getActivityType()==1){
            ComActActivityDO comActActivityDO = comActActivityDAO.selectById(activityId);
            if (isNull(comActActivityDO)) {
                return R.fail("活动不存在！");
@@ -918,56 +922,84 @@
            if (nowDate.before(beginAt) || nowDate.after(endAt)) {
                return R.fail("不在活动时间范围内");
            }

            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("请扫描新的签到码");
            }
            Integer haveIntegralReward = comActActivityDO.getHaveIntegralReward();
            boolean isHave = nonNull(haveIntegralReward) && haveIntegralReward.equals(1);
            if (isHave) {
                int limit = comActActivityDO.getLimit().intValue();
                if(limit != -1 && signAllCount >= limit){
                    return R.fail("签到次数上限");
                }
            }
        Integer haveIntegralReward = comActActivityDO.getHaveIntegralReward();
        boolean isHave = nonNull(haveIntegralReward) && haveIntegralReward.equals(1);

//        String activitySignInKey = String.join(DELIMITER, ACTIVITY_SIGN_IN, userId.toString(), activityId.toString());
//        if (stringRedisTemplate.hasKey(activitySignInKey)) {
//            return R.fail("你已签到，如要再次签到请三十分钟后尝试！");
//        }
            ComActActRegistDO comActActRegistDO = new ComActActRegistDO();
            comActActRegistDO.setActivityId(activityId);
            comActActRegistDO.setType(1);
            comActActRegistDO.setUserId(userId);
            comActActRegistDO.setIsVolunteer(comActActSignDO.getIsVolunteer());
            comActActRegistDO.setCreateAt(nowDate);
            comActActRegistDO.setCodeId(comActActRegistVO.getCodeId());
            comActActRegistDO.setAward(isHave ? comActActivityDO.getRewardIntegral() : 0);
            comActActRegistDO.setPosition(comActActRegistVO.getPosition());
            comActActRegistDO.setTimes(signAllCount+1);
            int result = comActActRegistDAO.insert(comActActRegistDO);
            if (result > 0) {
            if(comActActRegistVO.getType()!=null&&comActActRegistVO.getType()==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("无法重复签退");
                }
                comActActRegistDO.setId(comActActRegistVO.getId());
                comActActRegistDO.setEndTime(new Date());
                int result=comActActRegistDAO.updateById(comActActRegistDO);
                if (result > 0) {
                    if (isHave) {
                        AddComActIntegralUserDTO addComActIntegralUserDTO=new AddComActIntegralUserDTO();
                        addComActIntegralUserDTO.setUserId(userId);
                        addComActIntegralUserDTO.setIntegralType(6);
                        addComActIntegralUserDTO.setActivityType(2);
                        addComActIntegralUserDTO.setCommunityId(comActActivityDO.getCommunityId());
                        addComActIntegralUserDTO.setServiceId(activityId);
                        comActIntegralUserTradeService.addIntegralTradeAdmin(addComActIntegralUserDTO);
                        return R.ok(comActActivityDO.getRewardIntegral());
                    } 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) {
                    boolean isVolunteerAct = comActActivityDO.getVolunteerMax() != 0;
                    AddComActIntegralUserDTO addComActIntegralUserDTO=new AddComActIntegralUserDTO();
                    addComActIntegralUserDTO.setUserId(userId);
                    addComActIntegralUserDTO.setIntegralType(isVolunteerAct ? 5 : 4);
                    addComActIntegralUserDTO.setActivityType(1);
                    addComActIntegralUserDTO.setIsVolunteer(comActActSignDO.getIsVolunteer());
                    addComActIntegralUserDTO.setCommunityId(comActActivityDO.getCommunityId());
                    addComActIntegralUserDTO.setServiceId(activityId);
                    comActIntegralUserTradeService.addIntegralTradeAdmin(addComActIntegralUserDTO);
                    return R.ok(comActActivityDO.getRewardIntegral());
                } else {
                    return R.ok();
                    int limit = comActActivityDO.getLimit().intValue();
                    if(limit != -1 && signAllCount >= limit){
                        return R.fail("签到次数上限");
                    }
                }
                comActActRegistDO.setActivityId(activityId);
                comActActRegistDO.setStartTime(new Date());
                comActActRegistDO.setType(1);
                comActActRegistDO.setUserId(userId);
                comActActRegistDO.setIsVolunteer(comActActSignDO.getIsVolunteer());
                comActActRegistDO.setCreateAt(nowDate);
                comActActRegistDO.setCodeId(comActActRegistVO.getCodeId());
                comActActRegistDO.setAward(isHave ? comActActivityDO.getRewardIntegral() : 0);
                comActActRegistDO.setPosition(comActActRegistVO.getPosition());
                comActActRegistDO.setTimes(signAllCount+1);
                int result = comActActRegistDAO.insert(comActActRegistDO);
                if (result > 0&&comActActRegistDO.getType()==1) {
                    if (isHave) {
                        boolean isVolunteerAct = comActActivityDO.getVolunteerMax() != 0;
                        AddComActIntegralUserDTO addComActIntegralUserDTO=new AddComActIntegralUserDTO();
                        addComActIntegralUserDTO.setUserId(userId);
                        addComActIntegralUserDTO.setIntegralType(isVolunteerAct ? 5 : 4);
                        addComActIntegralUserDTO.setActivityType(1);
                        addComActIntegralUserDTO.setIsVolunteer(comActActSignDO.getIsVolunteer());
                        addComActIntegralUserDTO.setCommunityId(comActActivityDO.getCommunityId());
                        addComActIntegralUserDTO.setServiceId(activityId);
                        comActIntegralUserTradeService.addIntegralTradeAdmin(addComActIntegralUserDTO);
                        return R.ok(comActActivityDO.getRewardIntegral());
                    } else {
                        return R.ok();
                    }
                }
            }
            return R.fail("网络错误，请重试");
        }
//        else {
//            ComPbActivityDO comPbActivityDO=comBpActivityDAO.selectById(activityId);
//            if (isNull(comPbActivityDO)) {
@@ -1018,8 +1050,6 @@
//            }
//            return R.fail("网络错误，请重试");
//        }

        return R.fail("网络错误，请重试");
    }

    /**
@@ -1088,4 +1118,43 @@
        }
        return R.ok();
    }

    @Override
    public String getActBelongRegionCode(Long communityId) {
        return baseMapper.getActBelongRegionCode(communityId);
    }

    @Override
    public R partyMemberCount(Long communityId, String year) {
        PartyActivityStatics partyActivityStatics=this.comActActivityDAO.selectActivityStatics(communityId);
        List<PartyActivityTypeChart> partyActivityTypeChart=this.comActActivityDAO.selectActivityChart(communityId);
        if(partyActivityStatics.getActivityCount()!=null&&partyActivityStatics.getActivityCount()>0){
            if(!CollectionUtils.isEmpty(partyActivityTypeChart)){
                partyActivityTypeChart.forEach(partyActivityTypeChart1 -> {
                    partyActivityTypeChart1.setPercent(partyActivityTypeChart1.getCount()/partyActivityStatics.getActivityCount());
                });
            }
        }
        partyActivityStatics.setPartyActivityTypeChartList(partyActivityTypeChart);
        partyActivityStatics.setPartyActivityLines(getPoints(communityId,year));
        return R.ok(partyActivityStatics);
    }
    public List<PartyActivityLine> getPoints(Long communityId,String year){
        List<PartyActivityLine> partyActivityLines=new ArrayList<>();
        for(int i=1;i<=12;i++){
            String x="";
            if(i<10){
                x="0"+i;
            }
            else {
                x=i+"";
            }
            PartyActivityLine partyActivityLine=new PartyActivityLine();
            partyActivityLine.setX(i+"月");
            Integer y=this.comActActivityDAO.selectActivityLine(communityId,year,x);
            partyActivityLine.setY(y);
            partyActivityLines.add(partyActivityLine);
        }
        return partyActivityLines;
    }
}

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

@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActColumnVO;
import com.panzhihua.service_community.dao.ComActAnnouncementDao;
import com.panzhihua.service_community.entity.ComActAnnouncement;
import com.panzhihua.service_community.entity.ComActColumn;
@@ -41,4 +42,9 @@
        return R.ok(comActColumnDao.deleteById(id));
    }

    @Override
    public R queryLevel(ComActColumnVO comActColumnVO) {
        return R.ok(this.comActColumnDao.queryLevel(comActColumnVO));
    }

}

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

@@ -400,6 +400,9 @@
            if (amount < 0) {
                reduceAmount = integralParty - integralPartyNow;
            }
            if(amount>0){
                integralUserDO.setIntegralPartyTime(integralUserDO.getIntegralPartyTime()+integralUserDTO.getIntegralPartyTime());
            }
            integralUserDO.setIntegralParty(integralPartyNow);
            integralUserDO.setIntegralAvailableParty(addIntegral(integralUserDO.getIntegralAvailableParty() + amount));
        } else if (identityType.equals(ComActIntegralUserTradeDO.identityType.zyz)) {

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

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

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.entity.ComActRafflePrize;
import com.panzhihua.service_community.dao.ComActRafflePrizeDao;
import com.panzhihua.service_community.service.ComActRafflePrizeService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

/**
 * 抽奖活动奖品表(ComActRafflePrize)表服务实现类
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 抽奖活动奖品表相关功能
 *
 * @author zzj
 * @since 2022-02-18 14:31:45
 */
@Slf4j
@Service
public class ComActRafflePrizeServiceImpl extends ServiceImpl<ComActRafflePrizeDao, ComActRafflePrize> implements ComActRafflePrizeService {

    @Override
    public R pageList(CommonPage commonPage) {
        return null;
    }
}

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

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

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.raffle.ComActRafflePrizeCount;
import com.panzhihua.common.model.vos.community.raffle.ComActRaffleRecordVO;
import com.panzhihua.common.model.vos.community.warehouse.QRCodeVO;
import com.panzhihua.service_community.dao.ComActRafflePrizeDao;
import com.panzhihua.service_community.entity.ComActRaffleRecord;
import com.panzhihua.service_community.dao.ComActRaffleRecordDao;
import com.panzhihua.service_community.service.ComActRaffleRecordService;
import com.panzhihua.service_community.util.QRCodeUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;

/**
 * 抽奖活动中奖记录表(ComActRaffleRecord)表服务实现类
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 抽奖活动中奖记录表相关功能
 *
 * @author zzj
 * @since 2022-02-18 14:32:02
 */
@Slf4j
@Service
public class ComActRaffleRecordServiceImpl extends ServiceImpl<ComActRaffleRecordDao, ComActRaffleRecord> implements ComActRaffleRecordService {
    @Resource
    private ComActRafflePrizeDao comActRafflePrizeDao;
    @Resource
    private ComActRaffleRecordDao comActRaffleRecordDao;

    @Override
    public R pageList(CommonPage commonPage) {
        return R.ok(this.baseMapper.pageList(new Page(commonPage.getPage(),commonPage.getSize()),commonPage));
    }

    @Override
    public R queryPrize(Long id) {
        ComActRafflePrizeCount comActRafflePrizeCount= comActRafflePrizeDao.selectCount(id);
        comActRafflePrizeCount.setComActRafflePrizeVOList(comActRafflePrizeDao.selectByRaffleId(id));
        return R.ok(comActRafflePrizeCount);
    }

    @Override
    public R queryQrCode(QRCodeVO qrCodeVO) {
        ComActRaffleRecordVO comActRaffleRecord=comActRaffleRecordDao.selectOneById((long)qrCodeVO.getId());
        if(comActRaffleRecord!=null){
            return R.ok(QRCodeUtil.getBase64QRCode(JSON.toJSONString(qrCodeVO)));
        }
        return R.fail("抽奖记录不存在");
    }

    @Override
    public R export(CommonPage commonPage) {
        return R.ok(this.baseMapper.export(commonPage));
    }

    @Override
    public R selectById(Long id) {
        return R.ok(this.baseMapper.selectOneById(id));
    }
}

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

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

import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
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.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.raffle.ComActRaffleRecordVO;
import com.panzhihua.common.model.vos.community.raffle.ComActRaffleVO;
import com.panzhihua.service_community.dao.ComActRafflePrizeDao;
import com.panzhihua.service_community.dao.ComActRaffleRecordDao;
import com.panzhihua.service_community.entity.ComActRaffle;
import com.panzhihua.service_community.dao.ComActRaffleDao;
import com.panzhihua.service_community.entity.ComActRafflePrize;
import com.panzhihua.service_community.entity.ComActRaffleRecord;
import com.panzhihua.service_community.service.ComActRaffleService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.beans.BeanUtils;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;

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

/**
 * 抽奖活动表(ComActRaffle)表服务实现类
 * projectName 成都呐喊信息技术有限公司-智慧社区项目
 * description: 抽奖活动表相关功能
 *
 * @author zzj
 * @since 2022-02-18 14:31:20
 */
@Slf4j
@Service
public class ComActRaffleServiceImpl extends ServiceImpl<ComActRaffleDao, ComActRaffle> implements ComActRaffleService {

    @Resource
    private ComActRafflePrizeDao comActRafflePrizeDao;
    @Resource
    private ComActRaffleRecordDao comActRaffleRecordDao;
    @Resource
    private RabbitTemplate rabbitTemplate;
    @Override
    public R pageList(CommonPage commonPage) {
        return R.ok(this.baseMapper.pageList(new Page(commonPage.getPage(),commonPage.getSize()),commonPage));
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public R insert(ComActRaffleVO comActRaffleVO) {
        ComActRaffle comActRaffle=new ComActRaffle();
        BeanUtils.copyProperties(comActRaffleVO,comActRaffle);
        comActRaffle.setCreateTime(new Date());
        comActRaffle.setStatus(0);
        int count= this.baseMapper.insert(comActRaffle);
        if(count>0){
            rabbitTemplate.convertAndSend("raffle.exchange", "raffle.key", comActRaffle, message -> {
                message.getMessageProperties().setHeader("x-delay", dateToSecond(comActRaffle.getStartTime()));
                return message;
            });
            if(!CollectionUtils.isEmpty(comActRaffleVO.getComActRafflePrizeVOList())){
                comActRaffleVO.getComActRafflePrizeVOList().forEach(comActRafflePrizeVO -> {
                    ComActRafflePrize comActRafflePrize=new ComActRafflePrize();
                    BeanUtils.copyProperties(comActRafflePrizeVO,comActRafflePrize);
                    comActRafflePrize.setRaffleId(comActRaffle.getId());
                    comActRafflePrize.setSurplus(comActRafflePrize.getTotal());
                    comActRafflePrizeDao.insert(comActRafflePrize);
                });
            }
            return R.ok();
        }
        return R.fail();
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public R update(ComActRaffleVO comActRaffleVO) {
        ComActRaffle comActRaffle=new ComActRaffle();
        BeanUtils.copyProperties(comActRaffleVO,comActRaffle);
        comActRaffle.setCreateTime(new Date());
        comActRaffle.setStatus(0);
        int count=this.baseMapper.updateById(comActRaffle);
        if(count>0){
            if(!CollectionUtils.isEmpty(comActRaffleVO.getComActRafflePrizeVOList())){
                comActRafflePrizeDao.delete(new QueryWrapper<ComActRafflePrize>().lambda().eq(ComActRafflePrize::getRaffleId,comActRaffle.getId()));
                comActRaffleVO.getComActRafflePrizeVOList().forEach(comActRafflePrizeVO -> {
                    ComActRafflePrize comActRafflePrize=new ComActRafflePrize();
                    BeanUtils.copyProperties(comActRafflePrizeVO,comActRafflePrize);
                    comActRafflePrize.setRaffleId(comActRaffle.getId());
                    comActRafflePrize.setSurplus(comActRafflePrize.getTotal());
                    comActRafflePrizeDao.insert(comActRafflePrize);
                });
            }
            return R.ok();
        }
        return R.fail();
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public R delete(Long id) {
        int count=this.baseMapper.deleteById(id);
        if(count>0){
            comActRafflePrizeDao.delete(new QueryWrapper<ComActRafflePrize>().lambda().eq(ComActRafflePrize::getRaffleId,id));
            return R.ok();
        }
        return R.fail();
    }

    @Override
    public R selectById(Long id,Long userId) {
        ComActRaffleVO comActRaffleVO=this.baseMapper.selectById(id);
        if(comActRaffleVO!=null){
            comActRaffleVO.setComActRafflePrizeVOList(comActRafflePrizeDao.selectByRaffleId(id));
        }
        if(userId!=null){
          ComActRaffleRecordVO comActRaffleRecordVO=comActRaffleRecordDao.selectByUserId(userId,id);
          if(comActRaffleRecordVO!=null){
              comActRaffleVO.setComActRaffleRecordVO(comActRaffleRecordVO);
              comActRaffleVO.setJoinStatus(0);
          }
          else {
              if(comActRaffleVO.getStatus()==1){
                  comActRaffleVO.setJoinStatus(1);
              }
              else {
                  comActRaffleVO.setJoinStatus(0);
              }
          }
        }
        return R.ok(comActRaffleVO);
    }
    private Long dateToSecond(Date expireTime){
        return DateUtil.between(new Date(),expireTime, DateUnit.MS);
    }
}

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

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

import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;

import javax.annotation.Resource;

import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
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.google.common.collect.Lists;
import com.panzhihua.common.model.dtos.community.OperationDetailDTO;
import com.panzhihua.common.model.dtos.community.PageUserReserveDTO;
import com.panzhihua.common.model.dtos.community.reserve.*;
import com.panzhihua.common.model.helper.AESUtil;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActReserveIndexVo;
import com.panzhihua.common.model.vos.community.ComActReserveCommitVO;
import com.panzhihua.common.model.vos.community.bigscreen.IndexBackReserve;
import com.panzhihua.common.model.vos.community.bigscreen.IndexReserve;
import com.panzhihua.common.model.vos.community.questnaire.QuestnaiteSubSelectionVO;
@@ -22,46 +35,15 @@
import com.panzhihua.common.model.vos.community.reserve.*;
import com.panzhihua.common.utlis.Snowflake;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.dao.ComActReserveMapper;
import com.panzhihua.service_community.dao.ComActReserveSubMapper;
import com.panzhihua.service_community.model.dos.*;
import com.panzhihua.common.model.dtos.community.PageUserReserveDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActReserveCommitVO;
import com.panzhihua.common.model.vos.community.questnaire.QuestnaiteSubVO;
import com.panzhihua.service_community.dao.*;
import com.panzhihua.service_community.model.dos.*;
import com.panzhihua.service_community.service.ComActReserveAnswerContentService;
import com.panzhihua.service_community.service.ComActReserveRecordService;
import com.panzhihua.service_community.service.ComActReserveService;
import com.panzhihua.service_community.service.ComActReserveSubSelectionService;

import cn.hutool.core.date.DateUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import javax.crypto.BadPaddingException;
import javax.crypto.IllegalBlockSizeException;
import javax.crypto.NoSuchPaddingException;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;

/**
 * @auther lyq
@@ -686,7 +668,7 @@
     * @return  预约登记详情
     */
    @Override
    public R detailReserveAdmin(Long reserveId){
    public R<ComActReserveDetailAdminVO> detailReserveAdmin(Long reserveId) {
        ComActReserveDetailAdminVO reserveDetailAdminVO = new ComActReserveDetailAdminVO();
        //查询预约登记信息
        ComActReserveDO reserveDO = this.baseMapper.selectById(reserveId);

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

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

import java.util.ArrayList;
import java.util.List;

import org.springframework.stereotype.Service;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveSubListVO;
import com.panzhihua.service_community.dao.ComActReserveSubMapper;
import com.panzhihua.service_community.model.dos.ComActReserveSubDO;
import com.panzhihua.service_community.service.ComActReserveSubService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.List;
import lombok.extern.slf4j.Slf4j;

/**
 * @auther lyq
@@ -45,4 +47,9 @@
        return R.ok(resultList);
    }

    @Override
    public List<String> subjectSelectionListAdmin(Long reserveSubId) {
        return baseMapper.subjectSelectionListAdmin(reserveSubId);
    }

}

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

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

import cn.hutool.core.date.DateUtil;
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.property.CommonPage;
import com.panzhihua.common.model.vos.ComActSocialMemberVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.user.AdministratorsUserVO;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.service_community.entity.ComActSocialMember;
import com.panzhihua.service_community.dao.ComActSocialMemberDao;
import com.panzhihua.service_community.service.ComActSocialMemberService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

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

/**
 * 社会组织成员表(ComActSocialMember)表服务实现类
 *
 * @author makejava
 * @since 2021-10-22 09:52:47
 */
@Slf4j
@Service
public class ComActSocialMemberServiceImpl extends ServiceImpl<ComActSocialMemberDao, ComActSocialMember> implements ComActSocialMemberService {
    @Resource
    private ComActSocialMemberDao comActSocialMemberDao;
    @Resource
    private UserService userService;
    @Override
    public R pageList(CommonPage commonPage) {
        return R.ok(this.comActSocialMemberDao.pageList(new Page(commonPage.getPage(),commonPage.getSize()),commonPage));
    }

    @Override
    public R insert(ComActSocialMemberVO comActSocialMemberVO) {
        ComActSocialMember comActSocialMember=new ComActSocialMember();
        BeanUtils.copyProperties(comActSocialMemberVO,comActSocialMember);
        Integer count=this.comActSocialMemberDao.selectCount(new QueryWrapper<ComActSocialMember>().lambda().eq(ComActSocialMember::getAccount,comActSocialMemberVO.getAccount()).eq(ComActSocialMember::getName,comActSocialMemberVO.getName()));
        if(count>0){
            return R.fail("姓名或账号已存在");
        }
        AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
        administratorsUserVO.setType(3);
        administratorsUserVO.setAccount(comActSocialMemberVO.getAccount());
        administratorsUserVO.setPassword(comActSocialMemberVO.getPassword());
        //根据roleId判断是普通社会组织还是定制三社
        administratorsUserVO.setSocialType(3);
        administratorsUserVO.setRoleId(777777777L);
        if(comActSocialMemberVO.getStreetId()!=null){
            administratorsUserVO.setStreetId(comActSocialMemberVO.getStreetId());
        }
        administratorsUserVO.setName(comActSocialMemberVO.getName());
        administratorsUserVO.setPhone(comActSocialMemberVO.getPhone());
        R r=userService.addUserBackstageProperty(administratorsUserVO);
        if(R.isOk(r)){
            comActSocialMember.setCreateTime(new Date());
            comActSocialMember.setUserId(Long.parseLong(r.getData().toString()));
            this.comActSocialMemberDao.insert(comActSocialMember);
            return R.ok();
        }
        return r;
    }

    @Override
    public R update(ComActSocialMemberVO comActSocialMemberVO) {
        ComActSocialMember comActSocialMember=this.comActSocialMemberDao.selectById(comActSocialMemberVO.getId());
        if(comActSocialMember!=null){
            if(comActSocialMemberVO.getStatus()==0){
                AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
                administratorsUserVO.setUserId(comActSocialMember.getUserId());
                administratorsUserVO.setStatus(0);
                userService.putUserBackstage(administratorsUserVO);
            }
            ComActSocialMember comActSocialMember1=new ComActSocialMember();
            BeanUtils.copyProperties(comActSocialMemberVO,comActSocialMember1);
            return this.comActSocialMemberDao.updateById(comActSocialMember1)>0?R.ok():R.fail();
        }
        return R.fail("参数错误");
    }

    @Override
    public R detail(Long id) {
        return R.ok(this.comActSocialMemberDao.detail(id));
    }

    @Override
    public R delete(Long id) {
        ComActSocialMember comActSocialMember=this.comActSocialMemberDao.selectById(id);
        if(comActSocialMember!=null){
            AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
            administratorsUserVO.setUserId(comActSocialMember.getUserId());
            userService.deleteUserBackstage(administratorsUserVO);
            return this.comActSocialMemberDao.deleteById(id)>0?R.ok():R.fail();
        }
        return R.fail("参数错误");
    }
}

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

@@ -39,7 +39,7 @@

    @Override
    public R selectById(Long id) {
        return null;
        return R.ok(comActSocialOrgDao.detail(id));
    }

    @Override
@@ -52,8 +52,21 @@
            administratorsUserVO.setType(3);
            administratorsUserVO.setAccount(comActSocialOrgVO.getAccount());
            administratorsUserVO.setPassword(comActSocialOrgVO.getPassword());
            administratorsUserVO.setRoleId(comActSocialOrgVO.getRoleId());
            administratorsUserVO.setCommunityId(comActSocialOrg.getCommunityId());
            //根据roleId判断是普通社会组织还是定制三社
            if(comActSocialOrgVO.getRoleId()==null){
                administratorsUserVO.setSocialType(2);
                administratorsUserVO.setRoleId(777777777L);
                comActSocialOrg.setIsSociety(1);
            }
            else {
                administratorsUserVO.setRoleId(comActSocialOrgVO.getRoleId());
            }
            if(comActSocialOrg.getCommunityId()!=null){
                administratorsUserVO.setCommunityId(comActSocialOrg.getCommunityId());
            }
            if(comActSocialOrg.getStreetId()!=null){
                administratorsUserVO.setStreetId(comActSocialOrg.getStreetId());
            }
            administratorsUserVO.setName(comActSocialOrgVO.getContactName());
            administratorsUserVO.setPhone(comActSocialOrgVO.getContactPhone());
            R r=userService.addUserBackstageProperty(administratorsUserVO);

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

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

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.social.ComActSocialProjectMemberVO;
import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.service_community.dao.ComActSocialWorkerDao;
import com.panzhihua.service_community.dao.ComMngVolunteerMngDAO;
import com.panzhihua.service_community.entity.ComActSocialProjectMember;
import com.panzhihua.service_community.dao.ComActSocialProjectMemberDao;
import com.panzhihua.service_community.entity.ComActSocialWorker;
import com.panzhihua.service_community.model.dos.ComMngVolunteerMngDO;
import com.panzhihua.service_community.service.ComActSocialProjectMemberService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

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

/**
 * 项目人员(ComActSocialProjectMember)表服务实现类
 *
 * @author makejava
 * @since 2021-12-23 15:16:43
 */
@Slf4j
@Service
public class ComActSocialProjectMemberServiceImpl extends ServiceImpl<ComActSocialProjectMemberDao, ComActSocialProjectMember> implements ComActSocialProjectMemberService {

    @Resource
    private ComActSocialProjectMemberDao comActSocialProjectMemberDao;
    @Resource
    private ComActSocialWorkerDao comActSocialWorkerDao;
    @Resource
    private ComMngVolunteerMngDAO comMngVolunteerMngDAO;
    @Override
    public R pageList(CommonPage commonPage) {
        return R.ok(this.comActSocialProjectMemberDao.pageList(new Page(commonPage.getPage(),commonPage.getSize()),commonPage));
    }

    @Override
    public R insert(ComActSocialProjectMemberVO comActSocialProjectMemberVO) {
        if(comActSocialProjectMemberVO.getType()==1){
            ComActSocialWorker comActSocialWorker=comActSocialWorkerDao.selectById(comActSocialProjectMemberVO.getParamId());
            if(comActSocialWorker!=null){
                List<ComActSocialProjectMember> list= comActSocialProjectMemberDao.selectList(new QueryWrapper<ComActSocialProjectMember>().lambda().eq(ComActSocialProjectMember::getPhone,comActSocialWorker.getTelephone()).eq(ComActSocialProjectMember::getType,comActSocialProjectMemberVO.getType()).eq(ComActSocialProjectMember::getProjectId,comActSocialProjectMemberVO.getProjectId()));
                if(CollectionUtils.isEmpty(list)){
                    ComActSocialProjectMember comActSocialProjectMember=new ComActSocialProjectMember();
                    BeanUtils.copyProperties(comActSocialProjectMemberVO,comActSocialProjectMember);
                    comActSocialProjectMember.setAge(getAge(comActSocialWorker.getIdCard()));
                    comActSocialProjectMember.setImage(comActSocialWorker.getImage());
                    comActSocialProjectMember.setName(comActSocialWorker.getName());
                    comActSocialProjectMember.setPhone(comActSocialWorker.getTelephone());
                    comActSocialProjectMember.setCreateTime(new Date());
                    comActSocialProjectMemberDao.insert(comActSocialProjectMember);
                    return R.ok();
                }
            }
        }
        else {
            ComMngVolunteerMngDO comMngVolunteerMngDO=comMngVolunteerMngDAO.selectById(comActSocialProjectMemberVO.getParamId());
            if(comMngVolunteerMngDO!=null){
                ComActSocialProjectMember comActSocialProjectMember=new ComActSocialProjectMember();
                BeanUtils.copyProperties(comActSocialProjectMemberVO,comActSocialProjectMember);
                comActSocialProjectMember.setAge(comMngVolunteerMngDO.getAge());
                comActSocialProjectMember.setImage(comMngVolunteerMngDO.getPhotoPath());
                comActSocialProjectMember.setName(comMngVolunteerMngDO.getName());
                comActSocialProjectMember.setPhone(comMngVolunteerMngDO.getPhone());
                comActSocialProjectMember.setCreateTime(new Date());
                comActSocialProjectMemberDao.insert(comActSocialProjectMember);
                return R.ok();
            }
        }
        return R.fail("参数异常");
    }

    @Override
    public R insertBatch(ComActSocialProjectMemberVO comActSocialProjectMemberVO) {
        if(CollectionUtils.isNotEmpty(comActSocialProjectMemberVO.getIds())){
            comActSocialProjectMemberVO.getIds().forEach(id ->{
                if(comActSocialProjectMemberVO.getType()==1){
                    ComActSocialWorker comActSocialWorker=comActSocialWorkerDao.selectById(id);
                    if(comActSocialWorker!=null){
                        List<ComActSocialProjectMember> list= comActSocialProjectMemberDao.selectList(new QueryWrapper<ComActSocialProjectMember>().lambda().eq(ComActSocialProjectMember::getPhone,comActSocialWorker.getTelephone()).eq(ComActSocialProjectMember::getType,comActSocialProjectMemberVO.getType()).eq(ComActSocialProjectMember::getProjectId,comActSocialProjectMemberVO.getProjectId()));
                        if(CollectionUtils.isEmpty(list)){
                            ComActSocialProjectMember comActSocialProjectMember=new ComActSocialProjectMember();
                            BeanUtils.copyProperties(comActSocialProjectMemberVO,comActSocialProjectMember);
                            comActSocialProjectMember.setAge(getAge(comActSocialWorker.getIdCard()));
                            comActSocialProjectMember.setImage(comActSocialWorker.getImage());
                            comActSocialProjectMember.setName(comActSocialWorker.getName());
                            comActSocialProjectMember.setPhone(comActSocialWorker.getTelephone());
                            comActSocialProjectMember.setCreateTime(new Date());
                            comActSocialProjectMember.setType(1);
                            comActSocialProjectMember.setCommunityId(comActSocialProjectMemberVO.getCommunityId());
                            comActSocialProjectMember.setProjectId(comActSocialProjectMemberVO.getParamId());
                            comActSocialProjectMemberDao.insert(comActSocialProjectMember);
                        }
                    }
                }
                else {
                    ComMngVolunteerMngDO comMngVolunteerMngDO=comMngVolunteerMngDAO.selectById(id);
                    if(comMngVolunteerMngDO!=null){
                        List<ComActSocialProjectMember> list= comActSocialProjectMemberDao.selectList(new QueryWrapper<ComActSocialProjectMember>().lambda().eq(ComActSocialProjectMember::getPhone,comMngVolunteerMngDO.getPhone()).eq(ComActSocialProjectMember::getType,comActSocialProjectMemberVO.getType()).eq(ComActSocialProjectMember::getProjectId,comActSocialProjectMemberVO.getProjectId()));
                        if(CollectionUtils.isEmpty(list)){
                            ComActSocialProjectMember comActSocialProjectMember=new ComActSocialProjectMember();
                            BeanUtils.copyProperties(comActSocialProjectMemberVO,comActSocialProjectMember);
                            comActSocialProjectMember.setAge(comMngVolunteerMngDO.getAge());
                            comActSocialProjectMember.setImage(comMngVolunteerMngDO.getPhotoPath());
                            comActSocialProjectMember.setName(comMngVolunteerMngDO.getName());
                            comActSocialProjectMember.setPhone(comMngVolunteerMngDO.getPhone());
                            comActSocialProjectMember.setCreateTime(new Date());
                            comActSocialProjectMember.setType(2);
                            comActSocialProjectMember.setCommunityId(comActSocialProjectMemberVO.getCommunityId());
                            comActSocialProjectMember.setProjectId(comActSocialProjectMemberVO.getParamId());
                            comActSocialProjectMemberDao.insert(comActSocialProjectMember);
                        }
                    }
                }
            });
        }
        return R.ok();
    }

    public Integer getAge(String idCard){
        Integer year=Integer.parseInt(idCard.substring(6,10));
        Integer nowYear= DateUtils.getYear(new Date());
        return nowYear-year;
    }
}

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

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

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.entity.ComActSocialProjectPublicity;
import com.panzhihua.service_community.dao.ComActSocialProjectPublicityDao;
import com.panzhihua.service_community.service.ComActSocialProjectPublicityService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;

/**
 * 项目宣传表(ComActSocialProjectPublicity)表服务实现类
 *
 * @author makejava
 * @since 2021-12-23 14:30:55
 */
@Slf4j
@Service
public class ComActSocialProjectPublicityServiceImpl extends ServiceImpl<ComActSocialProjectPublicityDao, ComActSocialProjectPublicity> implements ComActSocialProjectPublicityService {

    @Resource
    private ComActSocialProjectPublicityDao comActSocialProjectPublicityDao;
    @Override
    public R pageList(CommonPage commonPage) {
        return R.ok(comActSocialProjectPublicityDao.pageList(new Page(commonPage.getPage(),commonPage.getSize()),commonPage));
    }

    @Override
    public R selectOne(Long id) {
        return R.ok(comActSocialProjectPublicityDao.selectOne(id));
    }
}

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

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

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.entity.ComActSocialProjectSchedule;
import com.panzhihua.service_community.dao.ComActSocialProjectScheduleDao;
import com.panzhihua.service_community.service.ComActSocialProjectScheduleService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;

/**
 * 项目进度表(ComActSocialProjectSchedule)表服务实现类
 *
 * @author makejava
 * @since 2021-12-23 14:31:16
 */
@Slf4j
@Service
public class ComActSocialProjectScheduleServiceImpl extends ServiceImpl<ComActSocialProjectScheduleDao, ComActSocialProjectSchedule> implements ComActSocialProjectScheduleService {

    @Resource
    private ComActSocialProjectScheduleDao comActSocialProjectScheduleDao;
    @Override
    public R pageList(CommonPage commonPage) {
        return R.ok(comActSocialProjectScheduleDao.selectList(new QueryWrapper<ComActSocialProjectSchedule>().lambda().eq(ComActSocialProjectSchedule::getProjectId,commonPage.getParamId()).orderByDesc(ComActSocialProjectSchedule::getCreateTime)));
    }
}

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

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

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.social.SocialProjectVO;
import com.panzhihua.service_community.dao.ComActDAO;
import com.panzhihua.service_community.entity.ComActSocialProject;
import com.panzhihua.service_community.dao.ComActSocialProjectDao;
import com.panzhihua.service_community.entity.ProjectRelationVO;
import com.panzhihua.service_community.model.dos.ComActDO;
import com.panzhihua.service_community.service.ComActSocialProjectService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;

/**
 * 三社联动项目表(ComActSocialProject)表服务实现类
 *
 * @author makejava
 * @since 2021-12-22 14:02:48
 */
@Slf4j
@Service
public class ComActSocialProjectServiceImpl extends ServiceImpl<ComActSocialProjectDao, ComActSocialProject> implements ComActSocialProjectService {

    @Resource
    private ComActSocialProjectDao comActSocialProjectDao;
    @Resource
    private ComActDAO comActDAO;
    @Override
    public R pageList(CommonPage commonPage) {
        if(commonPage.getParamId2()!=null){
           ComActDO comActDO=comActDAO.selectById(commonPage.getCommunityId());
           if(comActDO!=null){
               commonPage.setStreetId(comActDO.getStreetId());
           }
        }
        return R.ok(comActSocialProjectDao.pageList(new Page(commonPage.getPage(),commonPage.getSize()),commonPage));
    }

    @Override
    public R getByApplet(Long id) {
        ComActSocialProject comActSocialProject=this.comActSocialProjectDao.selectById(id);
        comActSocialProject.setViews(comActSocialProject.getViews()+1);
        comActSocialProjectDao.updateById(comActSocialProject);
        return R.ok(comActSocialProjectDao.getByApplet(id));
    }

    @Override
    public R getByBackstage(Long id) {
        return R.ok(comActSocialProjectDao.getByApplet(id));
    }

    @Override
    public R getProject(CommonPage commonPage) {
        if(commonPage.getParamId()==null){
            return R.fail("数据异常");
        }
        ProjectRelationVO projectRelationVO=new ProjectRelationVO();
        SocialProjectVO comActSocialProject=this.comActSocialProjectDao.selectByLevel(commonPage.getParamId());
        if(comActSocialProject.getLevel()==2){
            SocialProjectVO comActSocialProject1=this.comActSocialProjectDao.selectByLevel(comActSocialProject.getParentId());
            if(comActSocialProject1!=null){
                projectRelationVO.setFatherProjectLevelOne(comActSocialProject1);
            }
        }
        if(comActSocialProject.getLevel()==3){
            SocialProjectVO comActSocialProject1=this.comActSocialProjectDao.selectByLevel(comActSocialProject.getParentId());
            if(comActSocialProject1!=null){
                projectRelationVO.setFatherProjectLevelTwo(comActSocialProject1);
                SocialProjectVO comActSocialProject2=this.comActSocialProjectDao.selectByLevel(comActSocialProject1.getParentId());
                if(comActSocialProject2!=null){
                    projectRelationVO.setFatherProjectLevelOne(comActSocialProject2);
                }
            }
        }
        IPage<SocialProjectVO> socialProjectVOIPage=this.comActSocialProjectDao.pageList(new Page(commonPage.getPage(),commonPage.getSize()),commonPage);
        projectRelationVO.setSocialProjectVOIPage(socialProjectVOIPage);
        return R.ok(projectRelationVO);
    }
}

Diff truncated after the above file
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialWorkerServiceImpl.java
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialWorkerServiceServiceImpl.java
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComFmsClassroomServiceImpl.java
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComFmsServiceEvaluationsServiceImpl.java
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComFmsServiceRecordServiceImpl.java
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComFmsServiceServiceImpl.java
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComFmsTeamMemberRelationServiceImpl.java
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComFmsTeamMemberServiceImpl.java
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComFmsTeamServiceImpl.java
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComFmsTeamTypeServiceImpl.java
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVolunteerMngServiceImpl.java
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVolunteerOrgTeamServiceImpl.java
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVolunteerServiceTypeServiceImpl.java
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVolunteerSkillServiceImpl.java
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComStreetServiceImpl.java
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActivityMapper.xml
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActColumnMapper.xml
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActRaffleMapper.xml
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActRafflePrizeMapper.xml
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActRaffleRecordMapper.xml
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActReserveSubMapper.xml
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialMemberMapper.xml
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialOrgMapper.xml
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialProjectMapper.xml
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialProjectMemberMapper.xml
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialProjectPublicityMapper.xml
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialProjectScheduleMapper.xml
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialWorkerMapper.xml
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActSocialWorkerServiceMapper.xml
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComFmsClassroomMapper.xml
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComFmsServiceEvaluationsMapper.xml
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComFmsServiceMapper.xml
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComFmsServiceRecordMapper.xml
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComFmsTeamMapper.xml
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComFmsTeamMemberMapper.xml
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComFmsTeamMemberRelationMapper.xml
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComFmsTeamTypeMapper.xml
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngPopulationDOMapper.xml
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngVolunteerMngDOMapper.xml
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngVolunteerOrgTeamDao.xml
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngVolunteerServiceTypeDao.xml
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngVolunteerSkillDao.xml
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ConvenientMerchantMapper.xml
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/EventMapper.xml
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventMapper.java
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMapper.xml
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbDynDAO.java
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbDynDO.java
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserDO.java
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/UserDao.xml
springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/java/com/panzhihua/timejob/jobhandler/CommunityJobHandler.java
springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/filters/JWTAuthenticationTokenFilter.java
springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/resources/bootstrap.yml