springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPropertyPublicityApi.java
@@ -62,13 +62,6 @@ return communityService.getComPropertyPublicity(id); } @ApiOperation(value = "小区列表", response = ComMngVillageVO.class) @GetMapping("/list/village") @ApiImplicitParam(name = "communityId", value = "社区id", required = true) public R listVillage(@RequestParam(value = "communityId") Long communityId) { return communityService.listVillage(null, communityId); } @ApiOperation(value = "增加物业宣传浏览量") @GetMapping("/incr-view") @ApiImplicitParam(name = "id", value = "物业宣传id", required = true) springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java
@@ -187,4 +187,6 @@ @ApiModelProperty("实名认证地址") private String address; @ApiModelProperty("是否物业工作人员 1.是 2.否") private Integer isPropertyWorker; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -2,24 +2,6 @@ import java.util.List; import com.panzhihua.common.model.dtos.community.warehouse.ComActWarehouseApplyDTO; import com.panzhihua.common.model.dtos.community.GetIdentityEidTokenDTO; import com.panzhihua.common.model.dtos.community.*; import com.panzhihua.common.model.dtos.community.building.admin.*; import com.panzhihua.common.model.dtos.community.cluster.PageClusterMemberDto; import com.panzhihua.common.model.dtos.community.cluster.admin.*; import com.panzhihua.common.model.dtos.property.CommonPage; import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussDetailDTO; import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussPublishResultDTO; import com.panzhihua.common.model.dtos.community.elder.ElderAuthStatisticHeaderDTO; 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.neighbor.*; import com.panzhihua.common.model.vos.community.*; import com.panzhihua.common.model.vos.community.cluster.admin.ComClusterMemberExcelVO; import io.swagger.annotations.ApiOperation; import com.panzhihua.common.model.vos.community.*; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; @@ -59,6 +41,7 @@ import com.panzhihua.common.model.dtos.community.ComMngPopulationTagDTO; import com.panzhihua.common.model.dtos.community.ComMngRealCompanyBelongsDTO; import com.panzhihua.common.model.dtos.community.ComOpsHouseDTO; import com.panzhihua.common.model.dtos.community.ComPropertyPublicityDTO; import com.panzhihua.common.model.dtos.community.ComSwDangerReportEditDTO; import com.panzhihua.common.model.dtos.community.ComSwDangerReportHandleDTO; import com.panzhihua.common.model.dtos.community.ComSwDangerReportRectifyDTO; @@ -100,6 +83,7 @@ import com.panzhihua.common.model.dtos.community.PageComMngRealCompanyDTO; import com.panzhihua.common.model.dtos.community.PageComMngVillageDTO; import com.panzhihua.common.model.dtos.community.PageComOpsHouseDTO; import com.panzhihua.common.model.dtos.community.PageComPropertyPublicityDTO; import com.panzhihua.common.model.dtos.community.PageComStreetDTO; import com.panzhihua.common.model.dtos.community.PageElderAuthRecordsDTO; import com.panzhihua.common.model.dtos.community.PageEldersAuthDTO; @@ -120,6 +104,13 @@ import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityPeopleListDTO; import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenDiscussListDTO; import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenMicroListDTO; import com.panzhihua.common.model.dtos.community.building.admin.AddBuildingHouseDto; import com.panzhihua.common.model.dtos.community.building.admin.AddBuildingUnitDto; import com.panzhihua.common.model.dtos.community.building.admin.DeleteBuildingHousePopulationDto; import com.panzhihua.common.model.dtos.community.building.admin.EditBuildingHouseDto; import com.panzhihua.common.model.dtos.community.building.admin.EditBuildingUnitDto; import com.panzhihua.common.model.dtos.community.building.admin.PageBuildingListDto; import com.panzhihua.common.model.dtos.community.building.admin.PageBuildingUnitHouseListDto; import com.panzhihua.common.model.dtos.community.cluster.PageClusterMemberDto; import com.panzhihua.common.model.dtos.community.cluster.admin.AddClusterAdminDto; import com.panzhihua.common.model.dtos.community.cluster.admin.AddClusterMemberAdminDto; @@ -179,6 +170,7 @@ import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletAdminDTO; import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeAdminDTO; import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeDTO; import com.panzhihua.common.model.dtos.community.warehouse.ComActWarehouseApplyDTO; import com.panzhihua.common.model.dtos.community.warehouse.ComActWarehouseDonatesDTO; import com.panzhihua.common.model.dtos.community.warehouse.ExportDonatesDTO; import com.panzhihua.common.model.dtos.community.warehouse.PageDonatesDTO; @@ -251,7 +243,10 @@ import com.panzhihua.common.model.vos.community.BatchhouseVO; import com.panzhihua.common.model.vos.community.ComActActEvaluateVO; import com.panzhihua.common.model.vos.community.ComActActRegistVO; import com.panzhihua.common.model.vos.community.ComActActivityTypeVO; import com.panzhihua.common.model.vos.community.ComActActivityVO; import com.panzhihua.common.model.vos.community.ComActAnnouncementVO; import com.panzhihua.common.model.vos.community.ComActColumnVO; import com.panzhihua.common.model.vos.community.ComActCommiteeVO; import com.panzhihua.common.model.vos.community.ComActDynVO; import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO; @@ -303,6 +298,7 @@ import com.panzhihua.common.model.vos.community.ComSwRotaExcelVO; import com.panzhihua.common.model.vos.community.EldersAuthDetailsVO; import com.panzhihua.common.model.vos.community.EldersAuthElderlyExcelVO; import com.panzhihua.common.model.vos.community.QRActivityCodeVO; import com.panzhihua.common.model.vos.community.ResetComActMessageVO; import com.panzhihua.common.model.vos.community.SignactivityVO; import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticAgeGender; @@ -7250,15 +7246,6 @@ */ @GetMapping("/property/publicity/list/property") R listProperty(@RequestParam(value = "villageId", required = false) Long villageId, @RequestParam("communityId") Long communityId); /** * 小区列表 * @param propertyId * @param communityId * @return */ @GetMapping("/property/publicity/list/village") R listVillage(@RequestParam(value = "propertyId",required = false) Long propertyId, @RequestParam("communityId") Long communityId); /** * 分页查询物业宣传-小程序 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComPropertyPublicityApi.java
@@ -92,11 +92,4 @@ public R listProperty(@RequestParam(value = "villageId", required = false) Long villageId) { return communityService.listProperty(villageId, getCommunityId()); } @ApiOperation(value = "小区列表", response = ComMngVillageVO.class) @GetMapping("/list/village") @ApiImplicitParam(name = "propertyId", value = "物业公司id", required = false) public R listVillage(@RequestParam(value = "propertyId",required = false) Long propertyId) { return communityService.listVillage(propertyId, getCommunityId()); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComPropertyPublicityApi.java
@@ -91,18 +91,6 @@ @RequestParam("communityId") Long communityId) { return comPropertyPublicityService.listProperty(villageId, communityId); } /** * 小区列表 * @param propertyId * @param communityId * @return */ @GetMapping("/list/village") public R listVillage(@RequestParam(value = "propertyId",required = false) Long propertyId, @RequestParam("communityId") Long communityId) { return comPropertyPublicityService.listVillage(propertyId, communityId); } /** * 分页查询物业宣传-小程序 * @param pageComPropertyPublicityDTO springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComPropertyPublicityDAO.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.panzhihua.common.model.dtos.community.PageComPropertyPublicityDTO; import com.panzhihua.common.model.vos.community.ComMngVillageVO; import com.panzhihua.common.model.vos.community.ComPropertyPublicityVO; import com.panzhihua.service_community.model.dos.ComPropertyPublicityDO; import org.apache.ibatis.annotations.Mapper; springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComPropertyPublicityService.java
@@ -60,14 +60,6 @@ R listProperty(Long villageId, Long communityId); /** * 小区列表 * @param propertyId * @param communityId * @return */ R listVillage(Long propertyId, Long communityId); /** * 分页查询物业宣传-小程序 * @param pageComPropertyPublicityDTO * @return springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPropertyPublicityServiceImpl.java
@@ -9,6 +9,8 @@ import javax.annotation.Resource; import com.panzhihua.common.model.vos.community.ComMngVillageVO; import com.panzhihua.common.utlis.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -108,11 +110,6 @@ if (isNull(comPropertyPublicityDO)) { return R.fail("信息不存在"); } Long userId = comPropertyPublicityDTO.getUserId(); ComProperty comProperty = comPropertyDao.selectOne(new QueryWrapper<ComProperty>().lambda().eq(ComProperty::getUserId, userId)); if (isNull(comProperty) || !comProperty.getId().equals(comPropertyPublicityDO.getPropertyId())) { return R.fail("暂无权限"); } BeanUtils.copyProperties(comPropertyPublicityDTO, comPropertyPublicityDO); comPropertyPublicityDO.setUpdatedAt(new Date()); int result = this.baseMapper.updateById(comPropertyPublicityDO); @@ -160,35 +157,6 @@ propertyList = comPropertyDao.selectList(new QueryWrapper<ComProperty>().lambda().eq(ComProperty::getCommunityId, communityId)); } return R.ok(propertyList); } /** * 小区列表 * @param propertyId * @param communityId * @return */ @Override public R listVillage(Long propertyId, Long communityId) { List<ComMngStructAreaVO> comMngStructAreaVOS = new ArrayList<>(); List<ComMngStructAreaDO> comMngStructAreaDOS; if (nonNull(propertyId)) { ComProperty comProperty = comPropertyDao.selectById(propertyId); comMngStructAreaDOS = comMngStructAreaDAO.selectList( new QueryWrapper<ComMngStructAreaDO>().lambda().eq(ComMngStructAreaDO::getId, comProperty.getAreaId())); } else { comMngStructAreaDOS = comMngStructAreaDAO.selectList( new QueryWrapper<ComMngStructAreaDO>().lambda().eq(ComMngStructAreaDO::getCommunityId, communityId)); } if (!ObjectUtils.isEmpty(comMngStructAreaDOS)) { comMngStructAreaDOS.forEach(comMngStructAreaDO -> { ComMngStructAreaVO comMngStructAreaVO = new ComMngStructAreaVO(); BeanUtils.copyProperties(comMngStructAreaDO, comMngStructAreaVO); comMngStructAreaVOS.add(comMngStructAreaVO); }); } return R.ok(comMngStructAreaVOS); } /** springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComPropertyPublicityMapper.xml
@@ -31,7 +31,8 @@ </select> <select id="pageComPropertyPublicity" resultType="com.panzhihua.common.model.vos.community.ComPropertyPublicityVO"> SELECT pp.*, p.`name` AS propertyName, v.`name` AS villageName FROM com_property_publicity pp SELECT pp.*, p.`name` AS propertyName, v.`name` AS villageName FROM com_property_publicity pp INNER JOIN com_property p ON pp.property_id = p.id LEFT JOIN com_mng_village v ON p.area_id = v.village_id WHERE pp.community_id = #{pageComPropertyPublicityDTO.communityId} @@ -47,6 +48,7 @@ <if test="pageComPropertyPublicityDTO.keyword != null and pageComPropertyPublicityDTO.keyword != """> AND pp.title LIKE CONCAT(#{pageComPropertyPublicityDTO.keyword}, '%') </if> ORDER BY pp.id DESC </select> <select id="selectDetail" resultType="com.panzhihua.common.model.vos.community.ComPropertyPublicityVO"> SELECT pp.*, p.`name` AS propertyName, v.`name` AS villageName FROM com_property_publicity pp springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
@@ -210,4 +210,12 @@ * @return 社区注册人数统计数据导出 */ List<IndexUserStreetExcelExportVo> getUserCommunityExcelExport(); /** * 查看是否是社区物业人员 * @param userId * @param userCommunityId * @return */ int countPropertyWorker(@Param("userId") Long userId, @Param("communityId") Long userCommunityId); } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -325,6 +325,7 @@ loginUserInfoVO.setIsmemberrole(2); loginUserInfoVO.setIsFourMember(2); loginUserInfoVO.setIsCommunityWorker(2); loginUserInfoVO.setIsPropertyWorker(2); // 志愿者状态 String phone = sysUserDO.getPhone(); Long userCommunityId = sysUserDO.getCommunityId(); @@ -346,6 +347,11 @@ Integer countFourMember=comActFourMemberDao.selectCount(new QueryWrapper<ComActFourMember>().lambda().eq(ComActFourMember::getIdCard,sysUserDO.getIdCard())); if(countFourMember>0){ loginUserInfoVO.setIsFourMember(1); } //是否是社区物业人员 int countPropertyWorker = userDao.countPropertyWorker(Long.parseLong(userId), userCommunityId); if (countPropertyWorker > 0) { loginUserInfoVO.setIsPropertyWorker(1); } // 是否是"管理员"或者 本社区 "社区团队"、"党委成员" Integer countTeam = userDao.selectCountTeam(phone, userCommunityId); @@ -584,6 +590,7 @@ if (ObjectUtils.isEmpty(sysUserDO)) { return R.fail("人员不存在"); } BeanUtils.copyProperties(sysUserDO, loginUserInfoVO); List<ComMngFamilyInfoDO> comMngFamilyInfoDOS = comMngFamilyInfoDAO .selectList(new QueryWrapper<ComMngFamilyInfoDO>().lambda().eq(ComMngFamilyInfoDO::getUserId, userId)); @@ -637,6 +644,9 @@ if (!ObjectUtils.isEmpty(comActVO)) { loginUserInfoVO.setCommunityName(comActVO.getName()); } //是否是社区物业人员 int countPropertyWorker = userDao.countPropertyWorker(userId, loginUserInfoVO.getCommunityId()); loginUserInfoVO.setIsPropertyWorker(countPropertyWorker > 0 ? 1 : 0); loginUserInfoVO.setIdCard(SensitiveUtil.desensitizedIdNumber(loginUserInfoVO.getIdCard())); loginUserInfoVO.setPhone(SensitiveUtil.desensitizedPhoneNumber(loginUserInfoVO.getPhone())); return R.ok(loginUserInfoVO); springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/UserDao.xml
@@ -519,4 +519,9 @@ userNum DESC </select> <select id="countPropertyWorker" resultType="integer"> SELECT COUNT(id) FROM com_property WHERE user_id = #{userId} AND community_id = #{communityId} </select> </mapper>
