通知后台加入代码

huanghongfa

2021-01-07 ae33fef700e5d2558dffb03c8f66358da2545791

通知后台加入代码

 springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml

@@ -23,51 +23,77 @@
  </component>
  <component name="ChangeListManager">
    <list default="true" id="8ba27629-3e5d-4f42-993e-d0c055bc9371" name="Default Changelist" comment="">
      <change afterPath="$PROJECT_DIR$/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/IndexApi.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/dtos/user/PageFeedBackDTO.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/IndexDataKanbanVO.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/user/NoticeUnReadVO.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/user/SysUserFeedbackVO.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/model/dtos/DataKanbanDTO.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/TestApi.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/IndexDataVO.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/TodoEventsVO.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/IndexApi.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/TestApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/AdvertisingManagementApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/AdvertisingManagementApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/applets/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/applets/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/CommunityApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/CommunityApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/SystemManagementApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/SystemManagementApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/UserApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/UserApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/UserManagementApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/UserManagementApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/dtos/PageDTO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/dtos/PageDTO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/dtos/advertisement/ComOpsAdvDTO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/dtos/advertisement/ComOpsAdvDTO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/advertisement/ComOpsAdvPosVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/advertisement/ComOpsAdvPosVO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/user/MenuRoleVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/user/MenuRoleVO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/applets_backstage/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/applets_backstage/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/auth/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/auth/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ActivitySignVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ActivitySignVO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishVO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVolunteerMngVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVolunteerMngVO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/user/AdministratorsUserVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/user/AdministratorsUserVO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/user/SysUserNoticeVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/user/SysUserNoticeVO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/service/HanyuPinyinHelper.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/service/HanyuPinyinHelper.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/service/user/UserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/service/user/UserService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/dtos/PageDTO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/dtos/PageDTO.class" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/dtos/advertisement/ComOpsAdvDTO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/dtos/advertisement/ComOpsAdvDTO.class" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/advertisement/ComOpsAdvPosVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/advertisement/ComOpsAdvPosVO.class" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/user/MenuRoleVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/user/MenuRoleVO.class" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/utlis/IPUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/utlis/IPUtil.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/ActivitySignVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/ActivitySignVO.class" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.class" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/ComActMicroWishVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/ComActMicroWishVO.class" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/ComMngVolunteerMngVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/ComMngVolunteerMngVO.class" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.class" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/user/AdministratorsUserVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/user/AdministratorsUserVO.class" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/user/SysUserNoticeVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/user/SysUserNoticeVO.class" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/service/community/CommunityService.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/service/community/CommunityService.class" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/service/partybuilding/PartyBuildingService.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/service/partybuilding/PartyBuildingService.class" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/service/user/UserService.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/service/user/UserService.class" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/api/AdvertisementApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/api/AdvertisementApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/utlis/IPUtil.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/utlis/IPUtil.class" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityManagerApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityManagerApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/UserApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/UserApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/community_backstage/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/community_backstage/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComOpsAdvDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComOpsAdvDO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComOpsAdvPosDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComOpsAdvPosDO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActSignDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActSignDAO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDynUserDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDynUserDAO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngVolunteerMngDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngVolunteerMngDAO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComActDynService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComActDynService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComActEasyPhotoService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComActEasyPhotoService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComActMicroWishService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComActMicroWishService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComActService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComActService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComOpsAdvService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComOpsAdvService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComMngVolunteerMngService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComMngVolunteerMngService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComOpsAdvServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComOpsAdvServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/api/RoleApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/api/RoleApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVolunteerMngServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVolunteerMngServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbActivityMemberDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbActivityMemberDAO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComBpActivityService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComBpActivityService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserFeedbackDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserFeedbackDAO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserNoticeDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserNoticeDAO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/dao/RoleDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/dao/RoleDAO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysRoleMenuDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysRoleMenuDO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserDO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserFeedbackDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserFeedbackDO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/RoleService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/RoleService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysMenuDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysMenuDO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserNoticeDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserNoticeDO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/impl/RoleServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/impl/RoleServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_user/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/resources/bootstrap.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/zuul/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/zuul/src/main/resources/bootstrap.yml" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -154,26 +180,13 @@
      </set>
    </option>
  </component>
  <component name="RunManager" selected="Application.IPUtil">
  <component name="RunManager" selected="Application.UserServiceImpl">
    <configuration name="BaseController" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
      <option name="MAIN_CLASS_NAME" value="com.panzhihua.common.controller.BaseController" />
      <module name="common" />
      <extension name="coverage">
        <pattern>
          <option name="PATTERN" value="com.panzhihua.common.controller.*" />
          <option name="ENABLED" value="true" />
        </pattern>
      </extension>
      <method v="2">
        <option name="Make" enabled="true" />
      </method>
    </configuration>
    <configuration name="CommonApi" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
      <option name="MAIN_CLASS_NAME" value="com.panzhihua.applets.api.CommonApi" />
      <module name="applets" />
      <extension name="coverage">
        <pattern>
          <option name="PATTERN" value="com.panzhihua.applets_backstage.api.*" />
          <option name="ENABLED" value="true" />
        </pattern>
      </extension>
@@ -213,6 +226,19 @@
      <extension name="coverage">
        <pattern>
          <option name="PATTERN" value="com.panzhihua.applets_backstage.api.*" />
          <option name="ENABLED" value="true" />
        </pattern>
      </extension>
      <method v="2">
        <option name="Make" enabled="true" />
      </method>
    </configuration>
    <configuration name="UserServiceImpl" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
      <option name="MAIN_CLASS_NAME" value="com.panzhihua.service_user.service.impl.UserServiceImpl" />
      <module name="service_user" />
      <extension name="coverage">
        <pattern>
          <option name="PATTERN" value="com.panzhihua.service_user.service.impl.*" />
          <option name="ENABLED" value="true" />
        </pattern>
      </extension>
@@ -302,11 +328,11 @@
      </method>
    </configuration>
    <list>
      <item itemvalue="Application.CommonApi" />
      <item itemvalue="Application.BaseController" />
      <item itemvalue="Application.UserApi" />
      <item itemvalue="Application.HanyuPinyinHelper" />
      <item itemvalue="Application.IPUtil" />
      <item itemvalue="Application.UserServiceImpl" />
      <item itemvalue="Spring Boot.CommunityBackstageApplication" />
      <item itemvalue="Spring Boot.AppletsApplication" />
      <item itemvalue="Spring Boot.AppletsBackstageApplication" />
@@ -320,11 +346,11 @@
    </list>
    <recent_temporary>
      <list>
        <item itemvalue="Application.UserServiceImpl" />
        <item itemvalue="Application.IPUtil" />
        <item itemvalue="Application.HanyuPinyinHelper" />
        <item itemvalue="Application.UserApi" />
        <item itemvalue="Application.BaseController" />
        <item itemvalue="Application.CommonApi" />
      </list>
    </recent_temporary>
  </component>
@@ -421,7 +447,9 @@
      <workItem from="1609120765557" duration="31000" />
      <workItem from="1609121031103" duration="30812000" />
      <workItem from="1609219740946" duration="61933000" />
      <workItem from="1609722105304" duration="44575000" />
      <workItem from="1609722105304" duration="63644000" />
      <workItem from="1609921318056" duration="16792000" />
      <workItem from="1609992667471" duration="11442000" />
    </task>
    <servers />
  </component>
@@ -445,10 +473,10 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="249" y="0" key="#Project_Structure/0.0.1536.824@0.0.1536.824" timestamp="1608546608273" />
    <state x="574" y="118" key="#com.intellij.ide.util.MemberChooser" timestamp="1609836663929">
    <state x="574" y="118" key="#com.intellij.ide.util.MemberChooser" timestamp="1610005965673">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="574" y="118" key="#com.intellij.ide.util.MemberChooser/0.0.1536.824@0.0.1536.824" timestamp="1609836663929" />
    <state x="574" y="118" key="#com.intellij.ide.util.MemberChooser/0.0.1536.824@0.0.1536.824" timestamp="1610005965673" />
    <state x="405" y="335" key="#com.intellij.refactoring.move.MoveHandler.SelectRefactoringDialog" timestamp="1606099594079">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
@@ -461,10 +489,10 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="499" y="159" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/0.0.1536.824@0.0.1536.824" timestamp="1608878808962" />
    <state width="561" height="466" key="DebuggerActiveHint" timestamp="1609840725565">
    <state width="561" height="466" key="DebuggerActiveHint" timestamp="1609929761399">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="561" height="466" key="DebuggerActiveHint/0.0.1536.824@0.0.1536.824" timestamp="1609840725565" />
    <state width="561" height="466" key="DebuggerActiveHint/0.0.1536.824@0.0.1536.824" timestamp="1609929761399" />
    <state x="93" y="93" width="1350" height="638" key="DiffContextDialog" timestamp="1609316182000">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
@@ -473,54 +501,54 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1609823156997" />
    <state width="1031" height="395" key="GridCell.Tab.0.bottom" timestamp="1609840730065">
    <state width="1031" height="375" key="GridCell.Tab.0.bottom" timestamp="1610007835800">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="395" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1609840730065" />
    <state width="1031" height="395" key="GridCell.Tab.0.center" timestamp="1609840730065">
    <state width="1031" height="375" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610007835800" />
    <state width="1031" height="375" key="GridCell.Tab.0.center" timestamp="1610007835799">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="395" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1609840730065" />
    <state width="1031" height="395" key="GridCell.Tab.0.left" timestamp="1609840730064">
    <state width="1031" height="375" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1610007835799" />
    <state width="1031" height="375" key="GridCell.Tab.0.left" timestamp="1610007835799">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="395" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1609840730064" />
    <state width="1031" height="395" key="GridCell.Tab.0.right" timestamp="1609840730065">
    <state width="1031" height="375" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1610007835799" />
    <state width="1031" height="375" key="GridCell.Tab.0.right" timestamp="1610007835800">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="395" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1609840730065" />
    <state width="1031" height="395" key="GridCell.Tab.1.bottom" timestamp="1609840730066">
    <state width="1031" height="375" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1610007835800" />
    <state width="1031" height="375" key="GridCell.Tab.1.bottom" timestamp="1610007835800">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="395" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1609840730066" />
    <state width="1031" height="395" key="GridCell.Tab.1.center" timestamp="1609840730066">
    <state width="1031" height="375" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610007835800" />
    <state width="1031" height="375" key="GridCell.Tab.1.center" timestamp="1610007835800">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="395" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1609840730066" />
    <state width="1031" height="395" key="GridCell.Tab.1.left" timestamp="1609840730066">
    <state width="1031" height="375" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1610007835800" />
    <state width="1031" height="375" key="GridCell.Tab.1.left" timestamp="1610007835800">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="395" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1609840730066" />
    <state width="1031" height="395" key="GridCell.Tab.1.right" timestamp="1609840730066">
    <state width="1031" height="375" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1610007835800" />
    <state width="1031" height="375" key="GridCell.Tab.1.right" timestamp="1610007835800">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="395" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1609840730066" />
    <state width="1031" height="395" key="GridCell.Tab.2.bottom" timestamp="1609840730066">
    <state width="1031" height="375" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1610007835800" />
    <state width="1031" height="375" key="GridCell.Tab.2.bottom" timestamp="1610007835800">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="395" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1609840730066" />
    <state width="1031" height="395" key="GridCell.Tab.2.center" timestamp="1609840730066">
    <state width="1031" height="375" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610007835800" />
    <state width="1031" height="375" key="GridCell.Tab.2.center" timestamp="1610007835800">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="395" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1609840730066" />
    <state width="1031" height="395" key="GridCell.Tab.2.left" timestamp="1609840730066">
    <state width="1031" height="375" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1610007835800" />
    <state width="1031" height="375" key="GridCell.Tab.2.left" timestamp="1610007835800">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="395" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1609840730066" />
    <state width="1031" height="395" key="GridCell.Tab.2.right" timestamp="1609840730066">
    <state width="1031" height="375" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1610007835800" />
    <state width="1031" height="375" key="GridCell.Tab.2.right" timestamp="1610007835800">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="395" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1609840730066" />
    <state width="1031" height="375" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1610007835800" />
    <state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1606714311663">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
@@ -529,10 +557,10 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="270" y="57" key="SettingsEditor/0.0.1536.824@0.0.1536.824" timestamp="1606120706449" />
    <state width="498" height="540" key="SwitcherDM" timestamp="1609839753727">
    <state width="498" height="540" key="SwitcherDM" timestamp="1609989508012">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="498" height="540" key="SwitcherDM/0.0.1536.824@0.0.1536.824" timestamp="1609839753727" />
    <state width="498" height="540" key="SwitcherDM/0.0.1536.824@0.0.1536.824" timestamp="1609989508012" />
    <state x="93" y="93" width="1350" height="638" key="com.intellij.history.integration.ui.views.DirectoryHistoryDialog" timestamp="1609398421992">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
@@ -541,10 +569,14 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="93" y="93" width="1350" height="638" key="com.intellij.history.integration.ui.views.FileHistoryDialog/0.0.1536.824@0.0.1536.824" timestamp="1609226181026" />
    <state x="468" y="42" width="766" height="782" key="find.popup" timestamp="1609841206383">
    <state x="468" y="42" width="766" height="782" key="find.popup" timestamp="1610007292702">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="468" y="42" width="766" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1609841206382" />
    <state x="468" y="42" width="766" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1610007292702" />
    <state width="600" height="428" key="javadoc.popup" timestamp="1610005781618">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="600" height="428" key="javadoc.popup/0.0.1536.824@0.0.1536.824" timestamp="1610005781617" />
    <state x="301" y="45" key="new project wizard" timestamp="1609120520884">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
@@ -557,10 +589,10 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="425" y="187" key="run.anything.popup/0.0.1536.824@0.0.1536.824" timestamp="1608280452280" />
    <state x="431" y="145" width="672" height="678" key="search.everywhere.popup" timestamp="1609838280331">
    <state x="431" y="145" width="672" height="678" key="search.everywhere.popup" timestamp="1609997764808">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="431" y="145" width="672" height="678" key="search.everywhere.popup/0.0.1536.824@0.0.1536.824" timestamp="1609838280331" />
    <state x="431" y="145" width="672" height="678" key="search.everywhere.popup/0.0.1536.824@0.0.1536.824" timestamp="1609997764808" />
  </component>
  <component name="XDebuggerManager">
    <pin-to-top-manager>

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

@@ -1,15 +1,20 @@
package com.panzhihua.applets.api;

import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.PageVolunteerDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.partybuilding.PartyBuildingActivityVO;
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.validated.AddGroup;
import com.panzhihua.common.validated.PageGroup;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

@@ -21,12 +26,15 @@
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-10 10:04
 **/
@Slf4j
@RestController
@RequestMapping("/community/")
@Api(tags = {"社区服务"})
public class CommunityApi extends BaseController {
    @Resource
    private CommunityService communityService;
    @Resource
    private UserService userService;

    @ApiOperation(value = "分页获取社区动态",response = ComActDynVO.class)
    @PostMapping("pagedynamic")
@@ -65,8 +73,28 @@
    @PutMapping("signactivity")
    public R signActivity(@RequestBody @Validated(AddGroup.class) SignactivityVO signactivityVO){
        Long userId = this.getUserId();
        Long activityId = signactivityVO.getActivityId();
        signactivityVO.setUserId(userId);
        return communityService.signActivity(signactivityVO);
        R r = communityService.signActivity(signactivityVO);
        if (R.isOk(r)&&signactivityVO.getType().intValue()==1) {
            R r2 = communityService.detailActivity(activityId, userId);
            ComActActivityVO comActActivityVO= JSONObject.parseObject(JSONObject.toJSONString(r2.getData()),ComActActivityVO.class);
            SysUserNoticeVO sysUserNoticeVO=new SysUserNoticeVO();
            sysUserNoticeVO.setUserId(userId);
            sysUserNoticeVO.setType(1);
            sysUserNoticeVO.setTitle("报名成功");
            sysUserNoticeVO.setBusinessType(1);
            sysUserNoticeVO.setBusinessTitle(comActActivityVO.getActivityName());
            sysUserNoticeVO.setBusinessContent(String.format("活动将于%s开始，请按时参加",comActActivityVO.getBeginAt()));
            sysUserNoticeVO.setBusinessId(activityId);
            sysUserNoticeVO.setStatus(0);
            sysUserNoticeVO.setBusinessStatus(2);
            R r1 = userService.addNotice(sysUserNoticeVO);
            if (R.isOk(r1)) {
                log.info("新增用户报名社区活动通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
            }
        }
        return r;
    }

    @ApiOperation(value = "活动人员列表",response = ActivitySignVO.class)

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

@@ -1,13 +1,17 @@
package com.panzhihua.applets.api;

import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.partybuilding.ActivitySignUpDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.partybuilding.*;
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
import com.panzhihua.common.service.partybuilding.PartyBuildingService;
import com.panzhihua.common.service.user.UserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.util.ObjectUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -21,12 +25,15 @@
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-02 16:19
 **/
@Slf4j
@RestController
@RequestMapping("/partybuilding/")
@Api(tags = {"党群服务"})
public class PartyBuildingApi extends BaseController {
    @Resource
    private PartyBuildingService partyBuildingService;
    @Resource
    private UserService userService;

    @ApiOperation(value = "分页党建动态/政策文件",response =PartyCommitteeVO.class )
    @PostMapping("pagedynamic")
@@ -93,8 +100,29 @@
    @ApiOperation(value = "报名、取消报名党员活动")
    @PutMapping("activitysignup")
    public R putActivitySignUp(@RequestBody @Validated ActivitySignUpDTO activitySignUpDTO) {
        activitySignUpDTO.setUserId(this.getUserId());
        return partyBuildingService.putActivitySignUp(activitySignUpDTO);
        Long userId = this.getUserId();
        activitySignUpDTO.setUserId(userId);
        Long id = activitySignUpDTO.getId();
        R r = partyBuildingService.putActivitySignUp(activitySignUpDTO);
        if (R.isOk(r)&&activitySignUpDTO.getType().intValue()==1) {
            R r2 = partyBuildingService.activityinfo(id, userId);
            PartyBuildingActivityVO partyBuildingActivityVO=JSONObject.parseObject(JSONObject.toJSONString(r2.getData()),PartyBuildingActivityVO.class);
            SysUserNoticeVO sysUserNoticeVO=new SysUserNoticeVO();
            sysUserNoticeVO.setUserId(userId);
            sysUserNoticeVO.setType(1);
            sysUserNoticeVO.setTitle("报名成功");
            sysUserNoticeVO.setBusinessType(2);
            sysUserNoticeVO.setBusinessTitle(partyBuildingActivityVO.getName());
            sysUserNoticeVO.setBusinessContent(String.format("活动将于%s开始，请按时参加",partyBuildingActivityVO.getActivityTimeBegin()));
            sysUserNoticeVO.setBusinessId(id);
            sysUserNoticeVO.setStatus(0);
            sysUserNoticeVO.setBusinessStatus(2);
            R r1 = userService.addNotice(sysUserNoticeVO);
            if (R.isOk(r1)) {
                log.info("新增用户报名党建活动通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
            }
        }
        return r;
    }



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

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

import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.service.user.UserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 调试接口
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2021-01-06 16:32
 **/
@RestController
@RequestMapping("/test/")
@Api(tags = {"调试接口"})
public class TestApi {

    @Resource
    private UserService userService;

    @ApiOperation(value = "维护用户持续登录天数")
    @GetMapping("timedtaskcontinuouslandingdays")
    public R timedTaskContinuousLandingDays() {
        return userService.timedTaskContinuousLandingDays();
    }
}

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

@@ -1,10 +1,14 @@
package com.panzhihua.applets_backstage.api;

import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.interfaces.OperLog;
import com.panzhihua.common.model.dtos.community.PageComActDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.user.AdministratorsUserVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -22,19 +26,42 @@
@Api(tags = {"社区管理"})
@RestController
@RequestMapping("/communitymanager/")
public class CommunityApi {
public class CommunityApi extends BaseController {
    @Resource
    private CommunityService communityService;
    @Resource
    private UserService userService;
    /**
     * 攀枝花地址json
     */
    private String panzhihuajson="{\"id\":256,\"city_name\":\"攀枝花市\",\"city_adcode\":510400,\"province_adcode\":510000,\"province_id\":23,\"district\":[{\"id\":2004,\"district_name\":\"仁和区\",\"district_adcode\":510411,\"city_adcode\":510400,\"city_id\":256,\"province_adcode\":510000,\"province_id\":23},{\"id\":2005,\"district_name\":\"米易县\",\"district_adcode\":510421,\"city_adcode\":510400,\"city_id\":256,\"province_adcode\":510000,\"province_id\":23},{\"id\":2006,\"district_name\":\"盐边县\",\"district_adcode\":510422,\"city_adcode\":510400,\"city_id\":256,\"province_adcode\":510000,\"province_id\":23}]}";

    @ApiOperation("新增社区")
    @ApiOperation(value = "新增社区",response = ComActVO.class)
    @PostMapping("community")
    @OperLog(operModul = "社区管理",operType = 1)
    public R addCommunity(@RequestBody @Validated(AddGroup.class) ComActVO comActVO){
       return communityService.addCommunity(comActVO);
        R r = communityService.addCommunity(comActVO);
        if (R.isOk(r)) {
            ComActVO comActVO1 = JSONObject.parseObject(JSONObject.toJSONString(r.getData()),ComActVO.class);
            Long communityId = comActVO1.getCommunityId();
            AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
            administratorsUserVO.setAccount(comActVO1.getAccount());
            administratorsUserVO.setPassword(comActVO.getPassword());
            administratorsUserVO.setPhone(comActVO1.getContactsPhone());
            administratorsUserVO.setName(comActVO1.getContacts());
            administratorsUserVO.setType(3);
            administratorsUserVO.setAreaId(null);
            administratorsUserVO.setCommunityId(communityId);
            administratorsUserVO.setStatus(comActVO1.getState()+1);
            administratorsUserVO.setRoleId(999999999l);
            administratorsUserVO.setUserId(this.getUserId());
            R r1 = userService.addUserBackstage(administratorsUserVO);
            if (!R.isOk(r1)) {
                communityService.delectCommunity(communityId);
            }
            return r1;
        }
        return r;
    }

    @ApiOperation("编辑社区")

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

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

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

import java.util.List;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 社区管理后台数据看板
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2021-01-06 09:39
 **/
@Data
@ApiModel(value = "社区管理后台数据看板")
public class IndexDataVO {

    @ApiModelProperty("全部用户")
    private Integer allUser;
    @ApiModelProperty("已登记房屋")
    private Integer house;
    @ApiModelProperty("志愿者人数")
    private Integer volunteerUser;
    @ApiModelProperty("党员人数")
    private Integer partymemberUser;
    @ApiModelProperty("代办事件")
    List<TodoEventsVO> todoEventsVOList;


}

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

@@ -28,4 +28,6 @@
    private String createAt;
    @ApiModelProperty("人员头像")
    private String imageUrl;
    @ApiModelProperty(value = "人员头像",hidden = true)
    private Integer isVolunteer;
}

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

@@ -116,4 +116,7 @@

    @ApiModelProperty("拒绝原因")
    private String rejectReason;

    @ApiModelProperty(value = "后台登录人员id",hidden = true)
    private Long backUserId;
}

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

@@ -130,5 +130,8 @@
    @ApiModelProperty(value = "登录用户",hidden = true)
    private Long userId;

    @ApiModelProperty(value = "社区后台登录用户",hidden = true)
    private Long backUserId;

}


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

@@ -73,4 +73,7 @@

    @ApiModelProperty(value = "积分",hidden = true)
    private Integer integral;

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

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

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

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

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 代办事件
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2021-01-06 10:07
 **/
@Data
@ApiModel("代办事件")
public class TodoEventsVO {
    @ApiModelProperty("功能")
    private String function;
    @ApiModelProperty("行为")
    private String behavior;
    @ApiModelProperty("文字")
    private String words;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.java

@@ -18,7 +18,7 @@
@ApiModel("党员活动")
public class
PartyBuildingActivityVO {
    @ApiModelProperty("党员id")
    @ApiModelProperty("党员活动id")
    private Long id;

    @ApiModelProperty("活动名称")

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/AdministratorsUserVO.java

@@ -40,7 +40,7 @@
    @Pattern(groups = {AddGroup.class},message="【手机号】格式错误",regexp = "1[3|4|5|7|8][0-9]\\d{8}")
    private String phone;

    @ApiModelProperty("状态")
    @ApiModelProperty("状态 1 启用 2 禁用")
    @Min(groups = {AddGroup.class},value =1,message = "账户状态不能为空")
    private Integer status;


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysUserNoticeVO.java

@@ -29,7 +29,7 @@
    @ApiModelProperty("消息标题")
    private String title;

    @ApiModelProperty("具体业务类型 1 社区活动 2社区活动 3微心愿通知 4随手拍服务通知 5支援者申请 6实名制审核 7人脸识别审核 8积分获取和消耗 9积分点击直接跳转积分列表")
    @ApiModelProperty("具体业务类型 1 社区活动 2党建活动 3微心愿通知 4随手拍服务通知 5支援者申请 6实名制审核 7人脸识别审核 8积分获取和消耗 9积分点击直接跳转积分列表")
    private Integer businessType;

    @ApiModelProperty("业务标题")
@@ -59,4 +59,7 @@
    @ApiModelProperty("业务主键 用于跳转")
    private Long businessId;

    @ApiModelProperty("社区活动类型 1志愿者活动 2居民活动")
    private Integer activityType;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/HanyuPinyinHelper.java

@@ -95,7 +95,7 @@
    /**
     * 取第一个汉字的第一个字符
     * @Title: getFirstLetter
     * @Description: TODO
     * @Description:
     * @return String
     * @throws
     */

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

@@ -580,5 +580,27 @@
    @PostMapping("listadvjump")
    R listAdvjump();

    /**
     * 社区管理后台数据看板 代办事件
     * @param communityId 社区id
     * @param userId
     * @return 代办事件列表
     */
    @PostMapping("indexdatacommunitybackstage")
    R indexDataCommunityBackstage(@RequestParam("communityId") Long communityId, @RequestParam("userId")Long userId);

    /**
     * 删除社区
     * @param communityId 社区id
     * @return 删除结果
     */
    @PostMapping("delectcommunity")
    R delectCommunity(@RequestParam("communityId") Long communityId);

    /**
     * 定时任务刷新社区动态置顶状态
     * @return
     */
    @PostMapping("timedtaskdynistopping")
    R timedTaskDynIstopping();
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java

@@ -252,4 +252,12 @@
     */
    @PostMapping("/partybuildIng/putactivitysignup")
    R putActivitySignUp(@RequestBody ActivitySignUpDTO activitySignUpDTO);

    /**
     * 获取党建活动所有参入人员的id集合
     * @param id 党建活动id
     * @return 人员id集合
     */
    @PostMapping("/partybuildIng/selectallpartybuildingactivitymembers")
    R selectAllPartyBuildingActivityMembers(@RequestParam("id")Long id);
}

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

@@ -225,7 +225,7 @@
    R putFamily(@RequestBody ComMngFamilyInfoVO comMngFamilyInfoVO);

    /**
     * 新增运营后台账户
     * 新增运营、社区后台账户
     * @param administratorsUserVO 账户信息
     * @return 新增结果
     */
@@ -233,7 +233,7 @@
    R addUserBackstage(@RequestBody AdministratorsUserVO administratorsUserVO);

    /**
     * 编辑运营后台账户
     * 编辑运营、社区后台账户
     * @param administratorsUserVO 编辑账户内容
     * @return 编辑结果
     */
@@ -437,4 +437,27 @@
     */
    @PostMapping("/role/listmenu")
    R listmenu(@RequestParam("userId")Long userId);

    /**
     * 社区管理后台数据看板
     * @param communityId 社区id
     * @return 看板用户数据
     */
    @PostMapping("indexdatacommunitybackstage")
    R indexDataCommunityBackstage(@RequestParam("communityId")Long communityId);

    /**
     * 定时任务维护用户持续登录时间
     * @return 维护结果
     */
    @PostMapping("timedtaskcontinuouslandingdays")
    R timedTaskContinuousLandingDays();

    /**
     * 新增用户通知
     * @param sysUserNoticeVO 通知内容
     * @return 新增结果
     */
    @PostMapping("addnotice")
    R addNotice(@RequestBody SysUserNoticeVO sysUserNoticeVO);
}

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

@@ -154,7 +154,6 @@
            tempStr = new String(arrayOut.toByteArray());

        } catch (IOException e) {
// TODO Auto-generated catch block
            e.printStackTrace();
        }
        return tempStr;

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/IndexDataVO.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/community/ActivitySignVO.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/community/ComActMicroWishVO.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/community/ComMngVolunteerMngVO.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/community/TodoEventsVO.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/user/AdministratorsUserVO.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/user/SysUserNoticeVO.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/service/community/CommunityService.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/service/partybuilding/PartyBuildingService.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/service/user/UserService.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/utlis/IPUtil.class

Binary files differ

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

File was deleted

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

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

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.partybuilding.ActivityManagerVO;
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.user.UserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.util.ObjectUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

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

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 社区活动
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-07 14:38
 **/
@Slf4j
@Api(tags = {"社区动态/随手拍/微心愿/社区活动"})
@RestController
@RequestMapping("/communityactivity/")
public class CommunityActivityApi extends BaseController {
    @Resource
    private UserService userService;
    @Resource
    private CommunityService communityService;

    @ApiOperation(value = "活动负责人下拉选择", response = ActivityManagerVO.class)
    @GetMapping("listactivitymanager")
    @ApiImplicitParam(name = "param", value = "搜索参数【不传返回所有后台人员】", required = false)
    public R listActivityManager(String param) {
        Long communityId = this.getCommunityId();
        if (ObjectUtils.isEmpty(param)) {
            param = "";
        }
        return userService.listActivityManager(param, communityId);

    }

    @ApiOperation(value = "新增社区活动")
    @PostMapping("activity")
    public R addActivity(@RequestBody ComActActivityVO ComActActivityVO) {
        Long communityId = this.getCommunityId();
        ComActActivityVO.setCommunityId(communityId);
        return communityService.addActivity(ComActActivityVO);
    }

    @ApiOperation(value = "编辑社区活动")
    @PutMapping("activity")
    public R putActivity(@RequestBody ComActActivityVO ComActActivityVO) {
        Long id = ComActActivityVO.getId();
        if (ObjectUtils.isEmpty(id)) {
            return R.fail("活动id主键不能为空");
        }
        Long communityId = this.getCommunityId();
        ComActActivityVO.setCommunityId(communityId);
        return communityService.putActivity(ComActActivityVO);
    }

    @ApiOperation(value = "删除社区活动")
    @DeleteMapping("activity")
    public R deleteActivity(@RequestBody ComActActivityVO ComActActivityVO) {
        Long id = ComActActivityVO.getId();
        if (null == id || 0 == id) {
            return R.fail("活动id主键不能为空");
        }
        return communityService.deleteActivity(ComActActivityVO);
    }

    @ApiOperation(value = "分页查询社区活动")
    @PostMapping("pageactivity")
    public R pageActivity(@RequestBody ComActActivityVO ComActActivityVO) {
        Long communityId = this.getCommunityId();
        ComActActivityVO.setCommunityId(communityId);
        return communityService.pageActivity(ComActActivityVO);
    }

    @ApiOperation(value = "发布活动")
    @PostMapping("releaseactivity")
    public R releaseActivity(@RequestBody ComActActivityVO ComActActivityVO) {
        Long id = ComActActivityVO.getId();
        if (ObjectUtils.isEmpty(id)) {
            return R.fail("活动id主键不能为空");
        }
        ComActActivityVO.setPublishAt(new Date());
        ComActActivityVO.setStatus(2);
        return communityService.releaseActivity(ComActActivityVO);
    }

    @ApiOperation(value = "取消活动")
    @PutMapping("cancelactivity")
    public R cancelActivity(@RequestBody @Validated ComActActivityVO ComActActivityVO) {
        Long id = ComActActivityVO.getId();
        if (null == id || 0 == id) {
            return R.fail("活动id主键不能为空");
        }
        ComActActivityVO.setStatus(6);
        R r = communityService.cancelActivity(ComActActivityVO);
        if (R.isOk(r)) {
            ActivitySignVO activitySignVO = new ActivitySignVO();
            activitySignVO.setActivityId(id);
            R r3 = this.detailActivity(id);
            if (!R.isOk(r3)) {
                Object data = r3.getData();
                ComActActivityVO comActActivityVO = JSONObject.parseObject(JSONObject.toJSONString(data), ComActActivityVO.class);
                R r1 = communityService.listActivitySign(activitySignVO);
                if (R.isOk(r1)) {
                    List<ActivitySignVO> activitySignVOS = JSONArray.parseArray(JSONArray.toJSONString(r1.getData()), ActivitySignVO.class);
                    if (!ObjectUtils.isEmpty(activitySignVOS)) {
                        activitySignVOS.forEach(activitySignVO1 -> {
                            Long aLong = activitySignVO1.getId();
                            int isVolunteer = activitySignVO1.getIsVolunteer().intValue();
                            SysUserNoticeVO sysUserNoticeVO = new SysUserNoticeVO();
                            sysUserNoticeVO.setUserId(aLong);
                            sysUserNoticeVO.setType(1);
                            sysUserNoticeVO.setTitle("活动因故取消");
                            sysUserNoticeVO.setBusinessType(1);
                            sysUserNoticeVO.setBusinessTitle(comActActivityVO.getActivityName());
                            sysUserNoticeVO.setBusinessContent(String.format("取消原因%s", comActActivityVO.getCancelReason()));
                            sysUserNoticeVO.setBusinessId(id);
                            sysUserNoticeVO.setStatus(0);
                            sysUserNoticeVO.setBusinessStatus(1);
                            sysUserNoticeVO.setActivityType(1 == isVolunteer ? 1 : 2);
                            R r2 = userService.addNotice(sysUserNoticeVO);
                            if (R.isOk(r2)) {
                                log.info("新增取消社区活动通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
                            }
                        });
                    }
                }
            }
        }
        return r;
    }

    @ApiOperation(value = "活动详情")
    @GetMapping("detailactivity")
    public R detailActivity(@RequestParam("id") Long id) {
        Long userId = this.getUserId();
        return communityService.detailActivity(id, userId);
    }

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

    @ApiOperation(value = "新增社区动态")
    @PostMapping("dynamic")
    public R addDynamic(@RequestBody ComActDynVO comActDynVO) {
        Long communityId = this.getCommunityId();
        comActDynVO.setCommunityId(communityId);
        Date publishAt = comActDynVO.getPublishAt();
        long time = publishAt.getTime();
        long l = System.currentTimeMillis();
        if (l >= time) {
            comActDynVO.setStatus(1);
        }
        return communityService.addDynamic(comActDynVO);
        //todo 五天自动取消置顶状态
        //todo 发布时间到了直接修改状态为已发布
    }

    @ApiOperation(value = "编辑社区动态、取消置顶、设置置顶")
    @PutMapping("dynamic")
    public R putDynamic(@RequestBody ComActDynVO comActDynVO) {
        Long communityId = this.getCommunityId();
        Long id = comActDynVO.getId();
        if (ObjectUtils.isEmpty(id)) {
            return R.fail("动态主键不能为空");
        }
        Date publishAt = comActDynVO.getPublishAt();
        if (!ObjectUtils.isEmpty(publishAt)) {
            long time = publishAt.getTime();
            long l = System.currentTimeMillis();
            if (l >= time) {
                comActDynVO.setStatus(1);
            }
        }
        comActDynVO.setCommunityId(communityId);
        return communityService.putDynamic(comActDynVO);
        //todo 五天自动取消置顶状态
    }

    @ApiOperation(value = "删除社区动态")
    @DeleteMapping("dynamic")
    public R deleteDynamic(@RequestBody ComActDynVO comActDynVO) {
        Long id = comActDynVO.getId();
        if (ObjectUtils.isEmpty(id)) {
            return R.fail("动态主键不能为空");
        }
        return communityService.deleteDynamic(comActDynVO);
        //todo 五天自动取消置顶状态
    }

    @ApiOperation(value = "分页查询社区动态")
    @PostMapping("pagedynamic")
    public R pageDynamic(@RequestBody ComActDynVO comActDynVO) {
        Long communityId = this.getCommunityId();
        comActDynVO.setCommunityId(communityId);
        return communityService.pageDynamic(comActDynVO);
    }

    @ApiOperation(value = "社区动态详情")
    @GetMapping("detaildynamic")
    @ApiImplicitParam(name = "id", value = "社区动态主键", required = true)
    public R detailDynamic(@RequestParam("id") Long id) {
        return communityService.detailDynamic(id);
    }


    @ApiOperation(value = "分页查询随手拍")
    @PostMapping("pageeasyphoto")
    public R pageEasyPhoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        Long communityId = loginUserInfo.getCommunityId();
        Long userId = loginUserInfo.getUserId();
        comActEasyPhotoVO.setCommunityId(communityId);
        comActEasyPhotoVO.setBackUserId(userId);
        return communityService.pageEasyPhoto(comActEasyPhotoVO);
    }

    @ApiOperation(value = "随手拍详情", response = ComActEasyPhotoVO.class)
    @GetMapping("easyphoto")
    public R detailEasyPhoto(@RequestParam("id") Long id) {
        Long userId = this.getUserId();
        return communityService.detailEasyPhoto(id, userId);
    }

    @ApiOperation(value = "分页查询微心愿")
    @PostMapping("pagemicrowish")
    public R pageMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        Long communityId = loginUserInfo.getCommunityId();
        Long userId = loginUserInfo.getUserId();
        comActMicroWishVO.setCommunityId(communityId);
        comActMicroWishVO.setBackUserId(userId);
        return communityService.pageMicroWish(comActMicroWishVO);
    }

    @ApiOperation(value = "心愿详情")
    @GetMapping("detailmicrowish")
    public R detailMicroWish(@RequestParam("id") Long id) {
        Long userId = this.getUserId();
        return communityService.detailMicroWish(id, userId);
    }

    @ApiOperation(value = "审核、分配、反馈心愿")
    @PutMapping("putmicrowish")
    public R putlMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO) {
        Long id = comActMicroWishVO.getId();
        Long userId = this.getUserId();
        if (ObjectUtils.isEmpty(id)) {
            return R.fail("心愿主键不能为空");
        }
        Integer type = comActMicroWishVO.getType();
        if (ObjectUtils.isEmpty(type) || type > 5 || type < 1) {
            return R.fail("操作类型不对");
        }
        R r = communityService.putlMicroWish(comActMicroWishVO);
        if (R.isOk(r)) {
            if (R.isOk(r)) {
//                1 审核通过 2驳回 3分配人员 4发起活动 5反馈
                R r1 = communityService.detailMicroWish(id, userId);
                Object data = r1.getData();
                ComActMicroWishVO comActMicroWishVO1 = JSONObject.parseObject(JSONObject.toJSONString(data), ComActMicroWishVO.class);
                if (R.isOk(r1)) {
                    SysUserNoticeVO sysUserNoticeVO = new SysUserNoticeVO();
                    sysUserNoticeVO.setUserId(comActMicroWishVO1.getSponsorId());
                    sysUserNoticeVO.setType(2);
                    sysUserNoticeVO.setBusinessType(3);
                    sysUserNoticeVO.setBusinessTitle(comActMicroWishVO1.getWishName());
                    sysUserNoticeVO.setBusinessTime(comActMicroWishVO1.getExamineAt());
                    sysUserNoticeVO.setBusinessId(id);
                    sysUserNoticeVO.setStatus(0);
                    if (type.intValue() == 2) {
                        sysUserNoticeVO.setTitle("微心愿未通过审核");
                        sysUserNoticeVO.setBusinessContent(String.format("驳回原因：%s", comActMicroWishVO1.getRejectReason()));
                        sysUserNoticeVO.setBusinessStatus(1);
                        R r2 = userService.addNotice(sysUserNoticeVO);
                        if (R.isOk(r2)) {
                            log.info("新增微心愿未通过审核通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
                        }
                    } else if (type.intValue() == 5) {
                        sysUserNoticeVO.setTitle("微心愿已完成");
                        sysUserNoticeVO.setBusinessContent(comActMicroWishVO.getFeedback());
                        sysUserNoticeVO.setBusinessStatus(2);
                        R r2 = userService.addNotice(sysUserNoticeVO);
                        if (R.isOk(r2)) {
                            log.info("新增微心愿已完成通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
                        }
                    } else if (type.intValue() == 3) {
                        sysUserNoticeVO.setTitle("微心愿已分配负责人");
                        sysUserNoticeVO.setBusinessContent("负责人会在近日和你联系，请保持电话畅通");
                        sysUserNoticeVO.setBusinessStatus(2);
                        R r2 = userService.addNotice(sysUserNoticeVO);
                        if (R.isOk(r2)) {
                            log.info("新增微心愿已分配负责人通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
                        }
                    } else if (type.intValue() == 4) {
                        sysUserNoticeVO.setTitle("微心愿发起了活动");
                        sysUserNoticeVO.setBusinessContent("请关注活动页面及时参加，并邀请你的朋友一起支持我们的活动");
                        sysUserNoticeVO.setBusinessStatus(2);
                        R r2 = userService.addNotice(sysUserNoticeVO);
                        if (R.isOk(r2)) {
                            log.info("新增微心愿发起了活动通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
                        }
                    }
                }
            }
        }
        return r;
    }

    @ApiOperation(value = "微心愿人员下拉搜索")
    @GetMapping("listmanagers")
    @ApiImplicitParam(name = "param", value = "搜索参数【不传返回所有后台人员】", required = false)
    public R listManagers(String param) {
        Long communityId = this.getCommunityId();
        if (ObjectUtils.isEmpty(param)) {
            param = "";
        }
        return userService.listActivityManager(param, communityId);
    }

    @ApiOperation(value = "审核、反馈随手拍")
    @PutMapping("puteasyphoto")
    public R putEasypHotoStatus(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
        Long userId = this.getUserId();
        Integer type = comActEasyPhotoVO.getType();
        if (null == type || type > 3 || type < 1) {
            return R.fail("操作类型错误");
        }
        Long id = comActEasyPhotoVO.getId();
        if (ObjectUtils.isEmpty(id)) {
            return R.fail("随手拍主键不能为空");
        }
        comActEasyPhotoVO.setUserId(userId);
        R r = communityService.putEasypHotoStatus(comActEasyPhotoVO);
        if (R.isOk(r)) {
            R r1 = communityService.detailEasyPhoto(id, userId);
            if (R.isOk(r1)) {
                ComActEasyPhotoVO comActEasyPhotoVO1 = JSONObject.parseObject(JSONObject.toJSONString(r1.getData()), ComActEasyPhotoVO.class);
                SysUserNoticeVO sysUserNoticeVO = new SysUserNoticeVO();
                sysUserNoticeVO.setUserId(comActEasyPhotoVO1.getSponsorId());
                sysUserNoticeVO.setType(2);
                sysUserNoticeVO.setBusinessType(4);
                sysUserNoticeVO.setBusinessTitle(comActEasyPhotoVO1.getDetail());
                sysUserNoticeVO.setBusinessTime(comActEasyPhotoVO1.getExamineAt());
                sysUserNoticeVO.setBusinessId(id);
                sysUserNoticeVO.setStatus(0);
                if (type.intValue() == 2) {
                    sysUserNoticeVO.setTitle("随手拍未通过审核");
                    sysUserNoticeVO.setBusinessContent(String.format("驳回原因：%s", comActEasyPhotoVO.getRejectReason()));
                    sysUserNoticeVO.setBusinessStatus(1);
                    R r2 = userService.addNotice(sysUserNoticeVO);
                    if (R.isOk(r2)) {
                        log.info("新增随手拍未通过审核通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
                    }
                } else if (type.intValue() == 3) {
                    sysUserNoticeVO.setTitle("随手拍有反馈");
                    sysUserNoticeVO.setBusinessContent("社区已经处理好了具体的事宜，将变成现在更好卡的样子找到更好的自己……");
                    sysUserNoticeVO.setBusinessStatus(2);
                    R r2 = userService.addNotice(sysUserNoticeVO);
                    if (R.isOk(r2)) {
                        log.info("新增随手拍有反馈通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
                    }
                }
            }
        }
        return r;
    }


}

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

@@ -5,6 +5,7 @@
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.validated.AddGroup;
@@ -17,6 +18,7 @@
import org.springframework.web.bind.annotation.*;

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

/**
@@ -52,7 +54,26 @@
        if (null==userId||0==userId) {
            return R.fail("用户主键不能为空");
        }
        return userService.putUserFace(loginUserInfoVO);
        R r = userService.putUserFace(loginUserInfoVO);
        if (R.isOk(r)) {
            //1通过 2驳回 3删除
            if (operationType.intValue()==2) {
                SysUserNoticeVO sysUserNoticeVO = new SysUserNoticeVO();
                sysUserNoticeVO.setUserId(userId);
                sysUserNoticeVO.setType(3);
                sysUserNoticeVO.setBusinessType(7);
                sysUserNoticeVO.setBusinessTime(new Date());
                sysUserNoticeVO.setStatus(0);
                sysUserNoticeVO.setTitle("人脸采集未通过");
                sysUserNoticeVO.setBusinessContent(String.format("驳回原因：%s", loginUserInfoVO.getRejectReson()));
                sysUserNoticeVO.setBusinessStatus(1);
                R r2 = userService.addNotice(sysUserNoticeVO);
                if (R.isOk(r2)) {
                    log.info("新增人脸采集未通过通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
                }
            }
        }
        return r;
    }

    @ApiOperation(value = "分页查询人口管理",response = LoginUserInfoVO.class)
@@ -282,7 +303,38 @@
        if (null==id||0==id) {
            return R.fail("审核主键不能为空");
        }
        return communityService.putVolunteerExamine(comMngVolunteerMngVO);
        R r = communityService.putVolunteerExamine(comMngVolunteerMngVO);
        if (R.isOk(r)) {
            R r1 = communityService.detailVolunteerExamine(id);
            Object data = r1.getData();
            ComMngVolunteerMngVO comMngVolunteerMngVO1=JSONObject.parseObject(JSONObject.toJSONString(data),ComMngVolunteerMngVO.class);
            int state = comMngVolunteerMngVO.getState().intValue();
            SysUserNoticeVO sysUserNoticeVO = new SysUserNoticeVO();
            Date date = new Date();
            sysUserNoticeVO.setUserId(comMngVolunteerMngVO1.getUserId());
            sysUserNoticeVO.setType(3);
            sysUserNoticeVO.setBusinessType(5);
            sysUserNoticeVO.setBusinessTime(date);
            sysUserNoticeVO.setStatus(0);
            if (state==2) {//通过
                sysUserNoticeVO.setTitle("志愿者申请通过审核");
                sysUserNoticeVO.setBusinessContent("恭喜你！你已经是一名志愿者了，感谢你对社区的贡献，我们共同创造和谐家园");
                sysUserNoticeVO.setBusinessStatus(2);
                R r2 = userService.addNotice(sysUserNoticeVO);
                if (R.isOk(r2)) {
                    log.info("新增志愿者申请通过审核通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
                }
            }else if(state==3){ //驳回
                sysUserNoticeVO.setTitle("志愿者申请未通过");
                sysUserNoticeVO.setBusinessContent(String.format("驳回原因：%s",comMngVolunteerMngVO1.getRejectReson()));
                sysUserNoticeVO.setBusinessStatus(1);
                R r2 = userService.addNotice(sysUserNoticeVO);
                if (R.isOk(r2)) {
                    log.info("新增志愿者申请未通过通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
                }
            }
        }
        return r;
    }

    @ApiOperation(value = "删除志愿者审核")

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

@@ -1,13 +1,16 @@
package com.panzhihua.community_backstage.api;

import com.alibaba.excel.EasyExcel;
import com.alibaba.fastjson.JSONObject;
import com.jcraft.jsch.SftpException;
import com.panzhihua.common.constants.FtpConstants;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.interfaces.OperLog;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.partybuilding.*;
import com.panzhihua.common.model.vos.user.RoleVO;
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
import com.panzhihua.common.service.partybuilding.PartyBuildingService;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.SFTPUtil;
@@ -63,7 +66,7 @@
        Long communityId = this.getCommunityId();
        return partyBuildingService.listPartyOrganization(communityId);
    }

    @OperLog(operModul = "党员管理",operType = 1)
    @ApiOperation(value = "新增党员")
    @PostMapping("addpartybuildingmember")
    public R addPartyBuildingMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO) {
@@ -72,6 +75,7 @@
        return partyBuildingService.addPartyBuildingMember(partyBuildingMemberVO);
    }

    @OperLog(operModul = "党员管理",operType = 2)
    @ApiOperation(value = "编辑党员")
    @PutMapping("updatepartybuildingmember")
    public R updatePartyBuildingMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO) {
@@ -212,8 +216,30 @@
        if (emptycancelReason||emptyid) {
            return R.fail("参数不全");
        }
//        R r = partyBuildingService.deleteActivity(id);
        return partyBuildingService.cancelActivity(partyBuildingActivityVO);
        R r = partyBuildingService.cancelActivity(partyBuildingActivityVO);
        if (R.isOk(r)) {
            R r1=partyBuildingService.selectAllPartyBuildingActivityMembers(id);
            if (R.isOk(r1)) {
                List<Long> userIds=(List<Long>)r1.getData();
                userIds.forEach(aLong -> {
                    SysUserNoticeVO sysUserNoticeVO=new SysUserNoticeVO();
                    sysUserNoticeVO.setUserId(aLong);
                    sysUserNoticeVO.setType(1);
                    sysUserNoticeVO.setTitle("活动因故取消");
                    sysUserNoticeVO.setBusinessType(2);
                    sysUserNoticeVO.setBusinessTitle(partyBuildingActivityVO.getName());
                    sysUserNoticeVO.setBusinessContent(String.format("取消原因%s",partyBuildingActivityVO.getCancelReason()));
                    sysUserNoticeVO.setBusinessId(id);
                    sysUserNoticeVO.setStatus(0);
                    sysUserNoticeVO.setBusinessStatus(1);
                    R r2 = userService.addNotice(sysUserNoticeVO);
                    if (R.isOk(r2)) {
                        log.info("新增取消党建活动通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
                    }
                });
            }
        }
        return r;
    }

    @ApiOperation(value = "分页查询党员活动",response = PageActivityMembersVO.class)
@@ -238,6 +264,7 @@
        return userService.listIdentity(communityId);
    }

    @OperLog(operModul = "党委管理",operType = 1)
    @ApiOperation(value = "新增党委")
    @PostMapping("addpartycommittee")
    public R addPartyCommittee(@RequestBody PartyCommitteeVO partyCommitteeVO) {
@@ -246,6 +273,7 @@
        return partyBuildingService.addPartyCommittee(partyCommitteeVO);
    }

    @OperLog(operModul = "党委管理",operType = 2)
    @ApiOperation(value = "编辑党委")
    @PutMapping("updatepartycommittee")
    public R updatePartyCommittee(@RequestBody PartyCommitteeVO partyCommitteeVO) {
@@ -254,6 +282,7 @@
        return partyBuildingService.updatePartyCommittee(partyCommitteeVO);
    }

    @OperLog(operModul = "党委管理",operType = 3)
    @ApiOperation(value = "删除党委")
    @DeleteMapping("deletepartycommittee")
    public R deletePartyCommittee(@RequestBody PartyCommitteeVO partyCommitteeVO) {
@@ -319,13 +348,13 @@




    @OperLog(operModul = "党员管理",operType = 3)
    @ApiOperation(value = "删除党员")
    @DeleteMapping("deletepartybuildingmember")
    public R deleteDynUser(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO){
        Long id = partyBuildingMemberVO.getId();
        if (null==id||0==id) {
            return R.fail("党员主键不能为空");//todo 加限制只能删除自己小区的党员 或者日志记录
            return R.fail("党员主键不能为空");
        }
        return partyBuildingService.deleteDynUser(id);
    }

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

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

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.controller.BaseController;
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.TodoEventsVO;
import com.panzhihua.common.model.vos.partybuilding.PartyOrganizationVO;
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 lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

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

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 首页接口
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2021-01-06 09:37
 **/
@Slf4j
@Api(tags = {"首页接口"})
@RestController
@RequestMapping("/index/")
public class IndexApi extends BaseController {
    @Resource
    private UserService userService;
    @Resource
    private CommunityService communityService;

    @ApiOperation(value = "数据看板",response = IndexDataVO.class)
    @GetMapping("data")
    public R indexDataCommunityBackstage() {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        Long communityId = loginUserInfo.getCommunityId();
        Long userId = loginUserInfo.getUserId();
        R r=userService.indexDataCommunityBackstage(communityId);
        if (R.isOk(r)) {
            Object data = r.getData();
            IndexDataVO indexDataVO= JSONObject.parseObject(JSONObject.toJSONString(data),IndexDataVO.class);
            R r1=communityService.indexDataCommunityBackstage(communityId,userId);
            if (R.isOk(r1)) {
                Object data1 = r1.getData();
                List<TodoEventsVO> todoEventsVOS= JSONArray.parseArray(JSONArray.toJSONString(data1),TodoEventsVO.class);
                indexDataVO.setTodoEventsVOList(todoEventsVOS);
                r.setData(indexDataVO);
            }
        }
        return r;
    }
}

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

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

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 org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 调试接口
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2021-01-07 15:47
 **/
@RestController
@Api(tags = {"调试接口"})
@RequestMapping("/test/")
public class TestApi {

    @Resource
    private CommunityService communityService;

    @ApiOperation(value = "定时任务刷新社区动态置顶状态")
    @GetMapping("timedtaskdynistopping")
    public R timedTaskDynIstopping() {
        R r=communityService.timedTaskDynIstopping();
        return r;
    }
}

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

@@ -6,6 +6,7 @@
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.user.ChangePasswordVO;
import com.panzhihua.common.model.vos.user.SysMenuVO;
import com.panzhihua.common.service.user.UserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -47,4 +48,11 @@
        return userService.changePassword(changePasswordVO);
    }

    @ApiOperation(value = "用户菜单获取",response = SysMenuVO.class)
    @GetMapping("listmenu")
    public R listmenu(){
        Long userId = this.getUserId();
        return userService.listmenu(userId);
    }

}

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

@@ -940,7 +940,48 @@
        return comActService.listCommunityAll();
    }

    /**
     * 社区管理后台数据看板 代办事件
     * @param communityId 社区id
     * @param userId 登录用户信息
     * @return 代办事件列表
     */
    @PostMapping("indexdatacommunitybackstage")
    public R indexDataCommunityBackstage(@RequestParam("communityId") Long communityId, @RequestParam("userId")Long userId){
        List<TodoEventsVO> todoEventsVOS=new ArrayList<>();
        List<TodoEventsVO> todoEventsVOS1=comActEasyPhotoService.selectNeedToDo(communityId,userId);
        List<TodoEventsVO> todoEventsVOS2=comActMicroWishService.selectNeedToDo(communityId,userId);
        List<TodoEventsVO> todoEventsVOS3=comMngVolunteerMngService.selectNeedToDo(communityId,userId);
        if (!ObjectUtils.isEmpty(todoEventsVOS1)) {
            todoEventsVOS.addAll(todoEventsVOS1);
        }
        if (!ObjectUtils.isEmpty(todoEventsVOS2)) {
            todoEventsVOS.addAll(todoEventsVOS2);
        }
        if (!ObjectUtils.isEmpty(todoEventsVOS3)) {
            todoEventsVOS.addAll(todoEventsVOS3);
        }
        return R.ok(todoEventsVOS);
    }

    /**
     * 删除社区
     * @param communityId 社区id
     * @return 删除结果
     */
    @PostMapping("delectcommunity")
    public R delectCommunity(@RequestParam("communityId") Long communityId){
        return comActService.delectCommunity(communityId);
    }

    /**
     * 定时任务刷新社区动态置顶状态
     * @return 刷新结果
     */
    @PostMapping("timedtaskdynistopping")
    public R timedTaskDynIstopping(){
        return comActDynService.timedTaskDynIstopping();
    }




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

@@ -19,12 +19,13 @@
//    居民 党员 志愿者 1 2 3
    @Select("<script> " +
            "SELECT\n" +
            "a.id,\n" +
            "u.user_id id,\n" +
            "u.image_url,\n" +
            "u.name,\n" +
            "case WHEN u.is_partymember = 1 THEN '党员' WHEN a.is_volunteer = 1 THEN '志愿者' ELSE '居民' END identity,\n" +
            "u.phone,\n" +
            "a.create_at \n" +
            "a.create_at, \n" +
            "a.is_volunteer \n" +
            "FROM\n" +
            "com_act_act_sign a\n" +
            "JOIN sys_user u ON a.user_id = u.user_id \n" +

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

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.service_community.model.dos.ComActDynUserDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Update;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -12,4 +13,6 @@
 **/
@Mapper
public interface ComActDynUserDAO extends BaseMapper<ComActDynUserDO> {
    @Update("update com_act_dyn set is_topping=(if(DATEDIFF(SYSDATE(),publish_at)>5,0,1)) WHERE is_topping=1")
    int timedTaskDynIstopping();
}

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

@@ -4,10 +4,13 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
import com.panzhihua.common.model.vos.community.TodoEventsVO;
import com.panzhihua.service_community.model.dos.ComActEasyPhotoDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

import java.util.List;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -45,7 +48,7 @@
            "<if test='comActEasyPhotoVO.handlerName != null and comActEasyPhotoVO.handlerName.trim() != &quot;&quot;'>" +
            "AND su.`name` = #{comActEasyPhotoVO.handlerName} \n" +
            " </if> " +
            "<where>"+
            "where p.status !=2"+
            "<if test='comActEasyPhotoVO.communityId != null and comActEasyPhotoVO.communityId != 0'>" +
            "  and p.community_id=#{comActEasyPhotoVO.communityId} " +
            " </if> " +
@@ -62,17 +65,69 @@
            "<if test='comActEasyPhotoVO.sponsorId != null and comActEasyPhotoVO.sponsorId != 0'>" +
            "AND p.sponsor_id =#{comActEasyPhotoVO.sponsorId} \n" +
            " </if> " +
            "</where>"+
            "group by p.id "+

            "union all "+

            "SELECT\n" +
            "p.id,\n" +
            "u.`name` sponsor_name,\n" +
            "u.phone sponsor_phone,\n" +
            "count(pu.id)giveThumbsUpNum,\n" +
            "u.image_url,\n" +
            "p.happen_addr,\n" +
            "su.`name` handler_name,\n" +
            "p.`status`,\n" +
            "p.`detail`,\n" +
            "p.`photo_path_list`,\n" +
            "p.create_at,\n" +
            "p.examine_at \n" +
            "FROM\n" +
            "com_act_easy_photo p\n" +
            "JOIN sys_user u ON p.sponsor_id = u.user_id \n" +
            "<if test='comActEasyPhotoVO.userId != null and comActEasyPhotoVO.userId != 0'>" +
            "AND u.`user_id` = #{comActEasyPhotoVO.userId} \n" +
            " </if> " +
            "left join  com_act_easy_photo_user pu ON p.id = pu.easy_photo_id \n" +
            "<if test='comActEasyPhotoVO.sponsorName != null and comActEasyPhotoVO.sponsorName.trim() != &quot;&quot;'>" +
            "AND u.`name` = #{comActEasyPhotoVO.sponsorName} \n" +
            " </if> " +
            "left JOIN sys_user su ON p.handler_id = su.user_id \n" +
            "<if test='comActEasyPhotoVO.handlerName != null and comActEasyPhotoVO.handlerName.trim() != &quot;&quot;'>" +
            "AND su.`name` = #{comActEasyPhotoVO.handlerName} \n" +
            " </if> " +
            "where  p.status=2 and p.is_need_feed_back=1 " +
            "<if test='comActEasyPhotoVO.backUserId != null and comActEasyPhotoVO.backUserId != 0'>" +
            "and p.handler_id=#{comActEasyPhotoVO.backUserId}"+
            " </if> " +
            "<if test='comActEasyPhotoVO.communityId != null and comActEasyPhotoVO.communityId != 0'>" +
            "  and p.community_id=#{comActEasyPhotoVO.communityId} " +
            " </if> " +
            "<if test='comActEasyPhotoVO.happenAddr != null and comActEasyPhotoVO.happenAddr.trim() != &quot;&quot;'>" +
            "AND p.happen_addr = #{comActEasyPhotoVO.happenAddr} \n" +
            " </if> " +
            "<if test='comActEasyPhotoVO.status != null and comActEasyPhotoVO.status!=0' >" +
            "AND p.`status` = #{comActEasyPhotoVO.status} \n" +
            " </if> " +
            "<if test='comActEasyPhotoVO.createBegin != null  '>" +
            "AND p.create_at BETWEEN #{comActEasyPhotoVO.createBegin} \n" +
            "AND #{comActEasyPhotoVO.createEnd}" +
            " </if> " +
            "<if test='comActEasyPhotoVO.sponsorId != null and comActEasyPhotoVO.sponsorId != 0'>" +
            "AND p.sponsor_id =#{comActEasyPhotoVO.sponsorId} \n" +
            " </if> " +
            " group by p.id "+
            "</script>")
    IPage<ComActEasyPhotoVO> pageEasyPhoto(Page page, @Param("comActEasyPhotoVO") ComActEasyPhotoVO comActEasyPhotoVO);
    @Select("SELECT \n" +
            "p.id,\n" +
            "p.sponsor_id,\n" +
            "p.create_at,\n" +
            "u.`name` sponsorName,\n" +
            "u.`image_url`,\n" +
            "u.phone,\n" +
            "p.detail,\n" +
            "p.examine_at,\n" +
            "p.status,\n" +
            "p.is_hide,\n" +
            "p.happen_addr,\n" +
@@ -88,4 +143,30 @@
            "LEFT JOIN com_act_easy_photo_user pu on p.id=pu.easy_photo_id\n" +
            "WHERE p.id=#{id}")
    ComActEasyPhotoVO detailEasyPhoto(Long id);
    @Select("SELECT\n" +
            "'随手拍' FUNCTION,\n" +
            "'待审核' behavior,\n" +
            "'新增随手拍动态待审核' words \n" +
            "FROM\n" +
            "com_act_easy_photo p \n" +
            "WHERE\n" +
            "p.community_id = #{communityId} \n" +
            "AND p.STATUS = 1 \n" +
            "GROUP BY\n" +
            "p.community_id\n" +
            "\n" +
            "union all \n" +
            "\n" +
            "SELECT\n" +
            "'随手拍' FUNCTION,\n" +
            "'需要进行反馈' behavior,\n" +
            "'随手拍有待反馈动态' words \n" +
            "FROM\n" +
            "com_act_easy_photo p \n" +
            "WHERE\n" +
            "p.community_id = #{communityId} \n" +
            "AND p.`status` = 2 and p.is_need_feed_back=1 and p.handler_id=#{userId}\n" +
            "GROUP BY\n" +
            "p.community_id")
    List<TodoEventsVO> selectNeedToDo(@Param("communityId") Long communityId, @Param("userId") Long userId);
}

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

@@ -4,10 +4,13 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.community.ComActMicroWishVO;
import com.panzhihua.common.model.vos.community.TodoEventsVO;
import com.panzhihua.service_community.model.dos.ComActMicroWishDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

import java.util.List;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -19,6 +22,7 @@
public interface ComActMicroWishDAO extends BaseMapper<ComActMicroWishDO> {

    @Select("<script> " +
            "select * from ( "+
            "SELECT\n" +
            "w.id,\n" +
            "u.name sponsor_name,\n" +
@@ -44,7 +48,7 @@
            "<if test='comActMicroWishVO.responsibleName != null and comActMicroWishVO.responsibleName.trim() != &quot;&quot;'>" +
            "AND su.`name` = #{comActMicroWishVO.responsibleName} \n" +
            " </if> " +
            "<where>" +
            "where w.status!=3 " +
            "<if test='comActMicroWishVO.communityId != null and comActMicroWishVO.communityId != 0'>" +
            " and w.community_id=#{comActMicroWishVO.communityId} \n" +
            " </if> " +
@@ -64,9 +68,61 @@
            "<if test='comActMicroWishVO.userId != null and comActMicroWishVO.userId != 0'>" +
            "AND w.sponsor_id  =#{comActMicroWishVO.userId} \n" +
            " </if> " +
            "</where>"+
            " group by w.id  \n"+
            "ORDER BY w.`status`, w.create_at "+


            "union all "+

            "SELECT\n" +
            "w.id,\n" +
            "u.name sponsor_name,\n" +
            "u.image_url ,\n" +
            "w.sponsor_phone,\n" +
            "w.wish_name,\n" +
            "w.`status`,\n" +
            "w.`photo_path_list`,\n" +
            "count(wu.id)star_num,\n" +
            "w.`detail`,\n" +
            "w.form,\n" +
            "su.`name` responsible_name,\n" +
            "w.score,\n" +
            "w.create_at \n" +
            "FROM\n" +
            "com_act_micro_wish w\n" +
            "left join com_act_micro_wish_user wu on w.id=wu.micro_wish_id "+
            "JOIN sys_user u ON w.sponsor_id = u.user_id \n" +
            "<if test='comActMicroWishVO.sponsorName != null and comActMicroWishVO.sponsorName.trim() != &quot;&quot;'>" +
            "AND u.name = #{comActMicroWishVO.sponsorName} \n" +
            " </if> " +
            "LEFT JOIN sys_user su ON w.responsible_id = su.user_id \n" +
            "<if test='comActMicroWishVO.responsibleName != null and comActMicroWishVO.responsibleName.trim() != &quot;&quot;'>" +
            "AND su.`name` = #{comActMicroWishVO.responsibleName} \n" +
            " </if> " +
            "where w.status=3 and w.form=1 \n" +
            "<if test='comActMicroWishVO.backUserId != null and comActMicroWishVO.backUserId != 0'>" +
            "and w.responsible_id=#{comActMicroWishVO.backUserId} \n"+
            " </if> " +
            "<if test='comActMicroWishVO.communityId != null and comActMicroWishVO.communityId != 0'>" +
            " and w.community_id=#{comActMicroWishVO.communityId} \n" +
            " </if> " +
            "<if test='comActMicroWishVO.sponsorPhone != null and comActMicroWishVO.sponsorPhone.trim() != &quot;&quot;'>" +
            "AND w.sponsor_phone = #{comActMicroWishVO.sponsorPhone} \n" +
            " </if> " +
            "<if test='comActMicroWishVO.status != null and comActMicroWishVO.status!=0 '>" +
            "AND w.`status` = #{comActMicroWishVO.status} \n" +
            " </if> " +
            "<if test='comActMicroWishVO.createBegin != null '>" +
            "AND w.create_at BETWEEN #{comActMicroWishVO.createBegin} \n" +
            "AND #{comActMicroWishVO.createEnd}" +
            " </if> " +
            "<if test='comActMicroWishVO.isApplets != null and comActMicroWishVO.isApplets != 0'>" +
            "AND w.status  in (3,6) \n" +
            " </if> " +
            "<if test='comActMicroWishVO.userId != null and comActMicroWishVO.userId != 0'>" +
            "AND w.sponsor_id  =#{comActMicroWishVO.userId} \n" +
            " </if> " +
            " group by w.id  )t\n"+
            "ORDER BY t.`status`, t.create_at "+
            "</script>")
    IPage<ComActMicroWishVO> pageMicroWish(Page page, @Param("comActMicroWishVO") ComActMicroWishVO comActMicroWishVO);
    @Select("SELECT\n" +
@@ -99,4 +155,30 @@
            " group by w.id "
    )
    ComActMicroWishVO detailMicroWish(Long id);
    @Select("SELECT\n" +
            "'微心愿' FUNCTION,\n" +
            "'待审核' behavior,\n" +
            "'新增微心愿动态待审核' words \n" +
            "FROM\n" +
            "com_act_micro_wish w \n" +
            "WHERE\n" +
            "w.community_id = #{communityId} \n" +
            "AND w.`status` = 1\n" +
            "\n" +
            "union all \n" +
            "\n" +
            "SELECT\n" +
            "\t'微心愿' FUNCTION,\n" +
            "\t'需要进行反馈' behavior,\n" +
            "\t'微心愿有待反馈动态' words \n" +
            "FROM\n" +
            "\tcom_act_micro_wish w \n" +
            "WHERE\n" +
            "\tw.community_id = #{communityId} \n" +
            "\tAND w.`status` = 3 \n" +
            "\tAND w.form = 1 \n" +
            "\tAND w.responsible_id = #{userId} \n" +
            "GROUP BY\n" +
            "\tw.community_id\n")
    List<TodoEventsVO> selectNeedToDo(@Param("communityId") Long communityId, @Param("userId") Long userId);
}

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

@@ -4,10 +4,13 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO;
import com.panzhihua.common.model.vos.community.TodoEventsVO;
import com.panzhihua.service_community.model.dos.ComMngVolunteerMngDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

import java.util.List;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -71,4 +74,29 @@
            "ORDER BY state asc " +
            "</script>")
    IPage<ComMngVolunteerMngVO> pageVolunteerExamine(Page page, @Param("comMngVolunteerMngVO") ComMngVolunteerMngVO comMngVolunteerMngVO);
    @Select("SELECT\n" +
            "'人脸采集' FUNCTION,\n" +
            "'待审核' behavior,\n" +
            "'新增人脸采集信息待审核' words \n" +
            "FROM\n" +
            "sys_user u \n" +
            "WHERE\n" +
            "u.face_state = 0 \n" +
            "AND u.community_id = #{communityId} \n" +
            "GROUP BY\n" +
            "u.community_id UNION ALL\n" +
            "SELECT\n" +
            "'志愿者审核' FUNCTION,\n" +
            "'待审核' behavior,\n" +
            "'新增志愿者申请待审核' words \n" +
            "FROM\n" +
            "com_mng_volunteer_mng v \n" +
            "WHERE\n" +
            "v.state = 1 \n" +
            "AND v.`community_id` = #{communityId} \n" +
            "GROUP BY\n" +
            "v.community_id")
    List<TodoEventsVO> selectNeedToDo(Long communityId);
    @Select("select user_id from sys_user where type=1 and phone=#{phone}")
    Long selectUserIdByPhone(String phone);
}

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

@@ -32,5 +32,9 @@
     * @return 新增结果
     */
    R addDynamicUser(Long id, Long userId);

    /**
     * 定时任务刷新社区动态置顶状态
     * @return 刷新结果
     */
    R timedTaskDynIstopping();
}

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

@@ -3,7 +3,10 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
import com.panzhihua.common.model.vos.community.TodoEventsVO;
import com.panzhihua.service_community.model.dos.ComActEasyPhotoDO;

import java.util.List;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -43,4 +46,12 @@
     * @return 操作结果
     */
    R putEasypHotoStatus(ComActEasyPhotoVO comActEasyPhotoVO);

    /**
     * 随手拍是否有待审核和带反馈的事件
     * @param communityId 社区id
     * @param userId 登录用户id
     * @return 待处理事件集合
     */
    List<TodoEventsVO> selectNeedToDo(Long communityId, Long userId);
}

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

@@ -3,7 +3,10 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActMicroWishVO;
import com.panzhihua.common.model.vos.community.TodoEventsVO;
import com.panzhihua.service_community.model.dos.ComActMicroWishDO;

import java.util.List;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -44,4 +47,11 @@
     */
    R putMicroWishConfirm(ComActMicroWishVO comActMicroWishVO);

    /**
     * 社区首页代办事件集合
     * @param communityId 社区id
     * @param userId 登录用户
     * @return 代办事件集合
     */
    List<TodoEventsVO> selectNeedToDo(Long communityId, Long userId);
}

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

@@ -47,5 +47,10 @@
     * @return 社区集合 按照创建顺序倒序排列
     */
    R listCommunityAll();

    /**
     * 删除社区
     * @param communityId 社区id
     * @return 删除结果
     */
    R delectCommunity(Long communityId);
}

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

@@ -2,7 +2,10 @@

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.user.UserPhoneVO;

import java.util.List;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -71,4 +74,12 @@
     * @return 志愿者
     */
    R detailVolunteer(Long id);

    /**
     * 社区后台数据看板
     * @param communityId 社区id
     * @param userId 用户id
     * @return 人脸采集和志愿者审核集合
     */
    List<TodoEventsVO> selectNeedToDo(Long communityId, Long userId);
}

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

@@ -14,6 +14,7 @@
import com.panzhihua.service_community.model.dos.ComActDynDO;
import com.panzhihua.service_community.model.dos.ComActDynUserDO;
import com.panzhihua.service_community.service.ComActDynService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
@@ -27,6 +28,7 @@
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-12-07 14:29
 **/
@Slf4j
@Service
public class ComActDynServiceImpl extends ServiceImpl<ComActDynDAO, ComActDynDO> implements ComActDynService {
    @Resource
@@ -106,4 +108,18 @@
        }

    }

    /**
     * 定时任务刷新社区动态置顶状态
     *
     * @return 刷新结果
     */
    @Override
    public R timedTaskDynIstopping() {
        int num=comActDynUserDAO.timedTaskDynIstopping();
        if (num>0) {
            log.info("一共维护社区动态数量【{}】",num);
        }
        return R.ok();
    }
}

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

@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
import com.panzhihua.common.model.vos.community.TodoEventsVO;
import com.panzhihua.service_community.dao.ComActEasyPhotoDAO;
import com.panzhihua.service_community.dao.ComActEasyPhotoUserDAO;
import com.panzhihua.service_community.model.dos.ComActEasyPhotoDO;
@@ -155,7 +156,8 @@
//        操作类型 1审核通过 2驳回  3反馈
        ComActEasyPhotoDO cmActEasyPhotoDO=new ComActEasyPhotoDO();
        cmActEasyPhotoDO.setId(comActEasyPhotoVO.getId());

        cmActEasyPhotoDO.setHandlerId(comActEasyPhotoVO.getUserId());
        Date date = new Date();
        switch (type){
            case 1:
                int isNeedFeedBack = comActEasyPhotoVO.getIsNeedFeedBack().intValue();
@@ -164,18 +166,18 @@
                }else{
                    cmActEasyPhotoDO.setStatus(4);//已完成
                }
                cmActEasyPhotoDO.setExamineAt(new Date());
                cmActEasyPhotoDO.setExamineAt(date);
                break;
            case 2:
                cmActEasyPhotoDO.setStatus(3);//已驳回
                cmActEasyPhotoDO.setExamineAt(new Date());
                cmActEasyPhotoDO.setExamineAt(date);
                cmActEasyPhotoDO.setRejectReason(comActEasyPhotoVO.getRejectReason());
                break;
            case 3:
                cmActEasyPhotoDO.setHandleResult(comActEasyPhotoVO.getHandleResult());
                cmActEasyPhotoDO.setHandlePhotoList(comActEasyPhotoVO.getHandlePhotoList());
                cmActEasyPhotoDO.setStatus(4);//已完成
                cmActEasyPhotoDO.setFeedbackAt(new Date());
                cmActEasyPhotoDO.setFeedbackAt(date);
                break;
            default:break;
        }
@@ -185,4 +187,17 @@
        }
        return R.fail();
    }

    /**
     * 随手拍是否有待审核和带反馈的事件
     *
     * @param communityId 社区id
     * @param userId      登录用户id
     * @return 待处理事件集合
     */
    @Override
    public List<TodoEventsVO> selectNeedToDo(Long communityId, Long userId) {
        List<TodoEventsVO> todoEventsVOS=comActEasyPhotoDAO.selectNeedToDo(communityId,userId);
        return todoEventsVOS;
    }
}

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

@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActMicroWishVO;
import com.panzhihua.common.model.vos.community.TodoEventsVO;
import com.panzhihua.service_community.dao.ComActMicroWishDAO;
import com.panzhihua.service_community.dao.ComActMicroWishUserDAO;
import com.panzhihua.service_community.model.dos.ComActMicroWishDO;
@@ -103,10 +104,7 @@
    @Override
    public R putlMicroWish(ComActMicroWishVO comActMicroWishVO) {
        Long id = comActMicroWishVO.getId();
        Integer type = comActMicroWishVO.getType();
        if (ObjectUtils.isEmpty(type)||type>5||type<1) {
            return R.fail("操作类型不对");
        }
        int type = comActMicroWishVO.getType().intValue();
        String rejectReason = comActMicroWishVO.getRejectReason();
        Long responsibleId = comActMicroWishVO.getResponsibleId();
        String feedback = comActMicroWishVO.getFeedback();
@@ -132,10 +130,9 @@
                break;
            case 4:
                comActMicroWishDO.setDistributionAt(new Date());
                comActMicroWishDO.setResponsibleId(responsibleId);
                comActMicroWishDO.setStatus(3);//进行中
                comActMicroWishDO.setResponsibleId(null);
                comActMicroWishDO.setStatus(5);//待确认
                comActMicroWishDO.setForm(2);
//                todo 给负责人增加一个待办事件
                break;
            case 5:
                comActMicroWishDO.setFeedbackAt(new Date());
@@ -218,7 +215,18 @@
        return R.fail();
    }


    /**
     * 社区首页代办事件集合
     *
     * @param communityId 社区id
     * @param userId      登录用户
     * @return 代办事件集合
     */
    @Override
    public List<TodoEventsVO> selectNeedToDo(Long communityId, Long userId) {
        List<TodoEventsVO> todoEventsVOS=comActMicroWishDAO.selectNeedToDo(communityId,userId);
        return todoEventsVOS;
    }


}

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

@@ -12,6 +12,7 @@
import com.panzhihua.service_community.model.dos.ComActDO;
import com.panzhihua.service_community.service.ComActService;
import org.springframework.beans.BeanUtils;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;

@@ -37,11 +38,20 @@
     */
    @Override
    public R addCommunity(ComActVO comActVO) {
        String password = comActVO.getPassword();
        String encode = new BCryptPasswordEncoder().encode(password);
        comActVO.setPassword(encode);
        ComActDO comActDO=new ComActDO();
        Integer integer = comActDAO.selectCount(new QueryWrapper<ComActDO>().lambda().eq(ComActDO::getName, comActVO.getName()));
        if (integer>0) {
            return R.fail("社区已经存在");
        }
        BeanUtils.copyProperties(comActVO,comActDO);
        int insert = comActDAO.insert(comActDO);
        if (insert>0) {
            return R.ok();
            ComActDO comActDO1 = comActDAO.selectOne(new QueryWrapper<ComActDO>().lambda().eq(ComActDO::getName, comActVO.getName()));
            BeanUtils.copyProperties(comActDO1,comActVO);
            return R.ok(comActVO);
        }
        return R.fail();
    }
@@ -135,7 +145,20 @@
        return R.ok(comActVOS);
    }


    /**
     * 删除社区
     *
     * @param communityId 社区id
     * @return 删除结果
     */
    @Override
    public R delectCommunity(Long communityId) {
        int delete = comActDAO.deleteById(communityId);
        if (delete>0) {
            return R.ok();
        }
        return R.fail();
    }


}

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

@@ -8,6 +8,7 @@
import com.panzhihua.common.model.vos.community.ComMngVolunteerMngAppletsVO;
import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO;
import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO;
import com.panzhihua.common.model.vos.community.TodoEventsVO;
import com.panzhihua.common.model.vos.user.UserPhoneVO;
import com.panzhihua.service_community.dao.ComMngVolunteerMngDAO;
import com.panzhihua.service_community.model.dos.ComMngVolunteerMngDO;
@@ -17,6 +18,7 @@
import org.springframework.util.ObjectUtils;

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

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -142,6 +144,8 @@
        }
        ComMngVolunteerMngVO comMngVolunteerMngVO=new ComMngVolunteerMngVO();
        BeanUtils.copyProperties(comMngVolunteerMngDO,comMngVolunteerMngVO);
        String phone = comMngVolunteerMngVO.getPhone();
        comMngVolunteerMngVO.setUserId(comMngVolunteerMngDAO.selectUserIdByPhone(phone));
        return R.ok(comMngVolunteerMngVO);
    }

@@ -211,5 +215,18 @@
        return R.ok(comMngVolunteerMngAppletsVO);
    }

    /**
     * 社区后台数据看板
     *
     * @param communityId 社区id
     * @param userId      用户id
     * @return 人脸采集和志愿者审核集合
     */
    @Override
    public List<TodoEventsVO> selectNeedToDo(Long communityId, Long userId) {
        List<TodoEventsVO> todoEventsVOS=comMngVolunteerMngDAO.selectNeedToDo(communityId);
        return todoEventsVOS;
    }


}

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java

@@ -346,4 +346,14 @@
        return  comBpActivityService.putActivitySignUp(activitySignUpDTO);
    }

    /**
     * 获取党建活动所有参入人员的id集合
     * @param id 党建活动id
     * @return 人员id集合
     */
    @PostMapping("/partybuildIng/selectallpartybuildingactivitymembers")
    public R selectAllPartyBuildingActivityMembers(@RequestParam("id")Long id){
        return  comBpActivityService.selectAllPartyBuildingActivityMembers(id);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbActivityMemberDAO.java

@@ -10,6 +10,8 @@
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

import java.util.List;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 活动成员
@@ -44,4 +46,13 @@
    @Select("select a.* from com_pb_activity_member a join com_pb_member m on m.id=a.member_id " +
            "join sys_user u on m.id_card=u.id_card and u.user_id=#{userId} where a.activity_id=#{id}")
    ComPbActivityMemberDO selectByUserIdActivityId(@Param("id") Long id, @Param("userId") Long userId);
    @Select("SELECT \n" +
            "u.user_id\n" +
            "FROM\n" +
            "com_pb_activity_member m \n" +
            "join com_pb_member b on m.member_id=b.id\n" +
            "join sys_user u on b.id_card=u.id_card\n" +
            "WHERE\n" +
            "m.activity_id =#{id}")
    List<Long> selectAllPartyBuildingActivityMembers(Long id);
}

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComBpActivityService.java

@@ -86,4 +86,10 @@
     * @return 操作结果
     */
    R putActivitySignUp(ActivitySignUpDTO activitySignUpDTO);
    /**
     * 获取党建活动所有参入人员的id集合
     * @param id 党建活动id
     * @return 人员id集合
     */
    R selectAllPartyBuildingActivityMembers(Long id);
}

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java

@@ -328,4 +328,16 @@
        }
        return R.fail();
    }

    /**
     * 获取党建活动所有参入人员的id集合
     *
     * @param id 党建活动id
     * @return 人员id集合
     */
    @Override
    public R selectAllPartyBuildingActivityMembers(Long id) {
        List<Long> longs=comPbActivityMemberDAO.selectAllPartyBuildingActivityMembers(id);
        return R.ok(longs);
    }
}

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

@@ -248,17 +248,18 @@
    }

    /**
     * 新增运营后台账户
     * 新增运营、社区后台账户
     * @param administratorsUserVO 账户信息
     * @return 新增结果
     */
    @PostMapping("adduserbackstage")
    public R addUserBackstage(@RequestBody AdministratorsUserVO administratorsUserVO){

        return userService.addUserBackstage(administratorsUserVO);
    }

    /**
     * 编辑运营后台账户
     * 编辑运营、社区后台账户
     * @param administratorsUserVO 编辑账户内容
     * @return 编辑结果
     */
@@ -455,4 +456,33 @@
    public R dataKanban(){
        return userService.dataKanban();
    }

    /**
     * 社区管理后台数据看板
     * @param communityId 社区id
     * @return 看板用户数据
     */
    @PostMapping("indexdatacommunitybackstage")
    public R indexDataCommunityBackstage(@RequestParam("communityId")Long communityId){
        return userService.indexDataCommunityBackstage(communityId);
    }

    /**
     * 定时任务维护用户持续登录时间
     * @return 维护结果
     */
    @PostMapping("timedtaskcontinuouslandingdays")
    public R timedTaskContinuousLandingDays(){
        return userService.timedTaskContinuousLandingDays();
    }

    /**
     * 新增用户通知
     * @param sysUserNoticeVO 通知内容
     * @return 新增结果
     */
    @PostMapping("addnotice")
    public R addNotice(@RequestBody SysUserNoticeVO sysUserNoticeVO){
        return userService.addNotice(sysUserNoticeVO);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/RoleDAO.java

@@ -22,4 +22,6 @@
    List<MenuVO> selectAllMenuUrl();
    @Select("select r.role_key from sys_user_role ur join sys_role r on ur.role_id = r.role_id where ur.user_id=#{username}")
    List<String> selectRoles(String username);
    @Select("")
    Long selectMaxRole(Long communityId);
}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java

@@ -7,6 +7,7 @@
import com.panzhihua.common.model.dtos.PageDTO;
import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO;
import com.panzhihua.common.model.vos.IndexDataKanbanVO;
import com.panzhihua.common.model.vos.IndexDataVO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.user.AdministratorsUserVO;
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
@@ -211,4 +212,24 @@
            "u.type =1 and DATE_FORMAT(u.last_login_time,'%m-%d-%Y')=DATE_FORMAT(SYSDATE(),'%m-%d-%Y') and u.continuous_landing_days>=7\n" +
            "GROUP BY u.community_id)t ORDER BY t.num desc limit 10")
    List<DataKanbanDTO> selectCommunityActiveUserOrder();
    @Select("SELECT \n" +
            "COUNT(u.user_id)allUser,\n" +
            "COUNT(case when u.is_volunteer=1 then u.user_id else null end )volunteerUser,\n" +
            "COUNT(case when u.is_partymember=1 then u.user_id else null end )partymemberUser,\n" +
            "COUNT(h.id)house\n" +
            "FROM\n" +
            "sys_user u\n" +
            "JOIN com_act c ON u.community_id = c.community_id \n" +
            "LEFT JOIN com_mng_struct_house_user h on u.user_id=h.user_id\n" +
            "WHERE\n" +
            "u.community_id =#{communityId} and u.type=1")
    IndexDataVO indexDataCommunityBackstage(Long communityId);
    @Update("UPDATE sys_user u \n" +
            "SET u.continuous_landing_days =\n" +
            "IF\n" +
            "(\n" +
            "DATE_FORMAT( u.last_login_time, '%m-%d-%Y' )= DATE_FORMAT( SYSDATE(), '%m-%d-%Y' ),\n" +
            "u.continuous_landing_days + 1,\n" +
            "0)")
    int timedTaskContinuousLandingDays();
}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysMenuDO.java

@@ -1,5 +1,7 @@
package com.panzhihua.service_user.model.dos;

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

@@ -21,6 +23,7 @@
    /**
     * 菜单id
     */
    @TableId(type = IdType.AUTO)
    private Long menuId;

    /**

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserNoticeDO.java

@@ -86,4 +86,8 @@
     * 业务主键 用于跳转
     */
    private Long businessId;
    /**
     * 社区活动类型 1志愿者活动 2居民活动
     */
    private Integer activityType;
}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java

@@ -155,14 +155,14 @@
     */
    R putFamily(ComMngFamilyInfoVO comMngFamilyInfoVO);
    /**
     * 新增运营后台账户
     * 新增运营、社区后台账户
     * @param administratorsUserVO 账户信息
     * @return 新增结果
     */
    R addUserBackstage(AdministratorsUserVO administratorsUserVO);

    /**
     * 编辑运营后台账户
     * 编辑运营、社区后台账户
     * @param administratorsUserVO 编辑账户内容
     * @return 编辑结果
     */
@@ -281,4 +281,21 @@
     * @return 展示数据
     */
    R dataKanban();
    /**
     * 社区管理后台数据看板
     * @param communityId 社区id
     * @return 看板用户数据
     */
    R indexDataCommunityBackstage(Long communityId);
    /**
     * 定时任务维护用户持续登录时间
     * @return 维护结果
     */
    R timedTaskContinuousLandingDays();
    /**
     * 新增用户通知
     * @param sysUserNoticeVO 通知内容
     * @return 新增结果
     */
    R addNotice(SysUserNoticeVO sysUserNoticeVO);
}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -6,15 +6,13 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.constants.UserConstants;
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.dtos.PageDTO;
import com.panzhihua.common.model.dtos.community.NoticeReadDTO;
import com.panzhihua.common.model.dtos.user.PageFeedBackDTO;
import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO;
import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO;
import com.panzhihua.common.model.vos.IndexDataKanbanVO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
import com.panzhihua.common.model.vos.*;
import com.panzhihua.common.model.vos.partybuilding.ActivityManagerVO;
import com.panzhihua.common.model.vos.user.*;
import com.panzhihua.service_user.dao.*;
@@ -64,6 +62,10 @@
    private SysUserFeedbackDAO sysUserFeedbackDAO;
    @Resource
    private SysUserNoticeDAO sysUserNoticeDAO;
    @Resource
    private SysRoleMenuDAO sysRoleMenuDAO;
    @Resource
    private SysMenuDAO sysMenuDAO;


    /**
@@ -79,9 +81,9 @@
        SysUserDO sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getOpenid, openid));
        boolean empty = ObjectUtils.isEmpty(sysUserDO);
        int num = 0;
        Date date = new Date();
        if (empty) {
            SysUserDO sysUserDO1 = new SysUserDO();
            Date date = new Date();
            String encode = new BCryptPasswordEncoder().encode(UserConstants.PASSWORD);
            sysUserDO1.setOpenid(openid);
            sysUserDO1.setUnionid(unionid);
@@ -96,6 +98,7 @@
            sysUserDO.setUnionid(unionid);
            sysUserDO.setSessionKey(sessionKey);
            sysUserDO.setPassword(encode);
            sysUserDO.setLastLoginTime(date);
            sysUserDO.setType(1);
            num = userDao.updateById(sysUserDO);
        }
@@ -629,7 +632,7 @@
    }

    /**
     * 新增运营后台账户
     * 新增运营、社区后台账户
     *
     * @param administratorsUserVO 账户信息
     * @return 新增结果
@@ -638,7 +641,29 @@
    @Transactional(rollbackFor = Exception.class)
    public R addUserBackstage(AdministratorsUserVO administratorsUserVO) {
        SysUserDO sysUserDO=new SysUserDO();
        SysRoleDO roleDO = roleDAO.selectById(administratorsUserVO.getRoleId());
        Long roleId = administratorsUserVO.getRoleId();
        Long communityId = administratorsUserVO.getCommunityId();
        if (roleId.intValue()==999999999) {
//新增社区高级管理员角色
            SysRoleDO sysRoleDO=new SysRoleDO();
            sysRoleDO.setCommunityId(communityId);
            sysRoleDO.setRoleName("超级管理员");
            sysRoleDO.setRoleKey("chaojiguanliyuan"+communityId);
            sysRoleDO.setRoleSort(0);
            sysRoleDO.setCreateBy(administratorsUserVO.getUserId());
            int insert = roleDAO.insert(sysRoleDO);
            if (insert>0) {
                SysRoleDO sysRoleDO1 = roleDAO.selectOne(new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getRoleKey, sysRoleDO.getRoleKey()));
                roleId=sysRoleDO1.getRoleId();
//                新角色设置所有权限
                MenuRoleVO menuRoleVO=new MenuRoleVO();
                menuRoleVO.setIsAll(1);
                menuRoleVO.setCommunityId(communityId);
                menuRoleVO.setRoleId(roleId);
                this.putMenuRole(menuRoleVO);
            }
        }
        SysRoleDO roleDO = roleDAO.selectById(roleId);
        if (ObjectUtils.isEmpty(roleDO)) {
            return R.fail("角色不存在");
        }
@@ -652,8 +677,11 @@
            e.printStackTrace();
            log.error("新增后台用户报错【{}】",e.getMessage());
            if (e.getMessage().contains("union_phone_type")) {
                return R.fail("手机号已经存在");
                throw new ServiceException("手机号已经存在");
            }else if(e.getMessage().contains("union_account_type")){
                throw new ServiceException("账户已经存在");
            }

        }
        if (insert>0) {
            SysUserDO sysUserDO1 = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getType, administratorsUserVO.getType()).eq(SysUserDO::getPhone, administratorsUserVO.getPhone()));
@@ -670,7 +698,57 @@
    }

    /**
     * 编辑运营后台账户
     * 设置角色的权限
     *
     * @param menuRoleVO 用户设置的权限id
     * @return 设置结果
     */
    @Transactional(rollbackFor = Exception.class)
    public R putMenuRole(MenuRoleVO menuRoleVO) {
        List<Long>menuIds=new ArrayList<>();
        Long roleId = menuRoleVO.getRoleId();
        Integer isAll = menuRoleVO.getIsAll();
        Long communityId = menuRoleVO.getCommunityId();
        if (isAll.intValue()==1) {
            List<SysMenuDO> sysMenuDOS = sysMenuDAO.selectList(new QueryWrapper<SysMenuDO>().lambda().eq(SysMenuDO::getCommunityId, 1l).eq(SysMenuDO::getParentId,0).orderByAsc(SysMenuDO::getOrderNum));
            Long menuIdParent = sysMenuDOS.get(1).getMenuId();
            List<SysMenuDO> sysMenuDOSErJi = sysMenuDAO.selectList(new QueryWrapper<SysMenuDO>().lambda().eq(SysMenuDO::getParentId, menuIdParent));
            if (!ObjectUtils.isEmpty(sysMenuDOS)) {
                sysMenuDOS.forEach(sysMenuDO -> {
                    sysMenuDO.setCommunityId(communityId);
                    sysMenuDO.setMenuId(null);
                    sysMenuDAO.insert(sysMenuDO);
                });
//                完成一级目录创建
                List<SysMenuDO> sysMenuDOS1 = sysMenuDAO.selectList(new QueryWrapper<SysMenuDO>().lambda().eq(SysMenuDO::getCommunityId, communityId).orderByAsc(SysMenuDO::getOrderNum));
                sysMenuDOS1.forEach(sysMenuDO -> {
                    Integer orderNum = sysMenuDO.getOrderNum();
                    if (orderNum.intValue()>0) {
                        sysMenuDOSErJi.forEach(sysMenuDO1 -> {
                            sysMenuDO1.setParentId(sysMenuDO.getMenuId());
                            sysMenuDO1.setCommunityId(communityId);
                            sysMenuDO1.setMenuId(null);
                            sysMenuDAO.insert(sysMenuDO1);
                        });
                    }
                });
            }
        }
//        获取所有权限id
        List<SysMenuDO> menuDOList = sysMenuDAO.selectList(new QueryWrapper<SysMenuDO>().lambda().eq(SysMenuDO::getCommunityId, communityId).orderByAsc(SysMenuDO::getOrderNum));
        menuIds=menuDOList.stream().map(sysMenuDO -> sysMenuDO.getMenuId()).collect(Collectors.toList());
        for(int i=0;i<menuIds.size();i++){
            SysRoleMenuDO sysRoleMenuDO=new SysRoleMenuDO();
            sysRoleMenuDO.setMenuId(menuIds.get(i));
            sysRoleMenuDO.setRoleId(roleId);
            sysRoleMenuDAO.insert(sysRoleMenuDO);
        }

        return R.ok();
    }

    /**
     * 编辑运营、社区后台账户
     *
     * @param administratorsUserVO 编辑账户内容
     * @return 编辑结果
@@ -1113,8 +1191,51 @@
        return R.ok(indexDataKanbanVO);
    }

    /**
     * 社区管理后台数据看板
     *
     * @param communityId 社区id
     * @return 看板用户数据
     */
    @Override
    public R indexDataCommunityBackstage(Long communityId) {
        IndexDataVO indexDataVO=userDao.indexDataCommunityBackstage(communityId);
        return R.ok(indexDataVO);
    }

    /**
     * 定时任务维护用户持续登录时间
     *
     * @return 维护结果
     */
    @Override
    public R timedTaskContinuousLandingDays() {
        int num=userDao.timedTaskContinuousLandingDays();
        if (num>0) {
            log.info("定时任务维护用户持续登录时间，维护用户数量【{}】",num);
        }
        return R.ok();
    }

    /**
     * 新增用户通知
     *
     * @param sysUserNoticeVO 通知内容
     * @return 新增结果
     */
    @Override
    public R addNotice(SysUserNoticeVO sysUserNoticeVO) {
        SysUserNoticeDO sysUserNoticeDO=new SysUserNoticeDO();
        BeanUtils.copyProperties(sysUserNoticeVO,sysUserNoticeDO);
        int insert = sysUserNoticeDAO.insert(sysUserNoticeDO);
        if (insert>0) {
            return R.ok();
        }
        return R.fail();
    }

    public static void main(String[] args) {
        String encode = new BCryptPasswordEncoder().encode("123456");
        String encode = new BCryptPasswordEncoder().encode("admin123456");
        System.out.println(encode);
    }
}