springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml
@@ -23,58 +23,47 @@ </component> <component name="ChangeListManager"> <list default="true" id="8ba27629-3e5d-4f42-993e-d0c055bc9371" name="Default Changelist" comment=""> <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActEasyPhotoCommentDTO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActEasyPhotoCommentUserDTO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComActEasyPhotoCommentDTO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ComPbServiceTeamDTO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/PageComPbServiceTeamDTO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoCommentVO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbServiceTeamVO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoCommentDAO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoCommentUserDAO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoCommentDO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoCommentUserDO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbServiceTeamDAO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbServiceTeamDO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComPbServiceTeamService.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbServiceTeamServiceImpl.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussDTO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ComPbActivityDTO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussOptionVO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussVO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/DiscussApi.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/api/DiscussApi.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussCommentDAO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussDAO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussOptionDAO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussOptionUserDAO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussUserDAO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussCommentDO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussDO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussOptionDO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussOptionUserDO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussUserDO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComActDiscussOptionService.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComActDiscussService.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDiscussOptionServiceImpl.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDiscussServiceImpl.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/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/IndexApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/UserApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/UserApi.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/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/ComActActivityVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.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/constants/TokenConstant.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/constants/TokenConstant.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/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/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/ComActActivityVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/ComActActivityVO.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/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/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$/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/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/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/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/ComActActivityDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.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/service/ComActActivityService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComActActivityService.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/impl/ComActActivityServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.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/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/ComBpActivityDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComBpActivityDAO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbActivityDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbActivityDO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.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/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$/timejob/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/timejob/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" /> @@ -90,8 +79,8 @@ <component name="FileTemplateManagerImpl"> <option name="RECENT_TEMPLATES"> <list> <option value="Interface" /> <option value="Class" /> <option value="Interface" /> </list> </option> </component> @@ -457,7 +446,7 @@ <workItem from="1610934956567" duration="1325000" /> <workItem from="1610939265133" duration="8588000" /> <workItem from="1610956684718" duration="7037000" /> <workItem from="1611019208339" duration="76128000" /> <workItem from="1611019208339" duration="93801000" /> </task> <servers /> </component> @@ -481,10 +470,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="1611223757025"> <state x="574" y="118" key="#com.intellij.ide.util.MemberChooser" timestamp="1611305989460"> <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="1611223757025" /> <state x="574" y="118" key="#com.intellij.ide.util.MemberChooser/0.0.1536.824@0.0.1536.824" timestamp="1611305989460" /> <state x="405" y="335" key="#com.intellij.refactoring.move.MoveHandler.SelectRefactoringDialog" timestamp="1606099594079"> <screen x="0" y="0" width="1536" height="824" /> </state> @@ -513,58 +502,62 @@ <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="1610606590056" /> <state width="1031" height="448" key="GridCell.Tab.0.bottom" timestamp="1611225277465"> <state width="1031" height="448" key="GridCell.Tab.0.bottom" timestamp="1611294821130"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="448" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611225277465" /> <state width="1031" height="448" key="GridCell.Tab.0.center" timestamp="1611225277465"> <state width="1031" height="448" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611294821130" /> <state width="1031" height="448" key="GridCell.Tab.0.center" timestamp="1611294821130"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="448" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1611225277465" /> <state width="1031" height="448" key="GridCell.Tab.0.left" timestamp="1611225277464"> <state width="1031" height="448" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1611294821130" /> <state width="1031" height="448" key="GridCell.Tab.0.left" timestamp="1611294821129"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="448" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1611225277464" /> <state width="1031" height="448" key="GridCell.Tab.0.right" timestamp="1611225277465"> <state width="1031" height="448" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1611294821129" /> <state width="1031" height="448" key="GridCell.Tab.0.right" timestamp="1611294821130"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="448" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1611225277465" /> <state width="1031" height="448" key="GridCell.Tab.1.bottom" timestamp="1611225277465"> <state width="1031" height="448" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1611294821130" /> <state width="1031" height="448" key="GridCell.Tab.1.bottom" timestamp="1611294821130"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="448" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611225277465" /> <state width="1031" height="448" key="GridCell.Tab.1.center" timestamp="1611225277465"> <state width="1031" height="448" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611294821130" /> <state width="1031" height="448" key="GridCell.Tab.1.center" timestamp="1611294821130"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="448" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1611225277465" /> <state width="1031" height="448" key="GridCell.Tab.1.left" timestamp="1611225277465"> <state width="1031" height="448" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1611294821130" /> <state width="1031" height="448" key="GridCell.Tab.1.left" timestamp="1611294821130"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="448" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1611225277465" /> <state width="1031" height="448" key="GridCell.Tab.1.right" timestamp="1611225277465"> <state width="1031" height="448" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1611294821130" /> <state width="1031" height="448" key="GridCell.Tab.1.right" timestamp="1611294821130"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="448" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1611225277465" /> <state width="1031" height="448" key="GridCell.Tab.2.bottom" timestamp="1611225277466"> <state width="1031" height="448" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1611294821130" /> <state width="1031" height="448" key="GridCell.Tab.2.bottom" timestamp="1611294821130"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="448" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611225277466" /> <state width="1031" height="448" key="GridCell.Tab.2.center" timestamp="1611225277465"> <state width="1031" height="448" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611294821130" /> <state width="1031" height="448" key="GridCell.Tab.2.center" timestamp="1611294821130"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="448" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1611225277465" /> <state width="1031" height="448" key="GridCell.Tab.2.left" timestamp="1611225277465"> <state width="1031" height="448" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1611294821130" /> <state width="1031" height="448" key="GridCell.Tab.2.left" timestamp="1611294821130"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="448" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1611225277465" /> <state width="1031" height="448" key="GridCell.Tab.2.right" timestamp="1611225277466"> <state width="1031" height="448" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1611294821130" /> <state width="1031" height="448" key="GridCell.Tab.2.right" timestamp="1611294821130"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="448" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1611225277466" /> <state width="1031" height="448" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1611294821130" /> <state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1610611848124"> <screen x="0" y="0" width="1536" height="824" /> </state> <state x="299" y="67" key="Maven.ArtifactSearchDialog/0.0.1536.824@0.0.1536.824" timestamp="1610611848124" /> <state x="349" y="252" key="MavenRunHelper.GoalEditor" timestamp="1611284568987"> <screen x="0" y="0" width="1536" height="824" /> </state> <state x="349" y="252" key="MavenRunHelper.GoalEditor/0.0.1536.824@0.0.1536.824" timestamp="1611284568987" /> <state x="270" y="57" key="SettingsEditor" timestamp="1606120706449"> <screen x="0" y="0" width="1536" height="824" /> </state> @@ -581,10 +574,10 @@ <screen x="0" y="0" width="1536" height="824" /> </state> <state x="93" y="93" width="1350" height="639" key="com.intellij.history.integration.ui.views.FileHistoryDialog/0.0.1536.824@0.0.1536.824" timestamp="1611130640592" /> <state x="233" y="42" width="921" height="782" key="find.popup" timestamp="1611225457014"> <state x="233" y="42" width="921" height="782" key="find.popup" timestamp="1611301827536"> <screen x="0" y="0" width="1536" height="824" /> </state> <state x="233" y="42" width="921" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1611225457014" /> <state x="233" y="42" width="921" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1611301827536" /> <state width="600" height="428" key="javadoc.popup" timestamp="1610005781618"> <screen x="0" y="0" width="1536" height="824" /> </state> springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java
@@ -3,12 +3,15 @@ import com.alibaba.fastjson.JSONObject; import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.model.dtos.partybuilding.ActivitySignUpDTO; import com.panzhihua.common.model.dtos.partybuilding.ComPbActivityDTO; import com.panzhihua.common.model.dtos.partybuilding.PageComPbServiceTeamDTO; 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 com.panzhihua.common.validated.AddGroup; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -142,7 +145,41 @@ return r; } @ApiOperation(value = "创建党员活动") @PostMapping("activityinfo") public R addActivityinfo(@RequestBody @Validated(AddGroup.class) ComPbActivityDTO comPbActivityDTO) { LoginUserInfoVO loginUserInfo = this.getLoginUserInfo(); Long userId = loginUserInfo.getUserId(); Long communityId = loginUserInfo.getCommunityId(); comPbActivityDTO.setCreateBy(userId); comPbActivityDTO.setCommunityId(communityId); Date date=new Date(); comPbActivityDTO.setReleaseTime(date); Date activityTimeBegin = comPbActivityDTO.getActivityTimeBegin(); Date activityTimeEnd = comPbActivityDTO.getActivityTimeEnd(); boolean before = activityTimeEnd.before(activityTimeBegin); if (before) { return R.fail("活动结束时间不能早于开始时间"); } // 1 待发布 2 未开始 3 报名中 4 进行中 5 已结束 6 已取消 int status=2; Date enrollTimeBegin = comPbActivityDTO.getEnrollTimeBegin(); Date enrollTimeEnd = comPbActivityDTO.getEnrollTimeEnd(); if (enrollTimeEnd.before(enrollTimeBegin)) { return R.fail("报名结束时间不能早于报名开始时间"); } if (enrollTimeBegin.before(date)) { status=3; } comPbActivityDTO.setStatus(status); return partyBuildingService.addActivityApplets(comPbActivityDTO); } @ApiOperation(value = "分页查询服务团队成员",response = ComPbServiceTeamVO.class) @PostMapping("pageserviceteam") public R pageServiceTeam(@RequestBody PageComPbServiceTeamDTO pageComPbServiceTeamDTO) { pageComPbServiceTeamDTO.setCommunityId(this.getCommunityId()); return partyBuildingService.pageServiceTeam(pageComPbServiceTeamDTO); } } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/TokenConstant.java
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussDTO.java
New file @@ -0,0 +1,58 @@ package com.panzhihua.common.model.dtos.community; import com.panzhihua.common.validated.AddGroup; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.Min; import javax.validation.constraints.NotBlank; import java.util.Date; import java.util.List; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 一起议新增编辑 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2021-01-22 15:34 **/ @Data @ApiModel("一起议新增编辑") public class ComActDiscussDTO { @ApiModelProperty("主键") private Long id; @ApiModelProperty("主题") @NotBlank(groups = {AddGroup.class},message = "主题不能为空") private String subject; @ApiModelProperty("类型 1 图文 2 投票") @Min(value =1,groups = {AddGroup.class},message = "类型不能为空") private Integer type; @ApiModelProperty("图片地址 多个用逗号隔开") private String photoPah; @ApiModelProperty("地址") private String address; @ApiModelProperty(value = "发布人主键",hidden = true) private Long userId; @ApiModelProperty(value = "社区主键",hidden = true) private Long communityId; @ApiModelProperty("create_at") private Date createAt; @ApiModelProperty("1 单选 2 多选") private Integer option; @ApiModelProperty("投票标题") private String voteTitle; @ApiModelProperty("选项集合") private List<String> discussOptions; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ComPbActivityDTO.java
New file @@ -0,0 +1,87 @@ package com.panzhihua.common.model.dtos.partybuilding; import com.fasterxml.jackson.annotation.JsonFormat; import com.panzhihua.common.validated.AddGroup; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.Min; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.util.Date; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 党员活动 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2021-01-22 10:43 **/ @Data @ApiModel("党员活动-小程序新增") public class ComPbActivityDTO { @ApiModelProperty("id") private Long id; @ApiModelProperty(value = "活动名称",required = true) @NotBlank(groups = {AddGroup.class},message = "活动名称不能为空") private String name; @ApiModelProperty(value = "活动地点",required = true) @NotBlank(groups = {AddGroup.class},message = "活动地点不能为空") private String address; @ApiModelProperty(value = "活动最高参入人数",required = true) @Min(value = 1,groups = {AddGroup.class},message = "活动最高参入人数不能为空") private Integer participationNum; @ApiModelProperty(value = "活动最低参入人数-未达到到时间自动取消",required = true) @Min(value = 0,groups = {AddGroup.class},message = "活动最低参入人数不能为空") private Integer participationLowestNum; @ApiModelProperty(value = "活动封面",required = true) @NotBlank(groups = {AddGroup.class},message = "活动封面不能为空") private String cover; @ApiModelProperty(value = "活动内容-富文本",required = true) @NotBlank(groups = {AddGroup.class},message = "活动内容不能为空") private String richText; @ApiModelProperty("1 待发布 2 未开始 3 报名中 4 进行中 5 已结束 6 已取消") private Integer status; @ApiModelProperty("创建时间") private Date createAt; @ApiModelProperty(value = "活动开始时间",required = true,example = "2020-01-02 08:00:00") @NotNull(groups = {AddGroup.class},message = "活动开始时间不能为空") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date activityTimeBegin; @ApiModelProperty(value = "活动结束时间",required = true,example = "2020-01-02 08:00:00") @NotNull(groups = {AddGroup.class},message = "活动结束时间不能为空") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date activityTimeEnd; @ApiModelProperty(value = "报名开始时间",required = true,example = "2020-01-02 08:00:00") @NotNull(groups = {AddGroup.class},message = "报名开始时间不能为空") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date enrollTimeBegin; @ApiModelProperty(value = "报名结束时间",required = true,example = "2020-01-02 08:00:00") @NotNull(groups = {AddGroup.class},message = "报名结束时间不能为空") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date enrollTimeEnd; @ApiModelProperty("取消原因") private String cancelReason; @ApiModelProperty("发布人主键") private Long createBy; @ApiModelProperty("发布时间") private Date releaseTime; @ApiModelProperty(value = "社区id",hidden = true) private Long communityId; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussOptionVO.java
New file @@ -0,0 +1,34 @@ package com.panzhihua.common.model.vos.community; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 一起议选项 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2021-01-22 16:08 **/ @Data @ApiModel("一起议选项") public class ComActDiscussOptionVO { @ApiModelProperty("id") private Long id; @ApiModelProperty("一起议主键") private Long discussId; @ApiModelProperty("选项内容") private String optionContent; @ApiModelProperty("create_at") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createAt; @ApiModelProperty("投票数量") private Integer num; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussVO.java
New file @@ -0,0 +1,63 @@ package com.panzhihua.common.model.vos.community; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; import java.util.List; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 一起议议详情 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2021-01-22 16:07 **/ @Data @ApiModel("一起议议详情") public class ComActDiscussVO { @ApiModelProperty("主键") private Long id; @ApiModelProperty("主题") private String subject; @ApiModelProperty("类型 1 图文 2 投票") private Integer type; @ApiModelProperty("图片地址 多个用逗号隔开") private String photoPah; @ApiModelProperty("地址") private String address; @ApiModelProperty("发布人主键") private Long userId; @ApiModelProperty("社区主键") private Long communityId; @ApiModelProperty("create_at") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createAt; @ApiModelProperty("1 单选 2 多选") private Integer option; @ApiModelProperty("投票标题") private String voteTitle; @ApiModelProperty("选项") private List<ComActDiscussOptionVO> comActDiscussOptionVOS; @ApiModelProperty("评论数量") private Integer commentNum; @ApiModelProperty("点赞数量") private Integer signNum; @ApiModelProperty("发布人名字") private String userName; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.java
@@ -98,6 +98,9 @@ @ApiModelProperty("是否是小程序请求") private Integer isAppliets; @ApiModelProperty("是否是个人发起 1 是 0 否") private Integer isPerson;
@@ -2,10 +2,7 @@ import com.panzhihua.common.model.dtos.AppletesBackstageConfigDTO; import com.panzhihua.common.model.dtos.advertisement.ComOpsAdvDTO; import com.panzhihua.common.model.dtos.community.ComActEasyPhotoCommentDTO; import com.panzhihua.common.model.dtos.community.PageComActEasyPhotoCommentDTO; import com.panzhihua.common.model.dtos.community.ComActEasyPhotoCommentUserDTO; import com.panzhihua.common.model.dtos.community.PageComActDTO; import com.panzhihua.common.model.dtos.community.*; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.SystemmanagementConfigVO; import com.panzhihua.common.model.vos.community.*; @@ -689,4 +686,28 @@ */ @PostMapping("addcomacteasyphotocomment") R addComActEasyPhotoComment(@RequestBody ComActEasyPhotoCommentDTO comActEasyPhotoCommentDTO); /** * 一起议-新增 * @param comActDiscussDTO 新增参数 * @return 新增结果 */ @PostMapping("adddiscuss") R addDiscuss(@RequestBody ComActDiscussDTO comActDiscussDTO); /** * 一起议-详情 * @param id 主键 * @return ComActDiscussVO */ @PostMapping("detaildiscuss") R detailDiscuss(@RequestParam("id") Long id); /** * 一起议-删除 * @param id 主键 * @return 删除结果 */ @PostMapping("deletediscuss") R deleteDiscuss(@RequestParam("id") Long id); } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java
@@ -1,6 +1,7 @@ package com.panzhihua.common.service.partybuilding; import com.panzhihua.common.model.dtos.partybuilding.ActivitySignUpDTO; import com.panzhihua.common.model.dtos.partybuilding.ComPbActivityDTO; import com.panzhihua.common.model.dtos.partybuilding.ComPbServiceTeamDTO; import com.panzhihua.common.model.dtos.partybuilding.PageComPbServiceTeamDTO; import com.panzhihua.common.model.vos.R; @@ -315,4 +316,12 @@ */ @PostMapping("/partybuildIng/pageserviceteam") R pageServiceTeam(@RequestBody PageComPbServiceTeamDTO pageComPbServiceTeamDTO); /** * 创建党员活动 小程序创建党员活动 * @param comPbActivityDTO 创建内容 * @return 创建结果 */ @PostMapping("/partybuildIng/addactivityinfo") R addActivityApplets(@RequestBody ComPbActivityDTO comPbActivityDTO); } springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/dtos/community/ComActDiscussDTO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/dtos/partybuilding/ComPbActivityDTO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/community/ComActDiscussOptionVO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/community/ComActDiscussVO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/service/community/CommunityService.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/service/partybuilding/PartyBuildingService.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/DiscussApi.java
New file @@ -0,0 +1,71 @@ package com.panzhihua.community_backstage.api; import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.model.dtos.community.ComActDiscussDTO; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComActDiscussVO; import com.panzhihua.common.service.community.CommunityService; import com.panzhihua.common.validated.AddGroup; 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.*; import javax.annotation.Resource; import java.util.List; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 一起议 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2021-01-22 15:30 **/ @Slf4j @Api(tags = {"一起议"}) @RestController @RequestMapping("/") public class DiscussApi extends BaseController { @Resource private CommunityService communityService; @ApiOperation(value = "一起议-新增") @PostMapping("discuss") public R addDiscuss(@RequestBody @Validated(AddGroup.class) ComActDiscussDTO comActDiscussDTO) { Integer type = comActDiscussDTO.getType(); String voteTitle = comActDiscussDTO.getVoteTitle(); List<String> discussOptions = comActDiscussDTO.getDiscussOptions(); if (type.intValue()==2 ) { if(ObjectUtils.isEmpty(voteTitle)){ return R.fail("投票标题不能为空"); } if(ObjectUtils.isEmpty(discussOptions)){ return R.fail("选项不能为空"); } } LoginUserInfoVO loginUserInfo = this.getLoginUserInfo(); Long userId = loginUserInfo.getUserId(); Long communityId = loginUserInfo.getCommunityId(); comActDiscussDTO.setUserId(userId); comActDiscussDTO.setCommunityId(communityId); return communityService.addDiscuss(comActDiscussDTO); } @ApiOperation(value = "一起议-详情",response = ComActDiscussVO.class) @GetMapping("discuss") public R detailDiscuss(@RequestParam("id") Long id) { return communityService.detailDiscuss(id); } @ApiOperation(value = "一起议-删除") @DeleteMapping("discuss") public R deleteDiscuss(@RequestParam("id") Long id) { return communityService.deleteDiscuss(id); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/DiscussApi.java
New file @@ -0,0 +1,55 @@ package com.panzhihua.service_community.api; import com.panzhihua.common.model.dtos.community.ComActDiscussDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.service_community.service.ComActActivityService; import com.panzhihua.service_community.service.ComActDiscussService; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 一起议 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2021-01-22 14:52 **/ @Slf4j @RestController @RequestMapping("/discuss/") public class DiscussApi { @Resource private ComActDiscussService comActDiscussService; /** * 一起议-新增 * @param comActDiscussDTO 新增参数 * @return 新增结果 */ @PostMapping("adddiscuss") public R addDiscuss(@RequestBody ComActDiscussDTO comActDiscussDTO){ return comActDiscussService.addDiscuss(comActDiscussDTO); } /** * 一起议-详情 * @param id 主键 * @return ComActDiscussVO */ @PostMapping("detaildiscuss") public R detailDiscuss(@RequestParam("id") Long id){ return comActDiscussService.detailDiscuss(id); } /** * 一起议-删除 * @param id 主键 * @return 删除结果 */ @PostMapping("deletediscuss") public R deleteDiscuss(@RequestParam("id") Long id){ return comActDiscussService.deleteDiscuss(id); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussCommentDAO.java
New file @@ -0,0 +1,25 @@ package com.panzhihua.service_community.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.panzhihua.service_community.model.dos.ComActDiscussCommentDO; import org.apache.ibatis.annotations.Mapper; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 一起议评论 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2021-01-22 15:11 **/ @Mapper public interface ComActDiscussCommentDAO extends BaseMapper<ComActDiscussCommentDO> { // @Select("<script> " + // " <where>" + // "<if test='nameCn != null and nameCn.trim() != ""'>" + // " </if> " + // "<if test='nameCn != null and nameCn.trim() != ""'>" + // " </if> " + // "<if test='nameCn != null and nameCn.trim() != ""'>" + // " </if> " + // " </where>" + // "</script>") } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussDAO.java
New file @@ -0,0 +1,29 @@ package com.panzhihua.service_community.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.service_community.model.dos.ComActDiscussDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 一起议 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2021-01-22 14:49 **/ @Mapper public interface ComActDiscussDAO extends BaseMapper<ComActDiscussDO> { // @Select("<script> " + // " <where>" + // "<if test='nameCn != null and nameCn.trim() != ""'>" + // " </if> " + // "<if test='nameCn != null and nameCn.trim() != ""'>" + // " </if> " + // "<if test='nameCn != null and nameCn.trim() != ""'>" + // " </if> " + // " </where>" + // "</script>") @Select("select type,name from sys_user where user_id=#{userId}") LoginUserInfoVO selectUserByUserId(Long userId); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussOptionDAO.java
New file @@ -0,0 +1,25 @@ package com.panzhihua.service_community.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.panzhihua.service_community.model.dos.ComActDiscussOptionDO; import org.apache.ibatis.annotations.Mapper; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 一起议选项 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2021-01-22 15:27 **/ @Mapper public interface ComActDiscussOptionDAO extends BaseMapper<ComActDiscussOptionDO> { // @Select("<script> " + // " <where>" + // "<if test='nameCn != null and nameCn.trim() != ""'>" + // " </if> " + // "<if test='nameCn != null and nameCn.trim() != ""'>" + // " </if> " + // "<if test='nameCn != null and nameCn.trim() != ""'>" + // " </if> " + // " </where>" + // "</script>") } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussOptionUserDAO.java
New file @@ -0,0 +1,25 @@ package com.panzhihua.service_community.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.panzhihua.service_community.model.dos.ComActDiscussOptionUserDO; import org.apache.ibatis.annotations.Mapper; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 一起议选项投票 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2021-01-22 16:13 **/ @Mapper public interface ComActDiscussOptionUserDAO extends BaseMapper<ComActDiscussOptionUserDO> { // @Select("<script> " + // " <where>" + // "<if test='nameCn != null and nameCn.trim() != ""'>" + // " </if> " + // "<if test='nameCn != null and nameCn.trim() != ""'>" + // " </if> " + // "<if test='nameCn != null and nameCn.trim() != ""'>" + // " </if> " + // " </where>" + // "</script>") } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussUserDAO.java
New file @@ -0,0 +1,25 @@ package com.panzhihua.service_community.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.panzhihua.service_community.model.dos.ComActDiscussUserDO; import org.apache.ibatis.annotations.Mapper; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 一起议点赞 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2021-01-22 15:04 **/ @Mapper public interface ComActDiscussUserDAO extends BaseMapper<ComActDiscussUserDO> { // @Select("<script> " + // " <where>" + // "<if test='nameCn != null and nameCn.trim() != ""'>" + // " </if> " + // "<if test='nameCn != null and nameCn.trim() != ""'>" + // " </if> " + // "<if test='nameCn != null and nameCn.trim() != ""'>" + // " </if> " + // " </where>" + // "</script>") } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussCommentDO.java
New file @@ -0,0 +1,61 @@ package com.panzhihua.service_community.model.dos; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import java.io.Serializable; import java.util.Date; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 一起议评论 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2021-01-22 15:09 **/ @Data @TableName(value = "com_act_discuss") public class ComActDiscussCommentDO implements Serializable { private static final long serialVersionUID = 1L; /** * 主键 */ @TableId(type = IdType.AUTO) private Long id; /** * 一起议主键 */ private Long discussId; /** * varchar(500) */ private String comment; /** * 是否置顶 0 否 1 是 */ private Integer isTopping; /** * 评论时间 */ @TableField(fill = FieldFill.INSERT) private Date createAt; /** * 是否作者本人回复 0 否 1 是 */ private Integer isAuthor; /** * 上级评论id 默认0表示一级评论 */ private Long parentId; /** * 用户主键 */ private Long userId; } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussDO.java
New file @@ -0,0 +1,71 @@ package com.panzhihua.service_community.model.dos; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import java.io.Serializable; import java.util.Date; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 一起议 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2021-01-22 14:48 **/ @Data @TableName(value = "com_act_discuss") public class ComActDiscussDO implements Serializable { private static final long serialVersionUID = 1L; /** * 主键 */ @TableId(type = IdType.AUTO) private Long id; /** * 主题 */ private String subject; /** * 类型 1 图文 2 投票 */ private Integer type; /** * 图片地址 多个用逗号隔开 */ private String photoPah; /** * 地址 */ private String address; /** * 发布人主键 */ private Long userId; /** * 社区主键 */ private Long communityId; /** * create_at */ @TableField(fill = FieldFill.INSERT) private Date createAt; /** * 1 单选 2 多选 */ private Integer option; /** * 投票标题 */ private String voteTitle; } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussOptionDO.java
New file @@ -0,0 +1,41 @@ package com.panzhihua.service_community.model.dos; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import java.io.Serializable; import java.util.Date; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 一起议投票选项 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2021-01-22 15:07 **/ @Data @TableName(value = "com_act_discuss_option") public class ComActDiscussOptionDO implements Serializable { private static final long serialVersionUID = 1L; /** * id */ @TableId(type = IdType.AUTO) private Long id; /** * 一起议主键 */ private Long discussId; /** * 选项内容 */ private String optionContent; /** * create_at */ @TableField(fill = FieldFill.INSERT) private Date createAt; } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussOptionUserDO.java
New file @@ -0,0 +1,39 @@ package com.panzhihua.service_community.model.dos; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.io.Serializable; import java.util.Date; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 一起议选项投票 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2021-01-22 16:12 **/ @Data @TableName(value = "com_act_discuss_option_user") public class ComActDiscussOptionUserDO implements Serializable { private static final long serialVersionUID = 1L; /** * 主键 */ private Long id; /** * 一起议选项id */ private Long discussOptionId; /** * 投票人id */ private String userId; /** * 投票时间 */ private Date createAt; } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussUserDO.java
New file @@ -0,0 +1,41 @@ package com.panzhihua.service_community.model.dos; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import java.io.Serializable; import java.util.Date; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 一起议点赞 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2021-01-22 14:57 **/ @Data @TableName(value = "com_act_discuss") public class ComActDiscussUserDO implements Serializable { private static final long serialVersionUID = 1L; /** * 主键 */ @TableId(type = IdType.AUTO) private Long id; /** * 一起议主键 */ private Long discussId; /** * 用户主键 */ private Long user; /** * 点赞时间 */ @TableField(fill = FieldFill.INSERT) private Date createAt; } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActDiscussOptionService.java
New file @@ -0,0 +1,13 @@ package com.panzhihua.service_community.service; import com.baomidou.mybatisplus.extension.service.IService; import com.panzhihua.service_community.model.dos.ComActDiscussOptionDO; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 一起议选项 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2021-01-22 15:47 **/ public interface ComActDiscussOptionService extends IService<ComActDiscussOptionDO> { } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActDiscussService.java
New file @@ -0,0 +1,31 @@ package com.panzhihua.service_community.service; import com.panzhihua.common.model.dtos.community.ComActDiscussDTO; import com.panzhihua.common.model.vos.R; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 一起议 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2021-01-22 14:50 **/ public interface ComActDiscussService { /** * 一起议-新增 * @param comActDiscussDTO 新增参数 * @return 新增结果 */ R addDiscuss(ComActDiscussDTO comActDiscussDTO); /** * 一起议-详情 * @param id 主键 * @return ComActDiscussVO */ R detailDiscuss(Long id); /** * 一起议-删除 * @param id 主键 * @return 删除结果 */ R deleteDiscuss(Long id); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
@@ -11,6 +11,7 @@ import com.panzhihua.common.model.vos.community.SignactivityVO; import com.panzhihua.service_community.dao.ComActActSignDAO; import com.panzhihua.service_community.dao.ComActActivityDAO; import com.panzhihua.service_community.dao.ComActDiscussOptionUserDAO; import com.panzhihua.service_community.model.dos.ComActActSignDO; import com.panzhihua.service_community.model.dos.ComActActivityDO; import com.panzhihua.service_community.service.ComActActivityService; @@ -39,6 +40,7 @@ private ComActActivityDAO comActActivityDAO; @Resource private ComActActSignDAO comActActSignDAO; /** * 新增社区活动 * @param comActActivityVO 新增信息 @@ -223,7 +225,14 @@ comActActSignDO.setActivityId(activityId); comActActSignDO.setUserId(userId); comActActSignDO.setIsVolunteer(isVolunteer); try { num = comActActSignDAO.insert(comActActSignDO); } catch (Exception e) { if (e.getMessage().contains("unique_activity_id_user_id")) { return R.fail("已经报名过了，请勿重复提交"); } log.error(e.getMessage()); } } else { num = comActActSignDAO.delete(new QueryWrapper<ComActActSignDO>().lambda().eq(ComActActSignDO::getUserId, userId).eq(ComActActSignDO::getActivityId, activityId).eq(ComActActSignDO::getIsVolunteer, isVolunteer)); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDiscussOptionServiceImpl.java
New file @@ -0,0 +1,17 @@ package com.panzhihua.service_community.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.panzhihua.service_community.dao.ComActDiscussOptionDAO; import com.panzhihua.service_community.model.dos.ComActDiscussOptionDO; import com.panzhihua.service_community.service.ComActDiscussOptionService; import org.springframework.stereotype.Service; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 一起议选项 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2021-01-22 15:48 **/ @Service public class ComActDiscussOptionServiceImpl extends ServiceImpl<ComActDiscussOptionDAO, ComActDiscussOptionDO> implements ComActDiscussOptionService { } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDiscussServiceImpl.java
New file @@ -0,0 +1,127 @@ package com.panzhihua.service_community.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.panzhihua.common.model.dtos.community.ComActDiscussDTO; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComActDiscussOptionVO; import com.panzhihua.common.model.vos.community.ComActDiscussVO; import com.panzhihua.service_community.dao.*; import com.panzhihua.service_community.model.dos.*; import com.panzhihua.service_community.service.ComActDiscussOptionService; import com.panzhihua.service_community.service.ComActDiscussService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.ObjectUtils; import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 一起议 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2021-01-22 14:51 **/ @Service public class ComActDiscussServiceImpl implements ComActDiscussService { @Resource private ComActDiscussCommentDAO comActDiscussCommentDAO; @Resource private ComActDiscussDAO comActDiscussDAO; @Resource private ComActDiscussOptionUserDAO comActDiscussOptionUserDAO; @Resource private ComActDiscussUserDAO comActDiscussUserDAO; @Resource private ComActDiscussOptionDAO comActDiscussOptionDAO; @Resource private ComActDiscussOptionService comActDiscussOptionService; /** * 一起议-新增 * * @param comActDiscussDTO 新增参数 * @return 新增结果 */ @Override @Transactional(rollbackFor = Exception.class) public R addDiscuss(ComActDiscussDTO comActDiscussDTO) { ComActDiscussDO comActDiscussDO=new ComActDiscussDO(); BeanUtils.copyProperties(comActDiscussDTO,comActDiscussDO); int insert = comActDiscussDAO.insert(comActDiscussDO); if (insert>0) { ComActDiscussDO comActDiscussDO1 = comActDiscussDAO.selectOne(new QueryWrapper<ComActDiscussDO>().lambda().eq(ComActDiscussDO::getSubject, comActDiscussDTO.getSubject()).eq(ComActDiscussDO::getUserId, comActDiscussDTO.getUserId()).last(" order by create_at desc limit 1 ")); Long comActDiscussDO1Id = comActDiscussDO1.getId(); Integer type = comActDiscussDTO.getType(); if (type.intValue()==2) { List<String> discussOptions = comActDiscussDTO.getDiscussOptions(); List<ComActDiscussOptionDO> comActDiscussOptionDOS=new ArrayList<>(); discussOptions.forEach(s -> { ComActDiscussOptionDO comActDiscussOptionDO=new ComActDiscussOptionDO(); comActDiscussOptionDO.setDiscussId(comActDiscussDO1Id); comActDiscussOptionDO.setOptionContent(s); comActDiscussOptionDOS.add(comActDiscussOptionDO); }); comActDiscussOptionService.saveBatch(comActDiscussOptionDOS); } return R.ok(); } return R.fail(); } /** * 一起议-详情 * * @param id 主键 * @return ComActDiscussVO */ @Override public R detailDiscuss(Long id) { ComActDiscussDO comActDiscussDO = comActDiscussDAO.selectById(id); if (ObjectUtils.isEmpty(comActDiscussDO)) { return R.fail("一起议不存在"); } ComActDiscussVO comActDiscussVO=new ComActDiscussVO(); BeanUtils.copyProperties(comActDiscussDO,comActDiscussVO); Integer integer = comActDiscussCommentDAO.selectCount(new QueryWrapper<ComActDiscussCommentDO>().lambda().eq(ComActDiscussCommentDO::getDiscussId, id)); comActDiscussVO.setCommentNum(integer); Integer integer1 = comActDiscussUserDAO.selectCount(new QueryWrapper<ComActDiscussUserDO>().lambda().eq(ComActDiscussUserDO::getDiscussId, id)); comActDiscussVO.setSignNum(integer1); Integer type = comActDiscussVO.getType(); if (type.intValue()==2) { List<ComActDiscussOptionDO> comActDiscussOptionDOS = comActDiscussOptionDAO.selectList(new QueryWrapper<ComActDiscussOptionDO>().lambda().eq(ComActDiscussOptionDO::getDiscussId, id)); List<ComActDiscussOptionVO> comActDiscussOptionVOS=new ArrayList<>(); comActDiscussOptionDOS.forEach(comActDiscussOptionDO -> { Long discussOptionDOId = comActDiscussOptionDO.getId(); Integer selectCount = comActDiscussOptionUserDAO.selectCount(new QueryWrapper<ComActDiscussOptionUserDO>().lambda().eq(ComActDiscussOptionUserDO::getDiscussOptionId, discussOptionDOId)); ComActDiscussOptionVO comActDiscussOptionVO=new ComActDiscussOptionVO(); BeanUtils.copyProperties(comActDiscussOptionDO,comActDiscussOptionVO); comActDiscussOptionVO.setNum(selectCount); comActDiscussOptionVOS.add(comActDiscussOptionVO); }); comActDiscussVO.setComActDiscussOptionVOS(comActDiscussOptionVOS); } Long userId = comActDiscussDO.getUserId(); LoginUserInfoVO loginUserInfoVO=comActDiscussDAO.selectUserByUserId(userId); comActDiscussVO.setUserName(loginUserInfoVO.getName()); return R.ok(comActDiscussVO); } /** * 一起议-删除 * * @param id 主键 * @return 删除结果 */ @Override public R deleteDiscuss(Long id) { int delete = comActDiscussDAO.deleteById(id); if (delete>0) { return R.ok(); } return R.fail(); } } springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java
@@ -2,6 +2,7 @@ import com.panzhihua.common.exceptions.PartyBuildingMemberException; import com.panzhihua.common.model.dtos.partybuilding.ActivitySignUpDTO; import com.panzhihua.common.model.dtos.partybuilding.ComPbActivityDTO; import com.panzhihua.common.model.dtos.partybuilding.ComPbServiceTeamDTO; import com.panzhihua.common.model.dtos.partybuilding.PageComPbServiceTeamDTO; import com.panzhihua.common.model.vos.R; @@ -443,4 +444,14 @@ return comPbServiceTeamService.deleteServiceTeam(comPbServiceTeamDTO); } /** * 创建党员活动 小程序创建党员活动 * @param comPbActivityDTO 创建内容 * @return 创建结果 */ @PostMapping("addactivityinfo") R addActivityApplets(@RequestBody ComPbActivityDTO comPbActivityDTO){ return comBpActivityService.addActivityApplets(comPbActivityDTO); } } springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComBpActivityDAO.java
@@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.partybuilding.PageActivityMembersVO; import com.panzhihua.common.model.vos.partybuilding.PartyBuildingActivityVO; import com.panzhihua.service_dangjian.model.dos.ComPbActivityDO; @@ -139,4 +140,6 @@ @Update("update com_pb_activity set status=(if(TIMESTAMPDIFF(HOUR,SYSDATE(),activity_time_end)<=0,5,4)) where `status`=3 and TIMESTAMPDIFF(HOUR,SYSDATE(),activity_time_begin)<=0") int updateStatusToActiveOrEnd(); @Select("select type,name from sys_user where user_id=#{createBy}") LoginUserInfoVO selectUserInfoByUserId(Long createBy); } springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbActivityDO.java
@@ -1,8 +1,6 @@ package com.panzhihua.service_dangjian.model.dos; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; @@ -44,6 +42,7 @@ /** * 创建时间 */ @TableField(fill = FieldFill.INSERT) private Date createAt; /** springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComBpActivityService.java
@@ -1,6 +1,7 @@ package com.panzhihua.service_dangjian.service; import com.panzhihua.common.model.dtos.partybuilding.ActivitySignUpDTO; import com.panzhihua.common.model.dtos.partybuilding.ComPbActivityDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.partybuilding.PageActivityMembersVO; import com.panzhihua.common.model.vos.partybuilding.PartyBuildingActivityVO; @@ -102,4 +103,10 @@ * @return 修改结果 */ R timedTaskPartyBuildingActivityAll(); /** * 创建党员活动 小程序创建党员活动 * @param comPbActivityDTO 创建内容 * @return 创建结果 */ R addActivityApplets(ComPbActivityDTO comPbActivityDTO); } springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java
@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.panzhihua.common.model.dtos.partybuilding.ActivitySignUpDTO; import com.panzhihua.common.model.dtos.partybuilding.ComPbActivityDTO; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComActActivityVO; import com.panzhihua.common.model.vos.partybuilding.PageActivityMembersVO; @@ -97,6 +99,12 @@ if (ObjectUtils.isEmpty(comPbActivityDO)) { return R.fail("活动不存在"); } LoginUserInfoVO loginUserInfoVO=comBpActivityDAO.selectUserInfoByUserId(comPbActivityDO.getCreateBy()); Integer type = loginUserInfoVO.getType(); int isPerson=0; if (type.intValue()==1) { isPerson=1; } PartyBuildingActivityVO partyBuildingActivityVO = new PartyBuildingActivityVO(); BeanUtils.copyProperties(comPbActivityDO, partyBuildingActivityVO); List<ComPbActivityMemberDO> comPbActivityMemberDOS = comPbActivityMemberDAO.selectList(new QueryWrapper<ComPbActivityMemberDO>().lambda().eq(ComPbActivityMemberDO::getActivityId, id).orderByDesc(ComPbActivityMemberDO::getCreateAt)); @@ -124,6 +132,8 @@ partyBuildingActivityVO.setIsSign(1); } partyBuildingActivityVO.setPartyBuildingMemberVOS(partyBuildingMemberVOS); partyBuildingActivityVO.setIsPerson(isPerson); partyBuildingActivityVO.setCreateByName(loginUserInfoVO.getName()); return R.ok(partyBuildingActivityVO); } @@ -222,11 +232,17 @@ records.forEach(partyBuildingActivityVO1 -> { Date activityTimeBegin = partyBuildingActivityVO1.getActivityTimeBegin(); Integer status = partyBuildingActivityVO1.getStatus(); String createByName = partyBuildingActivityVO1.getCreateByName(); if (!ObjectUtils.isEmpty(activityTimeBegin)) { partyBuildingActivityVO1.setActivityTimeBeginFormat(formatTo.format(activityTimeBegin)); } if(status.intValue()==3){ partyBuildingActivityVO1.setStatus(4); } if(!ObjectUtils.isEmpty(createByName)&&createByName.equals("管理员")){ partyBuildingActivityVO1.setIsPerson(0); }else{ partyBuildingActivityVO1.setIsPerson(1); } }); } @@ -414,6 +430,23 @@ return R.ok(); } /** * 创建党员活动 小程序创建党员活动 * * @param comPbActivityDTO 创建内容 * @return 创建结果 */ @Override public R addActivityApplets(ComPbActivityDTO comPbActivityDTO) { ComPbActivityDO comPbActivityDO=new ComPbActivityDO(); BeanUtils.copyProperties(comPbActivityDTO,comPbActivityDO); int insert = comBpActivityDAO.insert(comPbActivityDO); if (insert>0) { return R.ok(); } return R.fail(); } public static void main(String[] args) { DateFormat formatTo = new SimpleDateFormat("M月d ahh:mm"); String format = formatTo.format(new Date());
