Merge branch 'huacheng' into huacheng_test

101captain

2022-07-06 d6578ec702eb4fcff690d71ea3237a885f46b85c

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

@@ -5,6 +5,7 @@
import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.dtos.civil.*;
import com.panzhihua.common.model.dtos.common.*;
import com.panzhihua.common.model.dtos.community.acid.*;
import com.panzhihua.common.model.dtos.community.reserve.*;
import com.panzhihua.common.model.dtos.community.warehouse.ComActWarehouseApplyDTO;
import com.panzhihua.common.model.dtos.community.GetIdentityEidTokenDTO;
@@ -20,15 +21,23 @@
import com.panzhihua.common.model.dtos.community.elder.PagePensionAuthStatisticDTO;
import com.panzhihua.common.model.dtos.community.elder.SignElderAuthStatisticDTO;
import com.panzhihua.common.model.dtos.neighbor.*;
import com.panzhihua.common.model.dtos.property.PagePropertyWorkerDTO;
import com.panzhihua.common.model.dtos.property.PropertyWorkerDTO;
import com.panzhihua.common.model.vos.*;
import com.panzhihua.common.model.vos.civil.ComActSocialWorkerDetailsVO;
import com.panzhihua.common.model.vos.civil.ComActSocialWorkerVO;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.community.acid.ComActAcidCheckRecordVO;
import com.panzhihua.common.model.vos.community.acid.ComActAcidMemberVO;
import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordVO;
import com.panzhihua.common.model.vos.community.cluster.admin.ComClusterMemberExcelVO;
import com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoMemberVO;
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.reserve.ComActReserveDangerAreaVO;
import com.panzhihua.common.model.vos.community.social.*;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import com.panzhihua.common.model.vos.community.*;
import org.springframework.beans.BeanUtils;
@@ -420,7 +429,7 @@
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-07 15:59
 **/
@FeignClient(name = "community")
@FeignClient(name = "huacheng-community")
public interface CommunityService {
    /**
     * 新增社区活动
@@ -994,7 +1003,7 @@
     * @return 类型列表
     */
    @PostMapping("listbuildtype")
    R listBuildType();
    R listBuildType(@RequestParam("communityId")Long communityId);

    /**
     * 分页查询 其他建筑
@@ -5014,12 +5023,19 @@
    /**
     * 小程序查询邻里圈话题列表
     *
     * @param communityId
     *            社区id
     * @return 邻里圈话题列表
     */
    @GetMapping("/neighbor/getNeighborTopicByApp")
    R getNeighborTopicByApp(@RequestParam("communityId") Long communityId,@RequestParam("isZero") Integer isZero,@RequestParam("name") String name);
    R getNeighborTopicByApp(@RequestParam("name") String name);

    /**
     * 删除话题
     * @param id
     * @return
     */
    @GetMapping("/neighbor/deleteNeighborTopic")
    R deleteNeighborTopic(@RequestParam("id") Long id);

    /**
     * 综治后台-查询社区列表
@@ -5906,6 +5922,30 @@
     */
    @PostMapping("/neighbor/deleteNeighborByApp")
    R deleteNeighborByApp(@RequestBody DeleteNeighborCircleAppDTO circleTopicAppDTO);


    /**
     * 分页查询邻里圈列表
     *
     * @param neighborCircleAppDTO
     *            请求参数
     * @return 邻里圈列表
     */
    @PostMapping("/neighbor/selectSolve")
    R selectSolve(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO);


    /**
     * 修改数据
     * @param editNeighborCircleAdminVO
     * @return
     */
    @PostMapping("/neighbor/update")
    R order(@RequestBody EditNeighborCircleAdminVO editNeighborCircleAdminVO);

    @PostMapping("/neighbor/serviceStatic")
    R serviceStatic(@RequestBody ServiceStaticDTO serviceStaticDTO);


    /**
     * 获取系统配置value
@@ -6958,6 +6998,14 @@
     */
    @PostMapping("/building/house/population/delete/admin")
    R deleteBuildingHousePopulationAdmin(@RequestBody DeleteBuildingHousePopulationDto housePopulationDto);

    /**
     * 删除楼栋
     * @param id
     * @return
     */
    @GetMapping("/building/delete")
    R buildingDelete(@RequestParam("id")Long id);

    /**
     * 分页查询所有数据
@@ -9496,6 +9544,145 @@
    @PostMapping("/comActEasyPhotoHandler/edit")
    R editEasyPhotoHandler(@RequestBody EditComActEasyPhotoHandlerDto comActEasyPhotoHandler);

    @GetMapping("/reserve/fiveCount")
    R fiveCount(@RequestParam("reserveId") Long reserveId);

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @GetMapping("/comActEasyPhotoMember/del")
    R comActEasyPhotoMemberDelete(@RequestParam("id") Long id);

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @PostMapping("/comActEasyPhotoMember/queryAll")
    R comActEasyPhotoMemberSelectAll(@RequestBody CommonPage commonPage);

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("/comActEasyPhotoMember/{id}")
    R comActEasyPhotoMemberSelectOne(@PathVariable("id") Long id);

    /**
     * 新增数据
     *
     * @param comActEasyPhotoMemberVO 实体对象
     * @return 新增结果
     */
    @PostMapping("/comActEasyPhotoMember")
    R comActEasyPhotoMemberInsert(@RequestBody ComActEasyPhotoMemberVO comActEasyPhotoMemberVO);

    /**
     * 修改数据
     *
     * @param comActEasyPhotoMemberVO 实体对象
     * @return 修改结果
     */
    @PostMapping("/comActEasyPhotoMember/update")
    R comActEasyPhotoMemberUpdate(@RequestBody ComActEasyPhotoMemberVO comActEasyPhotoMemberVO);

    /**
     * 分页查询所有数据
     *
     * @param comActAcidRecordDTO 查询实体
     * @return 所有数据
     */
    @PostMapping("/comActAcidRecord/queryAll")
    R selectAllComActAcidRecord(@RequestBody ComActAcidRecordDTO comActAcidRecordDTO);

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("/comActAcidRecord/{id}")
    R selectOneComActAcidRecord(@PathVariable("id") Long id);

    /**
     * 新增数据
     *
     * @param comActAcidRecordVO 实体对象
     * @return 新增结果
     */
    @PostMapping("/comActAcidRecord")
    R insertComActAcidRecord(@RequestBody ComActAcidRecordVO comActAcidRecordVO);

    /**
     * 修改数据
     *
     * @param comActAcidRecordVO 实体对象
     * @return 修改结果
     */
    @PostMapping("/comActAcidRecord/update")
    R updateComActAcidRecord(@RequestBody ComActAcidRecordVO comActAcidRecordVO);


    /**
     * 小程序修改填报记录
     *
     * @param comActAcidRecordVO 实体对象
     * @return 修改结果
     */
    @PostMapping("/comActAcidRecord/updateApplets")
    R updateApplets(@RequestBody ComActAcidRecordVO comActAcidRecordVO);

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @GetMapping("/comActAcidRecord/del")
    R deleteComActAcidRecord(@RequestParam("id") Long id);

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @GetMapping("/comActAcidRecord/detailByApp")
    R detailByApp(@RequestParam("id") Long id,@RequestParam("localCity")String localCity);

    @GetMapping("/comActAcidRecord/charts")
    R charts(@RequestParam("date")String date,@RequestParam("localCity")String localCity);

    @PostMapping("/comActAcidRecord/export")
    R exportComActAcidRecord(@RequestBody ComActAcidRecordDTO comActAcidRecordDTO);


    /**
     * 5项常规统计
     * @return
     */
    @GetMapping("/comActAcidRecord/fiveCount")
    R comActAcidRecordFiveCount(@RequestParam("localCity")String localCity);

    /**
     * 7项常规统计
     * @return
     */
    @GetMapping("/comActAcidRecord/fiveCountPlus")
    R comActAcidRecordFiveCountPlus(@RequestParam("date")String date,@RequestParam("localCity")String localCity);

    @GetMapping("/comActAcidRecord/statics")
    R comActAcidRecordStatics(@RequestParam("date")String date);

    @GetMapping("/comActAcidRecord/test")
    R test();

    /**
     * 分页查询所有数据
     *
@@ -9546,4 +9733,170 @@
     */
    @PostMapping("/comActReserveDangerArea/updateBatch")
    R updateBatchComActReserveDangerArea(@RequestBody EditDangerBatchDTO editDangerBatchDTO);

    @GetMapping("/comAreaTownCommunity/areaTownCommunity")
    R areaTownCommunity(@RequestParam("name")String name,@RequestParam("userId")Long userId);

    /**
     * 物业公司详情
     * @param id
     * @return
     */
    @GetMapping("/comProperty/detail")
    R detailProperty(@RequestParam("id") Long id);

    /**
     * 添加物业工作人员
     * @param propertyWorkerDTO
     * @return
     */
    @PostMapping("/comPropertyWorker/add")
    R addPropertyWorker(@RequestBody PropertyWorkerDTO propertyWorkerDTO);

    /**
     * 编辑物业工作人员
     * @param propertyWorkerDTO
     * @return
     */
    @PutMapping("/comPropertyWorker/update")
    R updatePropertyWorker(@RequestBody PropertyWorkerDTO propertyWorkerDTO);

    /**
     * 删除物业工作人员
     * @param id
     * @return
     */
    @DeleteMapping("/comPropertyWorker/delete")
    R deletePropertyWorker(@RequestParam("id") Long id);

    /**
     * 分页查询物业工作人员
     * @param pagePropertyWorkerDTO
     * @return
     */
    @PostMapping("/comPropertyWorker/page")
    R pagePropertyWorker(@RequestBody PagePropertyWorkerDTO pagePropertyWorkerDTO);

    /**
     * 物业工作人员详情
     * @param id
     * @return
     */
    @GetMapping("/comPropertyWorker/detail")
    R detailPropertyWorker(@RequestParam("id") Long id);


    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @PostMapping("/comActAcidMember/queryAll")
    R selectAllComActAcidMember(@RequestBody ComActAcidMemberDTO commonPage);

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("/comActAcidMember/{id}")
    R selectOneComActAcidMember(@PathVariable("id") Long id);

    /**
     * 新增数据
     *
     * @param comActAcidMemberVO 实体对象
     * @return 新增结果
     */
    @PostMapping("/comActAcidMember")
    R insertComActAcidMember(@RequestBody ComActAcidMemberVO comActAcidMemberVO);

    /**
     * 修改数据
     *
     * @param comActAcidMemberVO 实体对象
     * @return 修改结果
     */
    @PostMapping("/comActAcidMember/update")
    R updateComActAcidMember(@RequestBody ComActAcidMemberVO comActAcidMemberVO);

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @GetMapping("/comActAcidMember/del")
    R deleteComActAcidMember(@RequestParam("id") Long id);

    /**
     * 分页查询风险人员
     * @param pageDangerMemberDTO
     * @return
     */
    @PostMapping("/comActAcidDangerMember/page")
    R pageDangerMember(@RequestBody PageDangerMemberDTO pageDangerMemberDTO);

    /**
     * 后台分页查询风险人员
     * @param pageDangerMemberDTO
     * @return
     */
    @PostMapping("/comActAcidDangerMember/queryAll")
    R pageDangerMemberAdmin(@RequestBody ComActAcidDangerMemberDTO pageDangerMemberDTO);

    /**
     * 列表查询
     *
     * @param comActAcidCheckRecordDTO 查询实体
     * @return 所有数据
     */
    @PostMapping("/comActAcidCheckRecord/queryAll")
    R selectAllComActAcidCheckRecord(@RequestBody ComActAcidCheckRecordDTO comActAcidCheckRecordDTO);

    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("/comActAcidCheckRecord/{id}")
    R selectOneComActAcidCheckRecord(@PathVariable("id") Long id);

    /**
     * 新增数据
     *
     * @param comActAcidCheckRecordVO 实体对象
     * @return 新增结果
     */
    @PostMapping("/comActAcidCheckRecord")
    R insertComActAcidCheckRecord(@RequestBody ComActAcidCheckRecordVO comActAcidCheckRecordVO);

    /**
     * 修改数据
     *
     * @param comActAcidCheckRecordVO 实体对象
     * @return 修改结果
     */
    @PostMapping("/comActAcidCheckRecord/update")
    R updateComActAcidCheckRecord(@RequestBody ComActAcidCheckRecordVO comActAcidCheckRecordVO);

    @GetMapping("/bcRegion/levelList")
    R levelList(@RequestParam("level")Integer level,@RequestParam("code")String code);

    @GetMapping("/bcRegion/levelListBackstage")
    R levelListBackstage();

    /**
     * 单位活动统计
     */
    @GetMapping("/neighbor/activityAnalysis")
    R institutionalUnitServiceAnalysis(@RequestParam(value = "year",required = false) Integer year,@RequestParam(value = "type",required = false) Integer type,
                                       @RequestParam(value = "range",required = false)Integer range,@RequestParam(value = "communityId",required = false) Long communityId,
                                       @RequestParam(value = "page",required = false) Integer page,
                                       @RequestParam(value = "size",required = false) Integer size,
                                       @RequestParam(value = "belongTo",required = false) String  belongTo);

}