springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml
@@ -23,8 +23,61 @@ </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 beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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$/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/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/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/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" /> </list> <option name="SHOW_DIALOG" value="false" /> <option name="HIGHLIGHT_CONFLICTS" value="true" /> @@ -404,7 +457,7 @@ <workItem from="1610934956567" duration="1325000" /> <workItem from="1610939265133" duration="8588000" /> <workItem from="1610956684718" duration="7037000" /> <workItem from="1611019208339" duration="48002000" /> <workItem from="1611019208339" duration="76128000" /> </task> <servers /> </component> @@ -428,26 +481,30 @@ <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="1611134545795"> <state x="574" y="118" key="#com.intellij.ide.util.MemberChooser" timestamp="1611223757025"> <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="1611134545795" /> <state x="574" y="118" key="#com.intellij.ide.util.MemberChooser/0.0.1536.824@0.0.1536.824" timestamp="1611223757025" /> <state x="405" y="335" key="#com.intellij.refactoring.move.MoveHandler.SelectRefactoringDialog" timestamp="1606099594079"> <screen x="0" y="0" width="1536" height="824" /> </state> <state x="405" y="335" key="#com.intellij.refactoring.move.MoveHandler.SelectRefactoringDialog/0.0.1536.824@0.0.1536.824" timestamp="1606099594079" /> <state x="0" y="0" key="#com.intellij.refactoring.rename.AutomaticRenamingDialog" timestamp="1609398409699"> <state x="510" y="279" width="515" height="272" key="#com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesDialog.classes" timestamp="1611213242838"> <screen x="0" y="0" width="1536" height="824" /> </state> <state x="0" y="0" key="#com.intellij.refactoring.rename.AutomaticRenamingDialog/0.0.1536.824@0.0.1536.824" timestamp="1609398409699" /> <state x="510" y="279" width="515" height="272" key="#com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesDialog.classes/0.0.1536.824@0.0.1536.824" timestamp="1611213242838" /> <state x="0" y="0" key="#com.intellij.refactoring.rename.AutomaticRenamingDialog" timestamp="1611214700095"> <screen x="0" y="0" width="1536" height="824" /> </state> <state x="0" y="0" key="#com.intellij.refactoring.rename.AutomaticRenamingDialog/0.0.1536.824@0.0.1536.824" timestamp="1611214700095" /> <state x="499" y="159" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog" timestamp="1608878808962"> <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="562" height="466" key="DebuggerActiveHint" timestamp="1611129282241"> <state width="562" height="466" key="DebuggerActiveHint" timestamp="1611218487797"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="562" height="466" key="DebuggerActiveHint/0.0.1536.824@0.0.1536.824" timestamp="1611129282241" /> <state width="562" height="466" key="DebuggerActiveHint/0.0.1536.824@0.0.1536.824" timestamp="1611218487797" /> <state x="93" y="93" width="1350" height="638" key="DiffContextDialog" timestamp="1609316182000"> <screen x="0" y="0" width="1536" height="824" /> </state> @@ -456,54 +513,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="1610606590056" /> <state width="1031" height="448" key="GridCell.Tab.0.bottom" timestamp="1611134915429"> <state width="1031" height="448" key="GridCell.Tab.0.bottom" timestamp="1611225277465"> <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="1611134915429" /> <state width="1031" height="448" key="GridCell.Tab.0.center" timestamp="1611134915429"> <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"> <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="1611134915429" /> <state width="1031" height="448" key="GridCell.Tab.0.left" timestamp="1611134915429"> <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"> <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="1611134915429" /> <state width="1031" height="448" key="GridCell.Tab.0.right" timestamp="1611134915429"> <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"> <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="1611134915429" /> <state width="1031" height="448" key="GridCell.Tab.1.bottom" timestamp="1611134915429"> <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"> <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="1611134915429" /> <state width="1031" height="448" key="GridCell.Tab.1.center" timestamp="1611134915429"> <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"> <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="1611134915429" /> <state width="1031" height="448" key="GridCell.Tab.1.left" timestamp="1611134915429"> <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"> <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="1611134915429" /> <state width="1031" height="448" key="GridCell.Tab.1.right" timestamp="1611134915429"> <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"> <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="1611134915429" /> <state width="1031" height="448" key="GridCell.Tab.2.bottom" timestamp="1611134915430"> <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"> <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="1611134915430" /> <state width="1031" height="448" key="GridCell.Tab.2.center" timestamp="1611134915429"> <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"> <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="1611134915429" /> <state width="1031" height="448" key="GridCell.Tab.2.left" timestamp="1611134915429"> <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"> <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="1611134915429" /> <state width="1031" height="448" key="GridCell.Tab.2.right" timestamp="1611134915430"> <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"> <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="1611134915430" /> <state width="1031" height="448" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1611225277466" /> <state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1610611848124"> <screen x="0" y="0" width="1536" height="824" /> </state> @@ -512,10 +569,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="1611020456179"> <state width="498" height="540" key="SwitcherDM" timestamp="1611223998805"> <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="1611020456179" /> <state width="498" height="540" key="SwitcherDM/0.0.1536.824@0.0.1536.824" timestamp="1611223998805" /> <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> @@ -524,10 +581,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="1611137408745"> <state x="233" y="42" width="921" height="782" key="find.popup" timestamp="1611225457014"> <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="1611137408745" /> <state x="233" y="42" width="921" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1611225457014" /> <state width="600" height="428" key="javadoc.popup" timestamp="1610005781618"> <screen x="0" y="0" width="1536" height="824" /> </state> @@ -544,10 +601,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="1611126449254"> <state x="431" y="145" width="672" height="678" key="search.everywhere.popup" timestamp="1611221223000"> <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="1611126449254" /> <state x="431" y="145" width="672" height="678" key="search.everywhere.popup/0.0.1536.824@0.0.1536.824" timestamp="1611221223000" /> </component> <component name="XDebuggerManager"> <pin-to-top-manager> springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
@@ -13,6 +13,7 @@ import com.panzhihua.common.validated.PageGroup; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; @@ -109,11 +110,16 @@ } @ApiOperation(value = "活动人员列表",response = ActivitySignVO.class) @ApiImplicitParam(name ="id",value = "社区活动主键",required = true) @ApiImplicitParams ({@ApiImplicitParam(name ="type",value = "人员类型 1 普通居民 2 志愿者",required = true), @ApiImplicitParam(name ="id",value = "社区活动主键",required = true)}) @GetMapping("listactivitysign") public R listActivitySign(@RequestParam("id") Long id){ public R listActivitySign(@RequestParam("id") Long id,@RequestParam("type") Integer type){ ActivitySignVO activitySignVO=new ActivitySignVO(); activitySignVO.setActivityId(id); if (null==type||0==type||type>2) { return R.fail("人员类型错误"); } activitySignVO.setType(type); return communityService.listActivitySign(activitySignVO); }
@@ -2,10 +2,14 @@ import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.model.dtos.PageDTO; 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.NoticeReadDTO; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.advertisement.ComOpsAdvVO; import com.panzhihua.common.model.vos.community.ComActEasyPhotoCommentVO; import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO; import com.panzhihua.common.model.vos.community.ComActMicroWishVO; import com.panzhihua.common.model.vos.user.NoticeUnReadVO; @@ -47,11 +51,12 @@ if (null==communityId||0==communityId) { return R.fail("用户未绑定社区"); } Long userId = loginUserInfo.getUserId(); // Long userId = loginUserInfo.getUserId(); comActEasyPhotoVO.setCommunityId(communityId); comActEasyPhotoVO.setStatus(4); comActEasyPhotoVO.setLogInUserId(userId); return communityService.pageEasyPhoto(comActEasyPhotoVO); // comActEasyPhotoVO.setSponsorId(userId); // return communityService.pageEasyPhoto(comActEasyPhotoVO); return communityService.pageEasyPhotoApplets(comActEasyPhotoVO); } @ApiOperation("上传随手拍") @@ -77,6 +82,27 @@ return communityService.detailEasyPhoto(id,userId); } @ApiOperation(value = "随手拍--评论--分页查询",response = ComActEasyPhotoCommentVO.class ) @PostMapping("pagecomacteasyphotocomment") public R pageComActEasyPhotoComment (@RequestBody PageComActEasyPhotoCommentDTO pageComActEasyPhotoCommentDTO){ pageComActEasyPhotoCommentDTO.setUserId(this.getUserId()); return communityService.pageComActEasyPhotoComment(pageComActEasyPhotoCommentDTO); } @ApiOperation(value = "随手拍--评论--新增评论") @PostMapping("comacteasyphotocomment") public R addComActEasyPhotoComment (@RequestBody ComActEasyPhotoCommentDTO comActEasyPhotoCommentDTO){ comActEasyPhotoCommentDTO.setUserId(this.getUserId()); return communityService.addComActEasyPhotoComment(comActEasyPhotoCommentDTO); } @ApiOperation(value = "随手拍--评论--点赞/取消点赞" ) @PostMapping("commentsign") public R commentSign (@RequestBody ComActEasyPhotoCommentUserDTO comActEasyPhotoCommentUserDTO){ comActEasyPhotoCommentUserDTO.setUserId(this.getUserId()); return communityService.commentSign(comActEasyPhotoCommentUserDTO); } @ApiOperation("点赞/取消点赞随手拍") @PutMapping("easyphoto") public R putEasyPhoto (@RequestBody ComActEasyPhotoVO comActEasyPhotoVO){ springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
@@ -220,10 +220,11 @@ @PostMapping("pageeasyphoto") public R pageEasyPhoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) { Long userId = this.getUserId(); comActEasyPhotoVO.setUserId(userId); comActEasyPhotoVO.setSponsorId(userId); comActEasyPhotoVO.setLogInUserId(userId); comActEasyPhotoVO.setCommunityId(null); return communityService.pageEasyPhoto(comActEasyPhotoVO); // return communityService.pageEasyPhoto(comActEasyPhotoVO); return communityService.pageEasyPhotoApplets(comActEasyPhotoVO); } @ApiOperation(value = "分页查询我的微心愿",response = ComActMicroWishVO.class ) springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActEasyPhotoCommentDTO.java
New file @@ -0,0 +1,26 @@ package com.panzhihua.common.model.dtos.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-21 15:38 **/ @Data @ApiModel("随手拍评论新增") public class ComActEasyPhotoCommentDTO { @ApiModelProperty("随手拍主键id") private Long id; @ApiModelProperty("评论内容") private String comment; @ApiModelProperty(value = "评论者id",hidden = true) private Long userId; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActEasyPhotoCommentUserDTO.java
New file @@ -0,0 +1,25 @@ package com.panzhihua.common.model.dtos.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-21 15:06 **/ @Data @ApiModel("评论点赞 、取消点赞") public class ComActEasyPhotoCommentUserDTO { @ApiModelProperty(value = "评论主键",example = "1") private Long id; @ApiModelProperty(value = "操作类型 1 点赞 2 取消点赞",example = "2") private Integer type; @ApiModelProperty(value = "操作用户",hidden = true) private Long userId; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComActEasyPhotoCommentDTO.java
New file @@ -0,0 +1,28 @@ package com.panzhihua.common.model.dtos.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-21 14:51 **/ @Data @ApiModel("随手拍评论分页") public class PageComActEasyPhotoCommentDTO { @ApiModelProperty(value = "分页-当前页数",example = "1") private Long pageNum; @ApiModelProperty(value = "分页-每页记录数",example = "10") private Long pageSize; @ApiModelProperty(value = "随手拍主键") private Long id; @ApiModelProperty(value = "登录用户",hidden = true) private Long userId; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ComPbServiceTeamDTO.java
New file @@ -0,0 +1,41 @@ package com.panzhihua.common.model.dtos.partybuilding; import com.panzhihua.common.validated.AddGroup; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotBlank; import java.util.Date; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 服务团队新增 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2021-01-21 17:42 **/ @Data @ApiModel("服务团队") public class ComPbServiceTeamDTO { @ApiModelProperty("id") private Long id; @ApiModelProperty("姓名") @NotBlank(groups = AddGroup.class,message = "姓名不能为空") private String name; @ApiModelProperty("职位") @NotBlank(groups = AddGroup.class,message = "职位不能为空") private String job; @ApiModelProperty("照片") @NotBlank(groups = AddGroup.class,message = "照片不能为空") private String url; @ApiModelProperty("create_at") private Date createAt; @ApiModelProperty("社区id") private Long communityId; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/PageComPbServiceTeamDTO.java
New file @@ -0,0 +1,34 @@ package com.panzhihua.common.model.dtos.partybuilding; import com.panzhihua.common.validated.AddGroup; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotBlank; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 分页查询团队成员 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2021-01-21 18:05 **/ @Data @ApiModel("分页查询团队成员") public class PageComPbServiceTeamDTO { @ApiModelProperty(value = "分页-当前页数",example = "1",required = true) private Long pageNum; @ApiModelProperty(value = "分页-每页记录数",example = "10",required = true) private Long pageSize; @ApiModelProperty("姓名") private String name; @ApiModelProperty(value = "社区id",hidden = true) private Long communityId; @ApiModelProperty("职位") private String job; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ActivitySignVO.java
@@ -28,8 +28,10 @@ private String createAt; @ApiModelProperty("人员头像") private String imageUrl; @ApiModelProperty(value = "人员头像",hidden = true) @ApiModelProperty(value = "是否是志愿者",hidden = true) private Integer isVolunteer; @ApiModelProperty(value = "列表人员类型 1 普通居民 2 志愿者",hidden = true) private Integer type; @ApiModelProperty("人员主键") private Long userId; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java
@@ -116,9 +116,12 @@ @ApiModelProperty(value = "当前登录者id",hidden = true) private Integer userId; @ApiModelProperty("活动参加人员集合") @ApiModelProperty("活动参加普通人员集合") private List<ActivitySignVO>activitySignVOList; @ApiModelProperty("活动参加志愿者人员集合") private List<ActivitySignVO>activityVolunteerList; @ApiModelProperty("活动类型 1 支援者活动 2 普通社区活动 3 党建活动") private Integer type;
New file @@ -0,0 +1,46 @@ 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-21 14:03 **/ @Data @ApiModel("随手拍评论") public class ComActEasyPhotoCommentVO { @ApiModelProperty("id") private Long id; @ApiModelProperty("随手拍主键") private Long easyPhotoId; @ApiModelProperty("varchar(500)") private String comment; @ApiModelProperty("评论者id") private Long userId; @ApiModelProperty("评论时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createAt; @ApiModelProperty("评论人名字") private String name; @ApiModelProperty("评论人头像") private String url; @ApiModelProperty("点赞数量") private Integer num; @ApiModelProperty("会否已经点赞 1 是 0 否") private Integer haveSign; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java
@@ -10,6 +10,7 @@ import javax.validation.constraints.Min; import javax.validation.constraints.NotBlank; import java.util.Date; import java.util.List; /** * @program: springcloud_k8s_panzhihuazhihuishequ @@ -88,6 +89,9 @@ @ApiModelProperty("点赞数量") private Integer giveThumbsUpNum; @ApiModelProperty("评论数量") private Integer commentNum; @ApiModelProperty("是否匿名发布 0 否 1 是") @Min(value = 0,groups = {AddGroup.class},message = "是否匿名发布不能为空") private Integer isHide; @@ -119,4 +123,5 @@ @ApiModelProperty(value = "后台登录人员id",hidden = true) private Long backUserId; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/ComPbServiceTeamVO.java
New file @@ -0,0 +1,38 @@ package com.panzhihua.common.model.vos.partybuilding; 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-21 18:11 **/ @Data @ApiModel("服务团队人员") public class ComPbServiceTeamVO { @ApiModelProperty("id") private Long id; @ApiModelProperty("姓名") private String name; @ApiModelProperty("职位") private String job; @ApiModelProperty("照片") private String url; @ApiModelProperty("create_at") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createAt; @ApiModelProperty("社区id") private Long communityId; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.java
@@ -77,8 +77,11 @@ @ApiModelProperty("取消原因") private String cancelReason; @ApiModelProperty("发布人") private String createBy; @ApiModelProperty("发布人id") private Long createBy; @ApiModelProperty("发布人名字") private String createByName; @ApiModelProperty("社区id") private Long communityId; springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -2,8 +2,10 @@ 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.user.PageFeedBackDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.SystemmanagementConfigVO; import com.panzhihua.common.model.vos.community.*; @@ -648,4 +650,43 @@ */ @PostMapping("deleteotherbuild") R deleteOtherbuild(@RequestParam("id")Long id); /** * 社区后台分页查询社区活动 * @param comActActivityVO 查询参数 * @return 返回结果 */ @PostMapping("pageactivitycommunityback") R pageActivityCommunityBack(@RequestBody ComActActivityVO comActActivityVO); /** * 小程序分页查询随手拍 * @param comActEasyPhotoVO 查询参数 * @return 返回结果 */ @PostMapping("pageeasyphotoapplets") R pageEasyPhotoApplets(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO); /** * 随手拍评论分页查询 * @param pageComActEasyPhotoCommentDTO 查询参数 * @return 查询结果 */ @PostMapping("pagecomacteasyphotocomment") R pageComActEasyPhotoComment(@RequestBody PageComActEasyPhotoCommentDTO pageComActEasyPhotoCommentDTO); /** * 评论点赞/取消点赞 * @param comActEasyPhotoCommentUserDTO 操作 * @return 操作结果 */ @PostMapping("commentsign") R commentSign(@RequestBody ComActEasyPhotoCommentUserDTO comActEasyPhotoCommentUserDTO); /** * 随手拍--评论--新增评论 * @param comActEasyPhotoCommentDTO 新增内容 * @return 新增结果 */ @PostMapping("addcomacteasyphotocomment") R addComActEasyPhotoComment(@RequestBody ComActEasyPhotoCommentDTO comActEasyPhotoCommentDTO); } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java
@@ -1,6 +1,8 @@ package com.panzhihua.common.service.partybuilding; import com.panzhihua.common.model.dtos.partybuilding.ActivitySignUpDTO; import com.panzhihua.common.model.dtos.partybuilding.ComPbServiceTeamDTO; import com.panzhihua.common.model.dtos.partybuilding.PageComPbServiceTeamDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComActActivityVO; import com.panzhihua.common.model.vos.partybuilding.*; @@ -282,4 +284,35 @@ */ @PostMapping("/partybuildIng/timedtaskpartybuildingactivityall") R timedTaskPartyBuildingActivityAll(); /** * 新增服务团队人员 * @param comPbServiceTeamDTO 新增内容 * @return 新增结果 */ @PostMapping("/partybuildIng/addserviceteam") R addServiceTeam(@RequestBody ComPbServiceTeamDTO comPbServiceTeamDTO); /** * 编辑团队人员 * @param comPbServiceTeamDTO 编辑内容 * @return 编辑结果 */ @PostMapping("/partybuildIng/putserviceteam") R putServiceTeam(@RequestBody ComPbServiceTeamDTO comPbServiceTeamDTO); /** * 删除服务团队人员 * @param comPbServiceTeamDTO 删除主键 * @return 删除结果 */ @PostMapping("/partybuildIng/deleteserviceteam") R deleteServiceTeam(@RequestBody ComPbServiceTeamDTO comPbServiceTeamDTO); /** * 分页查询服务团队成员 * @param pageComPbServiceTeamDTO 查询参数 * @return 查询结果 */ @PostMapping("/partybuildIng/pageserviceteam") R pageServiceTeam(@RequestBody PageComPbServiceTeamDTO pageComPbServiceTeamDTO); } springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/dtos/community/ComActEasyPhotoCommentDTO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/dtos/community/ComActEasyPhotoCommentUserDTO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/dtos/community/PageComActEasyPhotoCommentDTO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/dtos/partybuilding/ComPbServiceTeamDTO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/dtos/partybuilding/PageComPbServiceTeamDTO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/community/ActivitySignVO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/community/ComActActivityVO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/community/ComActEasyPhotoCommentVO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/partybuilding/ComPbServiceTeamVO.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/CommunityActivityApi.java
@@ -86,7 +86,8 @@ public R pageActivity(@RequestBody ComActActivityVO ComActActivityVO) { Long communityId = this.getCommunityId(); ComActActivityVO.setCommunityId(communityId); return communityService.pageActivity(ComActActivityVO); // return communityService.pageActivity(ComActActivityVO); return communityService.pageActivityCommunityBack(ComActActivityVO); } @ApiOperation(value = "发布活动") springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java
@@ -6,6 +6,8 @@ import com.panzhihua.common.constants.FtpConstants; import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.interfaces.OperLog; import com.panzhihua.common.model.dtos.partybuilding.ComPbServiceTeamDTO; 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.*; @@ -14,33 +16,22 @@ import com.panzhihua.common.service.partybuilding.PartyBuildingService; import com.panzhihua.common.service.user.UserService; import com.panzhihua.common.utlis.SFTPUtil; import com.panzhihua.common.validated.AddGroup; import com.panzhihua.community_backstage.listen.PartyBuildingMemberExcelListen; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.springframework.core.io.FileSystemResource; import org.springframework.core.io.InputStreamResource; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.util.ObjectUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.commons.CommonsMultipartFile; import javax.activation.MimetypesFileTypeMap; import javax.annotation.Resource; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.*; import java.net.URLEncoder; import java.util.ArrayList; import java.util.Date; import java.io.IOException; import java.io.InputStream; import java.util.List; import java.util.UUID; /** * @program: springcloud_k8s_panzhihuazhihuishequ @@ -162,7 +153,11 @@ @ApiOperation(value = "新增党员活动") @PostMapping("addactivity") public R addActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO) { partyBuildingActivityVO.setCommunityId(this.getCommunityId()); LoginUserInfoVO loginUserInfo = this.getLoginUserInfo(); Long communityId = loginUserInfo.getCommunityId(); Long userId = loginUserInfo.getUserId(); partyBuildingActivityVO.setCommunityId(communityId); partyBuildingActivityVO.setCreateBy(userId); return partyBuildingService.addactivity(partyBuildingActivityVO); } @@ -347,21 +342,40 @@ } return partyBuildingService.deleteDynUser(id); } public String getBinaryStrFromByte(byte b){ String result =""; byte a = b; ; for (int i = 0; i < 8; i++){ byte c=a; a=(byte)(a>>1);//每移一位如同将10进制数除以2并去掉余数。 a=(byte)(a<<1); if(a==c){ result="0"+result; }else{ result="1"+result; @ApiOperation(value = "新增服务团队人员") @PostMapping("serviceteam") public R addServiceTeam(@RequestBody @Validated(AddGroup.class) ComPbServiceTeamDTO comPbServiceTeamDTO) { comPbServiceTeamDTO.setCommunityId(this.getCommunityId()); return partyBuildingService.addServiceTeam(comPbServiceTeamDTO); } a=(byte)(a>>1); @ApiOperation(value = "编辑服务团队人员") @PutMapping("serviceteam") public R putServiceTeam(@RequestBody ComPbServiceTeamDTO comPbServiceTeamDTO) { Long id = comPbServiceTeamDTO.getId(); if (null==id||0==id) { return R.fail("主键不能为空"); } return result; comPbServiceTeamDTO.setCommunityId(null); return partyBuildingService.putServiceTeam(comPbServiceTeamDTO); } @ApiOperation(value = "删除服务团队人员") @DeleteMapping("serviceteam") public R deleteServiceTeam(@RequestBody ComPbServiceTeamDTO comPbServiceTeamDTO) { Long id = comPbServiceTeamDTO.getId(); if (null==id||0==id) { return R.fail("主键不能为空"); } return partyBuildingService.deleteServiceTeam(comPbServiceTeamDTO); } @ApiOperation(value = "分页查询服务团队成员",response = ComPbServiceTeamVO.class) @PostMapping("pageserviceteam") public R pageServiceTeam(@RequestBody PageComPbServiceTeamDTO pageComPbServiceTeamDTO) { pageComPbServiceTeamDTO.setCommunityId(this.getCommunityId()); return partyBuildingService.pageServiceTeam(pageComPbServiceTeamDTO); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
@@ -1,11 +1,15 @@ package com.panzhihua.service_community.api; import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.panzhihua.common.exceptions.ServiceException; 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.user.PageFeedBackDTO; import com.panzhihua.common.model.dtos.partybuilding.ComPbServiceTeamDTO; import com.panzhihua.common.model.dtos.partybuilding.PageComPbServiceTeamDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.SystemmanagementConfigVO; import com.panzhihua.common.model.vos.community.*; @@ -183,6 +187,16 @@ } /** * 社区后台分页查询社区活动 * @param comActActivityVO 查询参数 * @return 返回结果 */ @PostMapping("pageactivitycommunityback") public R pageActivityCommunityBack(@RequestBody ComActActivityVO comActActivityVO){ return comActActivityService.pageActivityCommunityBack(comActActivityVO); } /** * 发布活动 * * @param comActActivityVO 主键id 发布时间 @@ -230,13 +244,28 @@ activitySignVO.setActivityId(id); R r = comActActivityService.listActivitySign(activitySignVO); if (R.isOk(r)) { List<ActivitySignVO> activitySignVOS = (List<ActivitySignVO>) r.getData(); int size = activitySignVOS.size(); List<ActivitySignVO> activitySignVOS = JSONArray.parseArray(JSONArray.toJSONString( r.getData()),ActivitySignVO.class); if (!ObjectUtils.isEmpty(activitySignVOS)) { List<ActivitySignVO> collect = activitySignVOS.stream().filter(activitySignVO1 -> activitySignVO1.getIsVolunteer() == 1).collect(Collectors.toList()); if (!ObjectUtils.isEmpty(collect)) { int size = collect.size(); if (size>=6) { comActActivityVO.setActivitySignVOList(activitySignVOS.subList(0,6)); comActActivityVO.setActivityVolunteerList(collect.subList(0,6)); } else { comActActivityVO.setActivitySignVOList(activitySignVOS); comActActivityVO.setActivityVolunteerList(collect); } } List<ActivitySignVO> collect1 = activitySignVOS.stream().filter(activitySignVO1 -> activitySignVO1.getIsVolunteer() == 0).collect(Collectors.toList()); if (!ObjectUtils.isEmpty(collect1)) { int size = collect1.size(); if (size>=6) { comActActivityVO.setActivitySignVOList(collect1.subList(0,6)); } else { comActActivityVO.setActivitySignVOList(collect1); } } } } comActActivityVO.setIntegral(0); return R.ok(comActActivityVO); @@ -1070,5 +1099,47 @@ return comMngStructOtherBuildService.deleteOtherbuild(id); } /** * 小程序分页查询随手拍 * @param comActEasyPhotoVO 查询参数 * @return 返回结果 */ @PostMapping("pageeasyphotoapplets") public R pageEasyPhotoApplets(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO){ return comActEasyPhotoService.pageEasyPhotoApplets(comActEasyPhotoVO); } /** * 随手拍评论分页查询 * @param pageComActEasyPhotoCommentDTO 查询参数 * @return 查询结果 */ @PostMapping("pagecomacteasyphotocomment") public R pageComActEasyPhotoComment(@RequestBody PageComActEasyPhotoCommentDTO pageComActEasyPhotoCommentDTO){ return comActEasyPhotoService.pageComActEasyPhotoComment(pageComActEasyPhotoCommentDTO); } /** * 评论点赞/取消点赞 * @param comActEasyPhotoCommentUserDTO 操作 * @return 操作结果 */ @PostMapping("commentsign") public R commentSign(@RequestBody ComActEasyPhotoCommentUserDTO comActEasyPhotoCommentUserDTO){ return comActEasyPhotoService.commentSign(comActEasyPhotoCommentUserDTO); } /** * 随手拍--评论--新增评论 * @param comActEasyPhotoCommentDTO 新增内容 * @return 新增结果 */ @PostMapping("addcomacteasyphotocomment") public R addComActEasyPhotoComment(@RequestBody ComActEasyPhotoCommentDTO comActEasyPhotoCommentDTO){ return comActEasyPhotoService.addComActEasyPhotoComment(comActEasyPhotoCommentDTO); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActSignDAO.java
@@ -46,6 +46,9 @@ "<if test='identity != null and identity.trim() != "" and identity==3'>" + "AND a.is_volunteer=1 \n" + " </if> " + "<if test='type != null and type != 0'>" + "AND a.is_volunteer=#{type}-1 \n" + " </if> " + " order by a.create_at desc "+ "</script>") List<ActivitySignVO> listActivitySign(ActivitySignVO activitySignVO); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java
@@ -69,7 +69,7 @@ "AND a.begin_at <![CDATA[ >= ]]> #{comActActivityVO.beginAt} AND a.end_at <![CDATA[ <= ]]> #{comActActivityVO.endAt} \n" + " </if> " + " group by a.id "+ " order by a.publish_at desc "+ " order by a.status asc,a.publish_at desc "+ "</script>") IPage<ComActActivityVO> pageActivity( Page page, @Param("comActActivityVO") ComActActivityVO comActActivityVO); @@ -141,4 +141,77 @@ @Update("update com_act_activity set `status`=(if(DATEDIFF(SYSDATE(),end_at)>=0,5,4)) where `status`=3 and TIMESTAMPDIFF(HOUR,SYSDATE(),begin_at)<=0") int updateStatusToBeginActiveOrEnd(); @Select("<script> " + "select t.* from (\n" + "SELECT \n" + "a.id,\n" + "a.activity_name,\n" + "u.`name` sponsorName,\n" + "a.activity_addr,\n" + "a.participant_max,\n" + "count(if(s.is_volunteer=1,null,s.id))participant_now,\n"+ "a.volunteer_max,\n" + "count(if(s.is_volunteer=1,s.id,null))volunteer_now,\n"+ "a.`status`,\n" + "a.publish_at,\n" + "a.begin_at,\n" + "a.end_at,\n" + "a.sign_up_begin,\n" + "a.sign_up_end\n" + "FROM\n" + "\tcom_act_activity a \n" + "\tLEFT JOIN sys_user u on a.sponsor_id=u.user_id\n" + "\tLEFT JOIN com_act_act_sign s on a.id=s.activity_id\n" + "WHERE\n" + "\t a.`status` = 1 and a.community_id=#{comActActivityVO.communityId}\n" + "<if test='comActActivityVO.activityName != null and comActActivityVO.activityName !=""'>" + "\tand a.activity_name LIKE concat( #{comActActivityVO.activityName}, '%' ) \n" + " </if> " + "<if test='comActActivityVO.status != null and comActActivityVO.status !=0 and comActActivityVO.status !=1'>" + "AND a.`status` = 99 \n" + " </if> " + "<if test='comActActivityVO.beginAt != null '>" + "AND a.begin_at <![CDATA[ >= ]]> #{comActActivityVO.beginAt} AND a.end_at <![CDATA[ <= ]]> #{comActActivityVO.endAt} \n" + " </if> " + "group by a.id\n" + "\t\n" + "\tunion all\n" + "select t1.* from (\n"+ "\t\n" + "\tSELECT \n" + "a.id,\n" + "a.activity_name,\n" + "u.`name` sponsorName,\n" + "a.activity_addr,\n" + "a.participant_max,\n" + "count(if(s.is_volunteer=1,null,s.id))participant_now,\n"+ "a.volunteer_max,\n" + "count(if(s.is_volunteer=1,s.id,null))volunteer_now,\n"+ "a.`status`,\n" + "a.publish_at,\n" + "a.begin_at,\n" + "a.end_at,\n" + "a.sign_up_begin,\n" + "a.sign_up_end\n" + "FROM\n" + "\tcom_act_activity a \n" + "\tLEFT JOIN sys_user u on a.sponsor_id=u.user_id\n" + "\tLEFT JOIN com_act_act_sign s on a.id=s.activity_id\n" + "WHERE\n" + "\t a.`status` != 1 and a.community_id=#{comActActivityVO.communityId}\n" + "<if test='comActActivityVO.activityName != null and comActActivityVO.activityName !=""'>" + "\tand a.activity_name LIKE concat( #{comActActivityVO.activityName}, '%' ) \n" + " </if> " + "<if test='comActActivityVO.status != null and comActActivityVO.status !=0 '>" + "AND a.`status` = #{comActActivityVO.status} \n" + " </if> " + "<if test='comActActivityVO.beginAt != null '>" + "AND a.begin_at <![CDATA[ >= ]]> #{comActActivityVO.beginAt} AND a.end_at <![CDATA[ <= ]]> #{comActActivityVO.endAt} \n" + " </if> " + " group by a.id order by a.publish_at desc)t1 )t"+ "</script>") IPage<ComActActivityVO> pageActivityCommunityBack(Page page, @Param("comActActivityVO") ComActActivityVO comActActivityVO); @Update("update com_act_activity set `status`=4 where `status`=3 and TIMESTAMPDIFF(HOUR,SYSDATE(),sign_up_end)<=0") int updateStatusToBeginAfterSingEnd(); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoCommentDAO.java
New file @@ -0,0 +1,52 @@ package com.panzhihua.service_community.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.panzhihua.common.model.dtos.community.PageComActEasyPhotoCommentDTO; import com.panzhihua.common.model.dtos.partybuilding.PageComPbServiceTeamDTO; import com.panzhihua.common.model.vos.community.ComActEasyPhotoCommentVO; import com.panzhihua.service_community.model.dos.ComActEasyPhotoCommentDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 随手拍评论 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2021-01-21 14:45 **/ @Mapper public interface ComActEasyPhotoCommentDAO extends BaseMapper<ComActEasyPhotoCommentDO> { // @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 * from (" + "SELECT \n" + "m.id,\n" + "m.`comment`,\n" + "e.`name`,\n" + "e.image_url url,\n" + "m.create_at,\n" + "if(u1.id is null,0,1)haveSign,\n" + "COUNT(u.id)num\n" + "FROM\n" + "com_act_easy_photo_comment m \n" + "JOIN sys_user e on m.user_id=e.user_id\n" + "LEFT JOIN com_act_easy_photo_comment_user u on m.id=u.easy_photo_comment_id\n" + "LEFT JOIN com_act_easy_photo_comment_user u1 on m.id=u1.easy_photo_comment_id and u1.user_id=#{comActEasyPhotoCommentDTO.userId}\n" + "where m.easy_photo_id=#{comActEasyPhotoCommentDTO.id} " + "GROUP BY m.id\n" + " )t order by t.num desc") IPage<ComActEasyPhotoCommentVO> pageComActEasyPhotoComment(Page page, @Param("comActEasyPhotoCommentDTO") PageComActEasyPhotoCommentDTO pageComActEasyPhotoCommentDTO); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoCommentUserDAO.java
New file @@ -0,0 +1,26 @@ package com.panzhihua.service_community.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.panzhihua.service_community.model.dos.ComActEasyPhotoCommentUserDO; import org.apache.ibatis.annotations.Mapper; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 随手拍评论点赞 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2021-01-21 14:00 **/ @Mapper public interface ComActEasyPhotoCommentUserDAO extends BaseMapper<ComActEasyPhotoCommentUserDO> { // @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/ComActEasyPhotoDAO.java
@@ -32,6 +32,7 @@ "su.`name` handler_name,\n" + "p.`status`,\n" + "p.`detail`,\n" + "p.`is_need_feed_back`,\n" + "p.`photo_path_list`,\n" + "p.create_at,\n" + "p.feedback_at,\n" + @@ -86,6 +87,7 @@ "su.`name` handler_name,\n" + "p.`status`,\n" + "p.`detail`,\n" + "p.`is_need_feed_back`,\n" + "p.`photo_path_list`,\n" + "p.create_at,\n" + "p.feedback_at,\n" + @@ -142,6 +144,7 @@ "u.`image_url`,\n" + "u.phone,\n" + "p.detail,\n" + "p.is_need_feed_back,\n" + "p.examine_at,\n" + "p.status,\n" + "p.reject_reason,\n" + @@ -185,4 +188,44 @@ "GROUP BY\n" + "p.community_id") List<TodoEventsVO> selectNeedToDo(@Param("communityId") Long communityId, @Param("userId") Long userId); @Select("<script> " + "SELECT\n" + "p.id,\n" + "u.`name` sponsor_name,\n" + "u.phone sponsor_phone,\n" + "count(pu.id)giveThumbsUpNum,\n" + "count(c.id)commentNum,\n" + "u.image_url,\n" + "p.happen_addr,\n" + "su.`name` handler_name,\n" + "p.`status`,\n" + "p.`detail`,\n" + "p.`is_need_feed_back`,\n" + "p.`photo_path_list`,\n" + "p.create_at,\n" + "p.feedback_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" + "left join com_act_easy_photo_user pu ON p.id = pu.easy_photo_id \n" + "left JOIN sys_user su ON p.handler_id = su.user_id \n" + "left JOIN com_act_easy_photo_comment c ON p.id = c.easy_photo_id \n" + " <where>" + "<if test='comActEasyPhotoVO.communityId != null and comActEasyPhotoVO.communityId != 0'>" + " and p.community_id=#{comActEasyPhotoVO.communityId} " + " </if> " + "<if test='comActEasyPhotoVO.status != null and comActEasyPhotoVO.status!=0' >" + "AND p.`status` = #{comActEasyPhotoVO.status} \n" + " </if> " + "<if test='comActEasyPhotoVO.sponsorId != null and comActEasyPhotoVO.sponsorId != 0'>" + "AND p.sponsor_id =#{comActEasyPhotoVO.sponsorId} \n" + " </if> " + "group by p.id "+ "order by p.create_at desc "+ " </where>" + "</script>" ) IPage<ComActEasyPhotoVO> pageEasyPhotoApplets(Page page, @Param("comActEasyPhotoVO")ComActEasyPhotoVO comActEasyPhotoVO); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoCommentDO.java
New file @@ -0,0 +1,47 @@ 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-21 14:01 **/ @Data @TableName(value = "com_act_easy_photo_comment") public class ComActEasyPhotoCommentDO implements Serializable { private static final long serialVersionUID = 1L; /** * id */ @TableId(type = IdType.AUTO) private Long id; /** * 随手拍主键 */ private Long easyPhotoId; /** * varchar(500) */ private String comment; /** * 评论者id */ private Long userId; /** * 评论时间 */ @TableField(fill = FieldFill.INSERT) private Date createAt; } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoCommentUserDO.java
New file @@ -0,0 +1,42 @@ 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-21 13:58 **/ @Data @TableName(value = "com_act_easy_photo_comment_user") public class ComActEasyPhotoCommentUserDO implements Serializable { private static final long serialVersionUID = 1L; /** * id */ @TableId(type = IdType.AUTO) private Long id; /** *随手拍评论主键 */ private Long easyPhotoCommentId; /** * 点赞用户主键 */ private Long userId; /** * 点赞时间 */ @TableField(fill = FieldFill.INSERT) private Date createAt; } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActActivityService.java
@@ -96,5 +96,10 @@ * @return 更新结果 */ R timedTaskActActivityAll(); /** * 社区后台分页查询社区活动 * @param comActActivityVO 查询参数 * @return 返回结果 */ R pageActivityCommunityBack(ComActActivityVO comActActivityVO); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActEasyPhotoService.java
@@ -1,6 +1,11 @@ package com.panzhihua.service_community.service; import com.baomidou.mybatisplus.extension.service.IService; 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.partybuilding.ComPbServiceTeamDTO; import com.panzhihua.common.model.dtos.partybuilding.PageComPbServiceTeamDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO; import com.panzhihua.common.model.vos.community.TodoEventsVO; @@ -54,4 +59,30 @@ * @return 待处理事件集合 */ List<TodoEventsVO> selectNeedToDo(Long communityId, Long userId); /** * 小程序分页查询随手拍 * @param comActEasyPhotoVO 查询参数 * @return 返回结果 */ R pageEasyPhotoApplets(ComActEasyPhotoVO comActEasyPhotoVO); /** * 随手拍评论分页查询 * @param pageComActEasyPhotoCommentDTO 查询参数 * @return 查询结果 */ R pageComActEasyPhotoComment(PageComActEasyPhotoCommentDTO pageComActEasyPhotoCommentDTO); /** * 评论点赞/取消点赞 * @param comActEasyPhotoCommentUserDTO 操作 * @return 操作结果 */ R commentSign(ComActEasyPhotoCommentUserDTO comActEasyPhotoCommentUserDTO); /** * 随手拍--评论--新增评论 * @param comActEasyPhotoCommentDTO 新增内容 * @return 新增结果 */ R addComActEasyPhotoComment(ComActEasyPhotoCommentDTO comActEasyPhotoCommentDTO); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
@@ -331,10 +331,33 @@ // 修改进行状态 变为进行中或者已结束 int num2=comActActivityDAO.updateStatusToBeginActiveOrEnd(); log.info("定时任务--修改社区活动进行状态活动数量【{}】",num2); int num3=comActActivityDAO.updateStatusToBeginAfterSingEnd(); log.info("定时任务--报名结束修改社区活动进行状态活动数量【{}】",num3); return R.ok(); } /** * 社区后台分页查询社区活动 * * @param comActActivityVO 查询参数 * @return 返回结果 */ @Override public R pageActivityCommunityBack(ComActActivityVO comActActivityVO) { Page page = new Page<>(); Long pageNum = comActActivityVO.getPageNum(); Long pageSize = comActActivityVO.getPageSize(); if (null==pageNum||0==pageNum) { pageNum = 1l; } if (null==pageSize||0==pageSize) { pageSize = 10l; } page.setSize(pageSize); page.setCurrent(pageNum); IPage<ComActActivityVO> iPage = comActActivityDAO.pageActivityCommunityBack(page, comActActivityVO); return R.ok(iPage); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java
@@ -4,11 +4,21 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.panzhihua.common.model.dtos.community.ComActEasyPhotoCommentDTO; import com.panzhihua.common.model.dtos.community.PageComActEasyPhotoCommentDTO; import com.panzhihua.common.model.dtos.community.ComActEasyPhotoCommentUserDTO; import com.panzhihua.common.model.dtos.partybuilding.ComPbServiceTeamDTO; import com.panzhihua.common.model.dtos.partybuilding.PageComPbServiceTeamDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComActEasyPhotoCommentVO; import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO; import com.panzhihua.common.model.vos.community.TodoEventsVO; import com.panzhihua.service_community.dao.ComActEasyPhotoCommentDAO; import com.panzhihua.service_community.dao.ComActEasyPhotoCommentUserDAO; import com.panzhihua.service_community.dao.ComActEasyPhotoDAO; import com.panzhihua.service_community.dao.ComActEasyPhotoUserDAO; import com.panzhihua.service_community.model.dos.ComActEasyPhotoCommentDO; import com.panzhihua.service_community.model.dos.ComActEasyPhotoCommentUserDO; import com.panzhihua.service_community.model.dos.ComActEasyPhotoDO; import com.panzhihua.service_community.model.dos.ComActEasyPhotoUserDO; import com.panzhihua.service_community.service.ComActEasyPhotoService; @@ -17,6 +27,7 @@ import org.springframework.util.ObjectUtils; import javax.annotation.Resource; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -32,6 +43,10 @@ private ComActEasyPhotoDAO comActEasyPhotoDAO; @Resource private ComActEasyPhotoUserDAO comActEasyPhotoUserDAO; @Resource private ComActEasyPhotoCommentDAO comActEasyPhotoCommentDAO ; @Resource private ComActEasyPhotoCommentUserDAO comActEasyPhotoCommentUserDAO ; /** * 分页查询随手拍 * @@ -88,6 +103,7 @@ } else { comActEasyPhotoVO.setHaveGiveThumbsUp(1); } List<ComActEasyPhotoCommentVO> comActEasyPhotoCommentVOList=new ArrayList<>(); return R.ok(comActEasyPhotoVO); } @@ -201,4 +217,135 @@ List<TodoEventsVO> todoEventsVOS=comActEasyPhotoDAO.selectNeedToDo(communityId,userId); return todoEventsVOS; } /** * 小程序分页查询随手拍 * * @param comActEasyPhotoVO 查询参数 * @return 返回结果 */ @Override public R pageEasyPhotoApplets(ComActEasyPhotoVO comActEasyPhotoVO) { Page page = new Page<>(); Long pageNum = comActEasyPhotoVO.getPageNum(); Long pageSize = comActEasyPhotoVO.getPageSize(); Long userId = comActEasyPhotoVO.getLogInUserId(); if (null==pageNum||0==pageNum) { pageNum = 1l; } if (null==pageSize||0==pageSize) { pageSize = 10l; } page.setSize(pageSize); page.setCurrent(pageNum); IPage<ComActEasyPhotoVO> iPage = comActEasyPhotoDAO.pageEasyPhotoApplets(page, comActEasyPhotoVO); List<ComActEasyPhotoVO> records = iPage.getRecords(); if (!ObjectUtils.isEmpty(records)) { records.forEach(comActEasyPhotoVO1 -> { Long id = comActEasyPhotoVO1.getId(); ComActEasyPhotoUserDO comActEasyPhotoUserDO = comActEasyPhotoUserDAO.selectOne(new QueryWrapper<ComActEasyPhotoUserDO>().lambda().eq(ComActEasyPhotoUserDO::getEasyPhotoId, id).eq(ComActEasyPhotoUserDO::getUserId, userId)); if (ObjectUtils.isEmpty(comActEasyPhotoUserDO)) { comActEasyPhotoVO1.setHaveGiveThumbsUp(0); }else { comActEasyPhotoVO1.setHaveGiveThumbsUp(1); } }); iPage.setRecords(records); } return R.ok(iPage); } /** * 随手拍评论分页查询 * * @param pageComActEasyPhotoCommentDTO 查询参数 * @return 查询结果 */ @Override public R pageComActEasyPhotoComment(PageComActEasyPhotoCommentDTO pageComActEasyPhotoCommentDTO) { Page page = new Page<>(); Long pageNum = pageComActEasyPhotoCommentDTO.getPageNum(); Long pageSize = pageComActEasyPhotoCommentDTO.getPageSize(); if (null==pageNum||0==pageNum) { pageNum = 1l; } if (null==pageSize||0==pageSize) { pageSize = 10l; } page.setSize(pageSize); page.setCurrent(pageNum); IPage<ComActEasyPhotoCommentVO> iPage = comActEasyPhotoCommentDAO.pageComActEasyPhotoComment(page, pageComActEasyPhotoCommentDTO); return R.ok(iPage); } /** * 评论点赞/取消点赞 * * @param comActEasyPhotoCommentUserDTO 操作 * @return 操作结果 */ @Override public R commentSign(ComActEasyPhotoCommentUserDTO comActEasyPhotoCommentUserDTO) { Long id = comActEasyPhotoCommentUserDTO.getId(); if (null==id||0==id) { return R.fail("主键不能为空"); } ComActEasyPhotoCommentDO comActEasyPhotoCommentDO = comActEasyPhotoCommentDAO.selectById(id); if (ObjectUtils.isEmpty(comActEasyPhotoCommentDO)) { return R.fail("评论不存在"); } Integer type = comActEasyPhotoCommentUserDTO.getType(); if (null==type||type.intValue()>2||type.intValue()==0) { return R.fail("操作类型错误"); } Long userId = comActEasyPhotoCommentUserDTO.getUserId(); int num=0; if (type.intValue()==1) { ComActEasyPhotoCommentUserDO comActEasyPhotoCommentUserDO=new ComActEasyPhotoCommentUserDO(); comActEasyPhotoCommentUserDO.setUserId(userId); comActEasyPhotoCommentUserDO.setEasyPhotoCommentId(id); ComActEasyPhotoCommentUserDO actEasyPhotoCommentUserDO = comActEasyPhotoCommentUserDAO.selectOne(new QueryWrapper<ComActEasyPhotoCommentUserDO>().lambda().eq(ComActEasyPhotoCommentUserDO::getUserId, userId).eq(ComActEasyPhotoCommentUserDO::getEasyPhotoCommentId, id)); if (!ObjectUtils.isEmpty(actEasyPhotoCommentUserDO)) { num=1; }else{ num=comActEasyPhotoCommentUserDAO.insert(comActEasyPhotoCommentUserDO); } }else{ num=comActEasyPhotoCommentUserDAO.delete(new QueryWrapper<ComActEasyPhotoCommentUserDO>().lambda().eq(ComActEasyPhotoCommentUserDO::getUserId,userId).eq(ComActEasyPhotoCommentUserDO::getEasyPhotoCommentId,id)); } if (num>0) { return R.ok(); } else { return R.fail(); } } /** * 随手拍--评论--新增评论 * * @param comActEasyPhotoCommentDTO 新增内容 * @return 新增结果 */ @Override public R addComActEasyPhotoComment(ComActEasyPhotoCommentDTO comActEasyPhotoCommentDTO) { Long id = comActEasyPhotoCommentDTO.getId(); ComActEasyPhotoDO comActEasyPhotoDO = comActEasyPhotoDAO.selectById(id); if (ObjectUtils.isEmpty(comActEasyPhotoDO)) { return R.fail("随手拍不存在"); } ComActEasyPhotoCommentDO comActEasyPhotoCommentDO=new ComActEasyPhotoCommentDO(); comActEasyPhotoCommentDO.setComment(comActEasyPhotoCommentDTO.getComment()); comActEasyPhotoCommentDO.setUserId(comActEasyPhotoCommentDTO.getUserId()); comActEasyPhotoCommentDO.setEasyPhotoId(id); int insert = comActEasyPhotoCommentDAO.insert(comActEasyPhotoCommentDO); if (insert>0) { return R.ok(); } return R.fail(); } } springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java
@@ -2,10 +2,13 @@ import com.panzhihua.common.exceptions.PartyBuildingMemberException; import com.panzhihua.common.model.dtos.partybuilding.ActivitySignUpDTO; import com.panzhihua.common.model.dtos.partybuilding.ComPbServiceTeamDTO; import com.panzhihua.common.model.dtos.partybuilding.PageComPbServiceTeamDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.partybuilding.*; import com.panzhihua.service_dangjian.service.ComBpActivityService; import com.panzhihua.service_dangjian.service.ComPbMemberService; import com.panzhihua.service_dangjian.service.ComPbServiceTeamService; import com.panzhihua.service_dangjian.service.PartyOrganizationService; import org.springframework.util.ObjectUtils; import org.springframework.web.bind.annotation.*; @@ -28,6 +31,8 @@ private PartyOrganizationService partyOrganizationService; @Resource private ComBpActivityService comBpActivityService; @Resource private ComPbServiceTeamService comPbServiceTeamService; /** * 平台所有的党组织 @@ -398,4 +403,44 @@ return comBpActivityService.timedTaskPartyBuildingActivityAll(); } /** * 新增服务团队人员 * @param comPbServiceTeamDTO 新增内容 * @return 新增结果 */ @PostMapping("addserviceteam") public R addServiceTeam(@RequestBody ComPbServiceTeamDTO comPbServiceTeamDTO){ return comPbServiceTeamService.addServiceTeam(comPbServiceTeamDTO); } /** * 编辑团队人员 * @param comPbServiceTeamDTO 编辑内容 * @return 编辑结果 */ @PostMapping("putserviceteam") public R putServiceTeam(@RequestBody ComPbServiceTeamDTO comPbServiceTeamDTO){ return comPbServiceTeamService.putServiceTeam(comPbServiceTeamDTO); } /** * 分页查询服务团队成员 * @param pageComPbServiceTeamDTO 查询参数 * @return 查询结果 */ @PostMapping("pageserviceteam") public R pageServiceTeam(@RequestBody PageComPbServiceTeamDTO pageComPbServiceTeamDTO){ return comPbServiceTeamService.PageComPbServiceTeamDTO(pageComPbServiceTeamDTO); } /** * 删除服务团队人员 * @param comPbServiceTeamDTO 删除主键 * @return 删除结果 */ @PostMapping("deleteserviceteam") public R deleteServiceTeam(@RequestBody ComPbServiceTeamDTO comPbServiceTeamDTO){ return comPbServiceTeamService.deleteServiceTeam(comPbServiceTeamDTO); } } springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComBpActivityDAO.java
@@ -65,37 +65,39 @@ @Select("<script> " + "SELECT\n" + "id,\n" + "name,\n" + "address,\n" + "status,\n" + "release_time,\n" + "activity_time_begin,\n" + "activity_time_end,\n" + "enroll_time_begin,\n" + "cover,\n" + "enroll_time_end \n" + "a.id,\n" + "a.name,\n" + "a.address,\n" + "a.status,\n" + "a.release_time,\n" + "a.activity_time_begin,\n" + "a.activity_time_end,\n" + "a.enroll_time_begin,\n" + "a.cover,\n" + "if(u.type=3 ,'管理员',u.name)createByName,\n" + "a.enroll_time_end \n" + "FROM\n" + "com_pb_activity \n" + "where community_id=#{partyBuildingActivityVO.communityId}\n" + "com_pb_activity a\n" + "left join sys_user u on a.create_by=u.user_id \n" + "where a.community_id=#{partyBuildingActivityVO.communityId}\n" + "<if test='partyBuildingActivityVO.name != null and partyBuildingActivityVO.name.trim() != ""'>" + "and name = #{partyBuildingActivityVO.name} \n" + "and a.name = #{partyBuildingActivityVO.name} \n" + " </if> " + "<if test='partyBuildingActivityVO.status != null and partyBuildingActivityVO.status != 0 and partyBuildingActivityVO.isAppliets ==null '>" + "AND `status` = #{partyBuildingActivityVO.status} \n" + "AND a.`status` = #{partyBuildingActivityVO.status} \n" + " </if> " + "<if test='partyBuildingActivityVO.status != null and partyBuildingActivityVO.status != 0 and partyBuildingActivityVO.isAppliets !=null and partyBuildingActivityVO.isAppliets==1'>" + "AND `status` in (3,4) \n" + "AND a.`status` in (3,4) \n" + " </if> " + "<if test='partyBuildingActivityVO.releaseTimeBegin != null '>" + "AND release_time BETWEEN #{partyBuildingActivityVO.releaseTimeBegin} \n" + "AND a.release_time BETWEEN #{partyBuildingActivityVO.releaseTimeBegin} \n" + "AND #{partyBuildingActivityVO.releaseTimeEnd} \n" + " </if> " + "<if test='partyBuildingActivityVO.activityTimeBegin != null '>" + "AND activity_time_begin BETWEEN #{partyBuildingActivityVO.activityTimeBegin} \n" + "AND a.activity_time_begin BETWEEN #{partyBuildingActivityVO.activityTimeBegin} \n" + "AND #{partyBuildingActivityVO.activityTimeEnd}" + " </if> " + "order by create_at desc " + "order by a.create_at desc " + "</script>") IPage<PartyBuildingActivityVO> pageActivity(Page page, @Param("partyBuildingActivityVO") PartyBuildingActivityVO partyBuildingActivityVO);
New file @@ -0,0 +1,39 @@ package com.panzhihua.service_dangjian.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.panzhihua.common.model.dtos.partybuilding.PageComPbServiceTeamDTO; import com.panzhihua.common.model.vos.community.ComActEasyPhotoCommentVO; import com.panzhihua.common.model.vos.partybuilding.ComPbServiceTeamVO; import com.panzhihua.service_dangjian.model.dos.ComPbServiceTeamDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 服务团队 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2021-01-21 17:37 **/ @Mapper public interface ComPbServiceTeamDAO extends BaseMapper<ComPbServiceTeamDO> { @Select("<script> " + "SELECT\n" + "* \n" + "FROM\n" + "com_pb_service_team \n" + " where community_id=#{pageComPbServiceTeamDTO.communityId}" + "<if test='pageComPbServiceTeamDTO.name != null and pageComPbServiceTeamDTO.name.trim() != ""'>" + " and name LIKE concat( #{pageComPbServiceTeamDTO.name}, '%' ) \n" + " </if> " + "<if test='pageComPbServiceTeamDTO.job != null and pageComPbServiceTeamDTO.job.trim() != ""'>" + "AND job LIKE concat(\n" + "#{pageComPbServiceTeamDTO.job},\n" + "'%')" + " </if> " + "</script>") IPage<ComPbServiceTeamVO> PageComPbServiceTeamDTO(Page page, @Param("pageComPbServiceTeamDTO") PageComPbServiceTeamDTO pageComPbServiceTeamDTO); } springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbActivityDO.java
@@ -93,7 +93,7 @@ /** * 发布人 */ private String createBy; private Long createBy; /** * 发布时间 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbServiceTeamDO.java
New file @@ -0,0 +1,49 @@ package com.panzhihua.service_dangjian.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-21 17:36 **/ @Data @TableName("com_pb_service_team") public class ComPbServiceTeamDO implements Serializable { private static final long serialVersionUID = 1L; /** * id */ private Long id; /** * 姓名 */ private String name; /** * 职位 */ private String job; /** * 照片 */ private String url; /** * create_at */ private Date createAt; /** * 社区id */ private Long communityId; } springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComPbServiceTeamService.java
New file @@ -0,0 +1,39 @@ package com.panzhihua.service_dangjian.service; import com.panzhihua.common.model.dtos.partybuilding.ComPbServiceTeamDTO; import com.panzhihua.common.model.dtos.partybuilding.PageComPbServiceTeamDTO; import com.panzhihua.common.model.vos.R; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 服务团队 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2021-01-21 17:38 **/ public interface ComPbServiceTeamService { /** * 新增服务团队人员 * @param comPbServiceTeamDTO 新增内容 * @return 新增结果 */ R addServiceTeam(ComPbServiceTeamDTO comPbServiceTeamDTO); /** * 编辑团队人员 * @param comPbServiceTeamDTO 编辑内容 * @return 编辑结果 */ R putServiceTeam(ComPbServiceTeamDTO comPbServiceTeamDTO); /** * 分页查询服务团队成员 * @param pageComPbServiceTeamDTO 查询参数 * @return 查询结果 */ R PageComPbServiceTeamDTO(PageComPbServiceTeamDTO pageComPbServiceTeamDTO); /** * 删除服务团队人员 * @param comPbServiceTeamDTO 删除主键 * @return 删除结果 */ R deleteServiceTeam(ComPbServiceTeamDTO comPbServiceTeamDTO); } springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java
@@ -433,4 +433,6 @@ } } springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbServiceTeamServiceImpl.java
New file @@ -0,0 +1,98 @@ package com.panzhihua.service_dangjian.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.panzhihua.common.model.dtos.partybuilding.ComPbServiceTeamDTO; import com.panzhihua.common.model.dtos.partybuilding.PageComPbServiceTeamDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComActEasyPhotoCommentVO; import com.panzhihua.common.model.vos.partybuilding.ComPbServiceTeamVO; import com.panzhihua.service_dangjian.dao.ComPbServiceTeamDAO; import com.panzhihua.service_dangjian.model.dos.ComPbServiceTeamDO; import com.panzhihua.service_dangjian.service.ComPbServiceTeamService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 服务团队 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2021-01-21 17:39 **/ @Slf4j @Service public class ComPbServiceTeamServiceImpl implements ComPbServiceTeamService { @Resource private ComPbServiceTeamDAO comPbServiceTeamDAO; /** * 新增服务团队人员 * * @param comPbServiceTeamDTO 新增内容 * @return 新增结果 */ @Override public R addServiceTeam(ComPbServiceTeamDTO comPbServiceTeamDTO) { ComPbServiceTeamDO comPbServiceTeamDO=new ComPbServiceTeamDO(); BeanUtils.copyProperties(comPbServiceTeamDTO,comPbServiceTeamDO); int insert = comPbServiceTeamDAO.insert(comPbServiceTeamDO); if (insert>0) { return R.ok(); } return R.fail(); } /** * 编辑团队人员 * * @param comPbServiceTeamDTO 编辑内容 * @return 编辑结果 */ @Override public R putServiceTeam(ComPbServiceTeamDTO comPbServiceTeamDTO) { ComPbServiceTeamDO comPbServiceTeamDO=new ComPbServiceTeamDO(); BeanUtils.copyProperties(comPbServiceTeamDTO,comPbServiceTeamDO); comPbServiceTeamDAO.updateById(comPbServiceTeamDO); return R.ok(); } /** * 分页查询服务团队成员 * * @param pageComPbServiceTeamDTO 查询参数 * @return 查询结果 */ @Override public R PageComPbServiceTeamDTO(PageComPbServiceTeamDTO pageComPbServiceTeamDTO) { Page page = new Page<>(); Long pageNum = pageComPbServiceTeamDTO.getPageNum(); Long pageSize = pageComPbServiceTeamDTO.getPageSize(); if (null==pageNum||0==pageNum) { pageNum = 1l; } if (null==pageSize||0==pageSize) { pageSize = 10l; } page.setSize(pageSize); page.setCurrent(pageNum); IPage<ComPbServiceTeamVO> iPage = comPbServiceTeamDAO.PageComPbServiceTeamDTO(page, pageComPbServiceTeamDTO); return R.ok(iPage); } /** * 删除服务团队人员 * * @param comPbServiceTeamDTO 删除主键 * @return 删除结果 */ @Override public R deleteServiceTeam(ComPbServiceTeamDTO comPbServiceTeamDTO) { int delete = comPbServiceTeamDAO.deleteById(comPbServiceTeamDTO.getId()); if (delete>0) { return R.ok(); } return R.fail(); } } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -1161,7 +1161,7 @@ public R noticeUnreadNum(Long userId) { NoticeUnReadVO noticeUnReadVO=sysUserNoticeDAO.noticeUnreadNum(userId); List<SysUserNoticeVO> sysUserNoticeVOList=new ArrayList<>(); List<SysUserNoticeDO> sysUserNoticeDOS = sysUserNoticeDAO.selectList(new QueryWrapper<SysUserNoticeDO>().lambda().eq(SysUserNoticeDO::getUserId, userId).orderByDesc(SysUserNoticeDO::getCreateAt).groupBy(SysUserNoticeDO::getType)); List<SysUserNoticeDO> sysUserNoticeDOS = sysUserNoticeDAO.selectList(new QueryWrapper<SysUserNoticeDO>().lambda().eq(SysUserNoticeDO::getUserId, userId).orderByDesc(SysUserNoticeDO::getCreateAt)); if (!ObjectUtils.isEmpty(sysUserNoticeDOS)) { sysUserNoticeDOS.forEach(sysUserNoticeDO -> { SysUserNoticeVO sysUserNoticeVO=new SysUserNoticeVO();
