springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml
@@ -23,7 +23,64 @@ </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/PageVolunteerDTO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/dtos/user/SysUserFeedbackDTO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVolunteerMngAppletsVO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserFeedbackDAO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserFeedbackDO.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/LoginApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/LoginApi.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/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/controller/BaseController.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/controller/BaseController.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/community/ComMngVolunteerMngVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVolunteerMngVO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/service/user/UserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/service/user/UserService.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/controller/BaseController.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/controller/BaseController.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/community/ComMngVolunteerMngVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/ComMngVolunteerMngVO.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/service/community/CommunityService.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/service/community/CommunityService.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/service/partybuilding/PartyBuildingService.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/service/partybuilding/PartyBuildingService.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/service/user/UserService.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/service/user/UserService.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityAPI.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityManagerApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityManagerApi.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/community_backstage/src/main/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/ComMngVolunteerMngDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngVolunteerMngDAO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoDO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngVolunteerMngDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngVolunteerMngDO.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/ComActService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComActService.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComMngVolunteerMngService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComMngVolunteerMngService.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/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/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVolunteerMngServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVolunteerMngServiceImpl.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_community/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/resources/bootstrap.yml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbActivityMemberDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbActivityMemberDAO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComBpActivityService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComBpActivityService.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/resources/bootstrap.yml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_user/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/resources/bootstrap.yml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/zuul/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/zuul/src/main/resources/bootstrap.yml" afterDir="false" /> </list> <option name="SHOW_DIALOG" value="false" /> <option name="HIGHLIGHT_CONFLICTS" value="true" /> @@ -378,7 +435,7 @@ <workItem from="1609120633455" duration="2000" /> <workItem from="1609120765557" duration="31000" /> <workItem from="1609121031103" duration="30812000" /> <workItem from="1609219740946" duration="44796000" /> <workItem from="1609219740946" duration="61933000" /> </task> <servers /> </component> @@ -402,26 +459,26 @@ <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="1609326309030"> <state x="574" y="118" key="#com.intellij.ide.util.MemberChooser" timestamp="1609400589487"> <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="1609326309030" /> <state x="574" y="118" key="#com.intellij.ide.util.MemberChooser/0.0.1536.824@0.0.1536.824" timestamp="1609400589487" /> <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="1608617413896"> <state x="0" y="0" key="#com.intellij.refactoring.rename.AutomaticRenamingDialog" timestamp="1609398409699"> <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="1608617413896" /> <state x="0" y="0" key="#com.intellij.refactoring.rename.AutomaticRenamingDialog/0.0.1536.824@0.0.1536.824" timestamp="1609398409699" /> <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="561" height="466" key="DebuggerActiveHint" timestamp="1609309867208"> <state width="561" height="466" key="DebuggerActiveHint" timestamp="1609395795616"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="561" height="466" key="DebuggerActiveHint/0.0.1536.824@0.0.1536.824" timestamp="1609309867208" /> <state width="561" height="466" key="DebuggerActiveHint/0.0.1536.824@0.0.1536.824" timestamp="1609395795616" /> <state x="93" y="93" width="1350" height="638" key="DiffContextDialog" timestamp="1609316182000"> <screen x="0" y="0" width="1536" height="824" /> </state> @@ -430,54 +487,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="1606197830966" /> <state width="1031" height="500" key="GridCell.Tab.0.bottom" timestamp="1609326845167"> <state width="1031" height="441" key="GridCell.Tab.0.bottom" timestamp="1609401602573"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="500" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1609326845167" /> <state width="1031" height="500" key="GridCell.Tab.0.center" timestamp="1609326845167"> <state width="1031" height="441" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1609401602573" /> <state width="1031" height="441" key="GridCell.Tab.0.center" timestamp="1609401602573"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="500" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1609326845167" /> <state width="1031" height="500" key="GridCell.Tab.0.left" timestamp="1609326845167"> <state width="1031" height="441" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1609401602573" /> <state width="1031" height="441" key="GridCell.Tab.0.left" timestamp="1609401602573"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="500" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1609326845167" /> <state width="1031" height="500" key="GridCell.Tab.0.right" timestamp="1609326845167"> <state width="1031" height="441" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1609401602573" /> <state width="1031" height="441" key="GridCell.Tab.0.right" timestamp="1609401602573"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="500" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1609326845167" /> <state width="1031" height="500" key="GridCell.Tab.1.bottom" timestamp="1609326845167"> <state width="1031" height="441" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1609401602573" /> <state width="1031" height="441" key="GridCell.Tab.1.bottom" timestamp="1609401602573"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="500" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1609326845167" /> <state width="1031" height="500" key="GridCell.Tab.1.center" timestamp="1609326845167"> <state width="1031" height="441" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1609401602573" /> <state width="1031" height="441" key="GridCell.Tab.1.center" timestamp="1609401602573"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="500" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1609326845167" /> <state width="1031" height="500" key="GridCell.Tab.1.left" timestamp="1609326845167"> <state width="1031" height="441" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1609401602573" /> <state width="1031" height="441" key="GridCell.Tab.1.left" timestamp="1609401602573"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="500" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1609326845167" /> <state width="1031" height="500" key="GridCell.Tab.1.right" timestamp="1609326845167"> <state width="1031" height="441" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1609401602573" /> <state width="1031" height="441" key="GridCell.Tab.1.right" timestamp="1609401602573"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="500" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1609326845167" /> <state width="1031" height="500" key="GridCell.Tab.2.bottom" timestamp="1609326845168"> <state width="1031" height="441" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1609401602573" /> <state width="1031" height="441" key="GridCell.Tab.2.bottom" timestamp="1609401602573"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="500" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1609326845168" /> <state width="1031" height="500" key="GridCell.Tab.2.center" timestamp="1609326845167"> <state width="1031" height="441" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1609401602573" /> <state width="1031" height="441" key="GridCell.Tab.2.center" timestamp="1609401602573"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="500" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1609326845167" /> <state width="1031" height="500" key="GridCell.Tab.2.left" timestamp="1609326845167"> <state width="1031" height="441" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1609401602573" /> <state width="1031" height="441" key="GridCell.Tab.2.left" timestamp="1609401602573"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="500" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1609326845167" /> <state width="1031" height="500" key="GridCell.Tab.2.right" timestamp="1609326845167"> <state width="1031" height="441" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1609401602573" /> <state width="1031" height="441" key="GridCell.Tab.2.right" timestamp="1609401602573"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="500" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1609326845167" /> <state width="1031" height="441" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1609401602573" /> <state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1606714311663"> <screen x="0" y="0" width="1536" height="824" /> </state> @@ -490,18 +547,18 @@ <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="1609312215199" /> <state x="93" y="93" width="1350" height="638" key="com.intellij.history.integration.ui.views.DirectoryHistoryDialog" timestamp="1609316182000"> <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> <state x="93" y="93" width="1350" height="638" key="com.intellij.history.integration.ui.views.DirectoryHistoryDialog/0.0.1536.824@0.0.1536.824" timestamp="1609316182000" /> <state x="93" y="93" width="1350" height="638" key="com.intellij.history.integration.ui.views.DirectoryHistoryDialog/0.0.1536.824@0.0.1536.824" timestamp="1609398421992" /> <state x="93" y="93" width="1350" height="638" key="com.intellij.history.integration.ui.views.FileHistoryDialog" timestamp="1609226181026"> <screen x="0" y="0" width="1536" height="824" /> </state> <state x="93" y="93" width="1350" height="638" key="com.intellij.history.integration.ui.views.FileHistoryDialog/0.0.1536.824@0.0.1536.824" timestamp="1609226181026" /> <state x="468" y="42" width="766" height="782" key="find.popup" timestamp="1609324935410"> <state x="468" y="42" width="766" height="782" key="find.popup" timestamp="1609398596835"> <screen x="0" y="0" width="1536" height="824" /> </state> <state x="468" y="42" width="766" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1609324935410" /> <state x="468" y="42" width="766" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1609398596835" /> <state x="301" y="45" key="new project wizard" timestamp="1609120520884"> <screen x="0" y="0" width="1536" height="824" /> </state> springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
@@ -1,15 +1,15 @@ package com.panzhihua.applets.api; import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.dtos.community.PageVolunteerDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.*; import com.panzhihua.common.service.community.CommunityService; import com.panzhihua.common.validated.AddGroup; import com.panzhihua.common.validated.PageGroup; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import org.springframework.util.ObjectUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -96,6 +96,23 @@ return communityService.addVolunteer(comMngVolunteerMngVO); } @ApiOperation(value = "分页查询志愿者团队") @PostMapping("pagevolunteer") public R pageVolunteer(@RequestBody @Validated(PageGroup.class) PageVolunteerDTO pageVolunteerDTO){ Long communityId = this.getCommunityId(); ComMngVolunteerMngVO comMngVolunteerMngVO=new ComMngVolunteerMngVO(); comMngVolunteerMngVO.setCommunityId(communityId); comMngVolunteerMngVO.setPageNum(pageVolunteerDTO.getPageNum()); comMngVolunteerMngVO.setPageSize(pageVolunteerDTO.getPageSize()); return communityService.pageVolunteer(comMngVolunteerMngVO); } @ApiOperation(value = "志愿者详情",response = ComMngVolunteerMngAppletsVO.class) @GetMapping("volunteer") public R detailVolunteer(@RequestParam("id") Long id){ return communityService.detailVolunteer(id); } }
@@ -34,6 +34,9 @@ public R pageEasyPhoto (@RequestBody ComActEasyPhotoVO comActEasyPhotoVO){ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo(); Long communityId = loginUserInfo.getCommunityId(); if (null==communityId||0==communityId) { return R.fail("用户未绑定社区"); } Long userId = loginUserInfo.getUserId(); comActEasyPhotoVO.setCommunityId(communityId); comActEasyPhotoVO.setStatus(4); @@ -46,6 +49,9 @@ public R addEasyPhoto (@RequestBody @Validated(AddGroup.class) ComActEasyPhotoVO comActEasyPhotoVO){ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo(); Long communityId = loginUserInfo.getCommunityId(); if (null==communityId||0==communityId) { return R.fail("用户未绑定社区"); } Long userId = loginUserInfo.getUserId(); comActEasyPhotoVO.setCommunityId(communityId); comActEasyPhotoVO.setSponsorId(userId); @@ -83,6 +89,9 @@ public R pageMicroWish (@RequestBody ComActMicroWishVO comActMicroWishVO){ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo(); Long communityId = loginUserInfo.getCommunityId(); if (null==communityId||0==communityId) { return R.fail("用户未绑定社区"); } Long userId = loginUserInfo.getUserId(); comActMicroWishVO.setCommunityId(communityId); comActMicroWishVO.setIsApplets(1); @@ -95,6 +104,9 @@ public R addMicroWish (@RequestBody @Validated(AddGroup.class) ComActMicroWishVO comActMicroWishVO){ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo(); Long communityId = loginUserInfo.getCommunityId(); if (null==communityId||0==communityId) { return R.fail("用户未绑定社区"); } Long userId = loginUserInfo.getUserId(); String phone = loginUserInfo.getPhone(); if (ObjectUtils.isEmpty(phone)) { @@ -106,7 +118,7 @@ return communityService.addMicroWish(comActMicroWishVO); } @ApiOperation("心愿详情") @ApiOperation(value = "心愿详情",response = ComActMicroWishVO.class) @GetMapping("microwish") @ApiImplicitParam(name = "id",value = "微心愿主键") public R detailMicroWish (@RequestParam("id")Long id){ springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/LoginApi.java
@@ -10,6 +10,7 @@ import com.panzhihua.common.model.vos.LoginReturnVO; import com.panzhihua.common.model.vos.community.ComActVO; import com.panzhihua.common.model.vos.community.ComMngStructAreaVO; import com.panzhihua.common.model.vos.user.SysUserAgreementVO; import com.panzhihua.common.service.auth.TokenService; import com.panzhihua.common.service.community.CommunityService; import com.panzhihua.common.service.user.UserService; @@ -177,4 +178,11 @@ loginUserInfoVO.setUserId(userId); return userService.putUserCommunityArea(loginUserInfoVO); } @ApiOperation(value = "用户协议和隐私政策",response = SysUserAgreementVO.class) @GetMapping("useragreement") public R userAgreement(){ int type=1; return userService.userAgreement(type); } } springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java
@@ -2,6 +2,7 @@ import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.model.dtos.partybuilding.ActivitySignUpDTO; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.partybuilding.*; import com.panzhihua.common.service.partybuilding.PartyBuildingService; @@ -79,7 +80,8 @@ @ApiOperation(value = "活动详情",response = PartyBuildingActivityVO.class) @GetMapping("activityinfo") public R activityinfo(@RequestParam("id") Long id) { return partyBuildingService.activityinfo(id); Long userId = this.getUserId(); return partyBuildingService.activityinfo(id,userId); } @ApiOperation(value = "党员活动人员参入列表",response = PartyBuildingMemberVO.class) springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
@@ -2,6 +2,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO; import com.panzhihua.common.model.vos.community.*; import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO; import com.panzhihua.common.model.vos.user.UserPhoneVO; @@ -240,5 +241,21 @@ return userService.deleteUserTest(userId); } @ApiOperation(value = "意见反馈" ) @PostMapping("feedback") public R addFeedback(@RequestBody @Validated(AddGroup.class) SysUserFeedbackDTO sysUserFeedbackDTO) { LoginUserInfoVO loginUserInfo = this.getLoginUserInfo(); Long userId = loginUserInfo.getUserId(); Long communityId = loginUserInfo.getCommunityId(); Long areaId = loginUserInfo.getAreaId(); if (null==communityId||0==communityId) { return R.fail("未绑定社区"); } sysUserFeedbackDTO.setCommunityId(communityId); sysUserFeedbackDTO.setAreaId(areaId); sysUserFeedbackDTO.setUserId(userId); return userService.addFeedback(sysUserFeedbackDTO); } } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/controller/BaseController.java
@@ -4,6 +4,7 @@ import com.panzhihua.common.constants.Constants; import com.panzhihua.common.constants.TokenConstant; import com.panzhihua.common.constants.UserConstants; import com.panzhihua.common.exceptions.ServiceException; import com.panzhihua.common.exceptions.UnAuthenticationException; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.utlis.AES; @@ -49,6 +50,9 @@ public Long getCommunityId(){ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo(); Long communityId = loginUserInfo.getCommunityId(); if (null==communityId||0==communityId) { throw new ServiceException("用户未绑定社区"); } return communityId; } @@ -59,6 +63,9 @@ public Long getAreaId(){ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo(); Long areaId = loginUserInfo.getAreaId(); if (null==areaId||0==areaId) { throw new ServiceException("用户未绑定社区"); } return areaId; }
New file @@ -0,0 +1,32 @@ package com.panzhihua.common.model.dtos.community; import com.panzhihua.common.validated.PageGroup; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.NonNull; import javax.validation.constraints.Min; import javax.validation.constraints.NotNull; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 分页志愿者 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2020-12-31 13:52 **/ @Data @ApiModel("分页志愿者") public class PageVolunteerDTO { @ApiModelProperty(value = "分页-当前页数",example = "1",required = true) @NotNull(groups = {PageGroup.class},message = "当前页数不能为空") @Min(value = 1,groups = {PageGroup.class},message = "当前页数不能为空") private Long pageNum; @ApiModelProperty(value = "分页-每页记录数",example = "10",required = true) @NotNull(groups = {PageGroup.class},message = "每页记录数不能为空") @Min(value = 1,groups = {PageGroup.class},message = "每页记录数不能为空") private Long pageSize; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/SysUserFeedbackDTO.java
New file @@ -0,0 +1,48 @@ package com.panzhihua.common.model.dtos.user; 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: 2020-12-31 13:26 **/ @Data @ApiModel(value = "意见反馈") public class SysUserFeedbackDTO { @ApiModelProperty(value = "id",hidden = true) private Long id; @ApiModelProperty(value = "反馈内容",required = true) @NotBlank(groups = {AddGroup.class},message = "反馈内容不能为空") private String content; @ApiModelProperty("反馈图片，多个用逗号隔开") private String photoPah; @ApiModelProperty(value = "create_at",hidden = true) private Date createAt; @ApiModelProperty(value = "update_at",hidden = true) private Date updateAt; @ApiModelProperty(value = "用户的id",hidden = true) private Long userId; @ApiModelProperty(value = "小区id",hidden = true) private Long areaId; @ApiModelProperty(value = "社区id",hidden = true) private Long communityId; @ApiModelProperty(value = "状态 0",hidden = true) private Integer status; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java
@@ -110,6 +110,9 @@ @ApiModelProperty(value = "是否已经报名 1 已报名 0 未报名") private Integer isSign; @ApiModelProperty(value = "是不是以志愿者身份报名的 1 是 0 不是") private Integer isVolunteer; @ApiModelProperty(value = "当前登录者id",hidden = true) private Integer userId;
@@ -109,4 +109,10 @@ @ApiModelProperty("反馈时间") private Date feedbackAt; @ApiModelProperty("发起人手机号") private String phone; @ApiModelProperty("拒绝原因") private String rejectReason; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVolunteerMngAppletsVO.java
New file @@ -0,0 +1,36 @@ package com.panzhihua.common.model.vos.community; 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: 2020-12-31 15:20 **/ @Data @ApiModel("支援者详情小程序") public class ComMngVolunteerMngAppletsVO { @ApiModelProperty("姓名") private String name; @ApiModelProperty("电话号码") private String phone; @ApiModelProperty("照片路径") private String photoPath; @ApiModelProperty("积分") private Integer integral; @ApiModelProperty("志愿者参加的已经完成的活动") private List<ComActActivityVO> comActActivityVOList; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVolunteerMngVO.java
@@ -67,4 +67,10 @@ @ApiModelProperty(value = "职业",example = "家庭主妇") @NotBlank(groups = {AddGroup.class},message = "职业不能为空") private String job; @ApiModelProperty(value = "社区id",hidden = true) private Long communityId; @ApiModelProperty(value = "积分",hidden = true) private Integer integral; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.java
@@ -85,7 +85,7 @@ private List<PartyBuildingMemberVO> partyBuildingMemberVOS; @ApiModelProperty("是否已经报名") private Boolean isSign; private Integer isSign;
@@ -11,8 +11,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; import java.util.List; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 社区 @@ -527,4 +525,12 @@ */ @PostMapping("pagecommunity") R pageCommunity(@RequestBody PageComActDTO pageComActDTO); /** * 志愿者详情 * @param id 主键 * @return */ @PostMapping("detailvolunteer") R detailVolunteer(@RequestParam("id")Long id); } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java
@@ -79,7 +79,7 @@ * @return 活动详情内容 */ @PostMapping("/partybuildIng/activityinfo") R activityinfo(@RequestParam("id") Long id); R activityinfo(@RequestParam("id") Long id,@RequestParam("userId") Long userId); /** * 查询指定社区的所有党员 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
@@ -1,6 +1,7 @@ package com.panzhihua.common.service.user; import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO; import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.MenuVO; import com.panzhihua.common.model.vos.R; @@ -362,4 +363,20 @@ */ @PostMapping("deleteusertest") R deleteUserTest(@RequestParam("userId")Long userId); /** * 用户协议和隐私政策 * @param type 所属app 1居民端app 2网格员端app 3商家端app * @return 协议内容 */ @PostMapping("useragreement") R userAgreement(@RequestParam("type")int type); /** * 意见反馈 * @param sysUserFeedbackDTO 反馈内容 * @return 反馈结果 */ @PostMapping("addfeedback") R addFeedback(@RequestBody SysUserFeedbackDTO sysUserFeedbackDTO); } springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/controller/BaseController.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/dtos/community/PageVolunteerDTO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/dtos/user/SysUserFeedbackDTO.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/ComActEasyPhotoVO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/community/ComMngVolunteerMngAppletsVO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/community/ComMngVolunteerMngVO.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/common/target/classes/com/panzhihua/common/service/user/UserService.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityAPI.java
@@ -194,7 +194,7 @@ return communityService.pageEasyPhoto(comActEasyPhotoVO); } @ApiOperation(value = "随手拍详情") @ApiOperation(value = "随手拍详情",response = ComActEasyPhotoVO.class) @GetMapping("easyphoto") public R detailEasyPhoto(@RequestParam("id")Long id) { Long userId = this.getUserId(); springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityManagerApi.java
@@ -207,7 +207,8 @@ @ApiOperation(value = "增加志愿者") @PostMapping("volunteer") public R addVolunteer(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO){ comMngVolunteerMngVO.setState(3); comMngVolunteerMngVO.setState(2); comMngVolunteerMngVO.setCommunityId(this.getCommunityId()); R r = communityService.addVolunteer(comMngVolunteerMngVO); // 支援者添加成功，修改小程序用户的志愿者状态，通过手机号 if (R.isOk(r)) { @@ -256,6 +257,8 @@ @ApiOperation(value = "分页展示志愿者") @PutMapping("pagevolunteer") public R pageVolunteer(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO){ Long communityId = this.getCommunityId(); comMngVolunteerMngVO.setCommunityId(communityId); return communityService.pageVolunteer(comMngVolunteerMngVO); }
@@ -161,7 +161,8 @@ @ApiOperation(value = "活动详情",response = PartyBuildingActivityVO.class) @GetMapping("activityinfo") public R activityinfo(@RequestParam("id") Long id) { return partyBuildingService.activityinfo(id); Long userId = this.getUserId(); return partyBuildingService.activityinfo(id,userId); } @ApiOperation(value = "新增党员活动") springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
@@ -911,4 +911,22 @@ return comActService.pageCommunity(pageComActDTO); } /** * 志愿者详情 * @param id 主键 * @return 志愿者 */ @PostMapping("detailvolunteer") public R detailVolunteer(@RequestParam("id") Long id){ R r = comMngVolunteerMngService.detailVolunteer(id); if (R.isOk(r)) { ComMngVolunteerMngAppletsVO comMngVolunteerMngAppletsVO =(ComMngVolunteerMngAppletsVO) r.getData(); String phone = comMngVolunteerMngAppletsVO.getPhone(); List<ComActActivityVO> comActActivityVOS= comActActivityService.listActivityByPhone(phone); comMngVolunteerMngAppletsVO.setComActActivityVOList(comActActivityVOS); r.setData(comMngVolunteerMngAppletsVO); } return r; } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActSignDAO.java
@@ -16,6 +16,7 @@ **/ @Mapper public interface ComActActSignDAO extends BaseMapper<ComActActSignDO> { // 居民 党员 志愿者 1 2 3 @Select("<script> " + "SELECT\n" + "a.id,\n" + @@ -35,14 +36,14 @@ "<if test='name != null and name.trim() != ""'>" + "AND u.`name` = #{name} \n" + " </if> " + "<if test='identity != null and identity.trim() != "" and identity==党员.toString()'>" + "AND is_partymember = 1 \n" + "<if test='identity != null and identity.trim() != "" and identity==1'>" + "AND u.is_partymember = 0 and a.is_volunteer=0 \n" + " </if> " + "<if test='identity != null and identity.trim() != "" and identity==志愿者.toString()'>" + "AND is_partymember = 2 and is_volunteer=1 \n" + "<if test='identity != null and identity.trim() != "" and identity==2'>" + "AND u.is_partymember = 1 \n" + " </if> " + "<if test='identity != null and identity.trim() != "" and identity==居民.toString()'>" + "AND is_partymember = 2 and is_volunteer=2 \n" + "<if test='identity != null and identity.trim() != "" and identity==3'>" + "AND a.is_volunteer=1 \n" + " </if> " + " order by a.create_at desc "+ "</script>") springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActActivityDAO.java
@@ -10,6 +10,8 @@ import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import java.util.List; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 社区活动 @@ -86,4 +88,8 @@ "ORDER BY\n" + "s.create_at DESC") IPage<ComActActivityVO> pageMyActivity(Page page, @Param("comActActivityVO") ComActActivityVO comActActivityVO); @Select("select t.activity_name,t.id,t.end_at,t.cover,t.status from com_act_act_sign s join sys_user u on s.user_id=u.user_id and u.phone=#{phone} and s.is_volunteer=1 " + "join com_act_activity t on s.activity_id=t.id and t.status=5") List<ComActActivityVO> listActivityByPhone(String phone); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngVolunteerMngDAO.java
@@ -3,7 +3,6 @@ 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.community.ComMngStructOtherBuildVO; import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO; import com.panzhihua.service_community.model.dos.ComMngVolunteerMngDO; import org.apache.ibatis.annotations.Mapper; @@ -34,16 +33,18 @@ "`name`,\n" + "photo_path,\n" + "phone,\n" + "integral,\n" + "create_at \n" + "FROM\n" + "com_mng_volunteer_mng \n" + " where state=2 " + " where state=2 and community_id=#{comMngVolunteerMngVO.communityId}" + "<if test='comMngVolunteerMngVO.name != null and comMngVolunteerMngVO.name.trim() != ""'>" + " and name = #{comMngVolunteerMngVO.name} \n" + " </if> " + "<if test='comMngVolunteerMngVO.phone != null and comMngVolunteerMngVO.phone.trim() != ""'>" + "AND phone = #{comMngVolunteerMngVO.phone}" + " </if> " + " order by integral desc,create_at desc"+ "</script>") IPage<ComMngVolunteerMngVO> pageVolunteer(Page page, @Param("comMngVolunteerMngVO") ComMngVolunteerMngVO comMngVolunteerMngVO);
@@ -92,4 +92,8 @@ * 反馈时间 */ private Date feedbackAt; /** * 拒绝原因 */ private String rejectReason; } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngVolunteerMngDO.java
@@ -76,4 +76,12 @@ * 年龄 */ private Integer age; /** * 积分 */ private Integer integral; /** * 社区id */ private Long communityId; } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActActivityService.java
@@ -79,4 +79,11 @@ * @return 活动列表 */ R listActivity(Long userId); /** * 查询志愿者参与的所有已经完成的活动 * @param phone 用户手机号 * @return 所有活动集合 */ List<ComActActivityVO> listActivityByPhone(String phone); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActService.java
@@ -41,4 +41,5 @@ * @return 分页集合 */ R pageCommunity(PageComActDTO pageComActDTO); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngVolunteerMngService.java
@@ -65,5 +65,10 @@ * @return 修改结果 */ R putVolunteerPhone(UserPhoneVO userPhoneVO); /** * 志愿者详情 * @param id 主键 * @return 志愿者 */ R detailVolunteer(Long id); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
@@ -151,6 +151,7 @@ ComActActSignDO comActActSignDO = comActActSignDAO.selectOne(new QueryWrapper<ComActActSignDO>().lambda().eq(ComActActSignDO::getActivityId, id).eq(ComActActSignDO::getUserId, userId)); if (!ObjectUtils.isEmpty(comActActSignDO)) { comActActivityVO.setIsSign(1); comActActivityVO.setIsVolunteer(comActActSignDO.getIsVolunteer()); }else { } @@ -252,5 +253,17 @@ return R.ok(comActActivityVOS); } /** * 查询志愿者参与的所有已经完成的活动 * * @param phone 用户手机号 * @return 所有活动集合 */ @Override public List<ComActActivityVO> listActivityByPhone(String phone) { List<ComActActivityVO> comActActivityVOS=comActActivityDAO.listActivityByPhone(phone); return comActActivityVOS; } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java
@@ -168,6 +168,7 @@ case 2: cmActEasyPhotoDO.setStatus(3);//已驳回 cmActEasyPhotoDO.setExamineAt(new Date()); cmActEasyPhotoDO.setRejectReason(comActEasyPhotoVO.getRejectReason()); break; case 3: cmActEasyPhotoDO.setHandleResult(comActEasyPhotoVO.getHandleResult()); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java
@@ -114,4 +114,6 @@ } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVolunteerMngServiceImpl.java
@@ -5,7 +5,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComActVO; import com.panzhihua.common.model.vos.community.ComMngVolunteerMngAppletsVO; import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO; import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO; import com.panzhihua.common.model.vos.user.UserPhoneVO; import com.panzhihua.service_community.dao.ComMngVolunteerMngDAO; @@ -193,7 +194,22 @@ return R.fail(); } /** * 志愿者详情 * * @param id 主键 * @return 志愿者 */ @Override public R detailVolunteer(Long id) { ComMngVolunteerMngDO comMngVolunteerMngDO = comMngVolunteerMngDAO.selectById(id); if (ObjectUtils.isEmpty(comMngVolunteerMngDO)) { return R.fail("志愿者不存在"); } ComMngVolunteerMngAppletsVO comMngVolunteerMngAppletsVO=new ComMngVolunteerMngAppletsVO(); BeanUtils.copyProperties(comMngVolunteerMngDO,comMngVolunteerMngAppletsVO); return R.ok(comMngVolunteerMngAppletsVO); } } springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java
@@ -112,8 +112,8 @@ * @return 活动详情内容 */ @PostMapping("activityinfo") public R activityinfo(@RequestParam("id") Long id){ return comBpActivityService.activityinfo(id); public R activityinfo(@RequestParam("id") Long id,@RequestParam("userId") Long userId){ return comBpActivityService.activityinfo(id,userId); }
@@ -41,4 +41,7 @@ "</script>") IPage<PageActivityMembersVO> pageActivityMembers(Page page, @Param("pageActivityMembersVO") PageActivityMembersVO pageActivityMembersVO); @Select("select a.* from com_pb_activity_member a join com_pb_member m on m.id=a.member_id " + "join sys_user u on m.id_card=u.id_card and u.user_id=#{userId} where a.activity_id=#{id}") ComPbActivityMemberDO selectByUserIdActivityId(@Param("id") Long id, @Param("userId") Long userId); } springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComBpActivityService.java
@@ -31,7 +31,7 @@ * @param id 活动id * @return 活动详情内容 */ R activityinfo(Long id); R activityinfo(Long id,Long userId); /** * 新增党员活动 * @param partyBuildingActivityVO 参数 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java
@@ -88,7 +88,7 @@ * @return 活动详情内容 */ @Override public R activityinfo(Long id) { public R activityinfo(Long id,Long userId) { ComPbActivityDO comPbActivityDO = comBpActivityDAO.selectById(id); if (ObjectUtils.isEmpty(comPbActivityDO)) { return R.fail("活动不存在"); @@ -113,6 +113,12 @@ } else { partyBuildingActivityVO.setParticipationActualNum(0); } ComPbActivityMemberDO comPbActivityMemberDO=comPbActivityMemberDAO.selectByUserIdActivityId(id,userId); if (ObjectUtils.isEmpty(comPbActivityMemberDO)) { partyBuildingActivityVO.setIsSign(0); } else { partyBuildingActivityVO.setIsSign(1); } partyBuildingActivityVO.setPartyBuildingMemberVOS(partyBuildingMemberVOS); return R.ok(partyBuildingActivityVO); } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
@@ -1,6 +1,7 @@ package com.panzhihua.service_user.api; import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO; import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.SystemmanagementConfigVO; @@ -371,4 +372,24 @@ public R deleteUserTest(@RequestParam("userId")Long userId){ return userService.deleteUserTest(userId); } /** * 用户协议和隐私政策 * @param type 所属app 1居民端app 2网格员端app 3商家端app * @return 协议内容 */ @PostMapping("useragreement") public R userAgreement(@RequestParam("type")int type){ return userService.userAgreement(type); } /** * 意见反馈 * @param sysUserFeedbackDTO 反馈内容 * @return 反馈结果 */ @PostMapping("addfeedback") public R addFeedback(@RequestBody SysUserFeedbackDTO sysUserFeedbackDTO){ return userService.addFeedback(sysUserFeedbackDTO); } } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserFeedbackDAO.java
New file @@ -0,0 +1,15 @@ package com.panzhihua.service_user.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.panzhihua.service_user.model.dos.SysUserFeedbackDO; import org.apache.ibatis.annotations.Mapper; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 意见反馈 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2020-12-31 13:25 **/ @Mapper public interface SysUserFeedbackDAO extends BaseMapper<SysUserFeedbackDO> { } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserFeedbackDO.java
New file @@ -0,0 +1,67 @@ package com.panzhihua.service_user.model.dos; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; 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: 2020-12-31 13:22 **/ @Data @TableName("sys_user_feedback") public class SysUserFeedbackDO implements Serializable { private static final long serialVersionUID = 1L; /** * id */ private Long id; /** * 反馈内容 */ private String content; /** * 反馈图片，多个用逗号隔开 */ private String photoPah; /** * create_at */ @TableField(fill = FieldFill.INSERT) private Date createAt; /** * update_at */ @TableField(fill = FieldFill.INSERT_UPDATE) private Date updateAt; /** * 用户的id */ private Long userId; /** * 小区id */ private Long areaId; /** * 社区id */ private Long communityId; /** * 状态 */ private Integer status; } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
@@ -1,6 +1,7 @@ package com.panzhihua.service_user.service; import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO; import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.SystemmanagementConfigVO; @@ -229,4 +230,16 @@ * @return 清除结果 */ R deleteUserTest(Long userId); /** * 用户协议和隐私政策 * @param type 所属app 1居民端app 2网格员端app 3商家端app * @return 协议内容 */ R userAgreement(int type); /** * 意见反馈 * @param sysUserFeedbackDTO 反馈内容 * @return 反馈结果 */ R addFeedback(SysUserFeedbackDTO sysUserFeedbackDTO); } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -8,6 +8,7 @@ import com.panzhihua.common.constants.SecurityConstants; import com.panzhihua.common.constants.UserConstants; import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO; import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.SystemmanagementConfigVO; @@ -56,6 +57,8 @@ private SysOperLogDAO sysOperLogDAO; @Resource private SysUserAgreementDAO sysUserAgreementDAO; @Resource private SysUserFeedbackDAO sysUserFeedbackDAO; /** @@ -935,6 +938,35 @@ return R.fail("清除失败"); } /** * 用户协议和隐私政策 * * @param type 所属app 1居民端app 2网格员端app 3商家端app * @return 协议内容 */ @Override public R userAgreement(int type) { SysUserAgreementDO sysUserAgreementDO = sysUserAgreementDAO.selectOne(new QueryWrapper<SysUserAgreementDO>().lambda().eq(SysUserAgreementDO::getType, type)); return R.ok(sysUserAgreementDO); } /** * 意见反馈 * * @param sysUserFeedbackDTO 反馈内容 * @return 反馈结果 */ @Override public R addFeedback(SysUserFeedbackDTO sysUserFeedbackDTO) { SysUserFeedbackDO sysUserFeedbackDO=new SysUserFeedbackDO(); BeanUtils.copyProperties(sysUserFeedbackDTO,sysUserFeedbackDO); int insert = sysUserFeedbackDAO.insert(sysUserFeedbackDO); if (insert>0) { return R.ok(); } return R.fail(); } public static void main(String[] args) { String encode = new BCryptPasswordEncoder().encode("123456"); System.out.println(encode);
