springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml
@@ -23,60 +23,46 @@ </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 afterPath="$PROJECT_DIR$/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/AdvertisingManagementApi.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/dtos/PageDTO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/dtos/advertisement/ComOpsAdvDTO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/dtos/community/NoticeReadDTO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/user/SysUserNoticeVO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserNoticeDAO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserNoticeDO.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/java/com/panzhihua/applets_backstage/api/UserManagementApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/UserManagementApi.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/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/LoginUserInfoVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/advertisement/ComOpsAdvVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/advertisement/ComOpsAdvVO.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/LoginUserInfoVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/LoginUserInfoVO.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/advertisement/ComOpsAdvVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/advertisement/ComOpsAdvVO.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/AdvertisementApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/api/AdvertisementApi.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/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/model/dos/ComActDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComOpsAdvDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComOpsAdvDO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/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/ComOpsAdvService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComOpsAdvService.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/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/java/com/panzhihua/service_community/service/impl/ComOpsAdvServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComOpsAdvServiceImpl.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_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/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/dao/ComPbDynDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbDynDAO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/resources/bootstrap.yml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/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" /> @@ -233,15 +219,13 @@ <option name="Make" enabled="true" /> </method> </configuration> <configuration default="true" type="ArquillianTestNG" factoryName="" nameIsGenerated="true"> <configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true"> <option name="arquillianRunConfiguration"> <value> <option name="containerStateName" value="" /> </value> </option> <option name="TEST_OBJECT" value="CLASS" /> <properties /> <listeners /> <option name="TEST_OBJECT" value="class" /> <method v="2"> <option name="Make" enabled="true" /> </method> @@ -436,6 +420,7 @@ <workItem from="1609120765557" duration="31000" /> <workItem from="1609121031103" duration="30812000" /> <workItem from="1609219740946" duration="61933000" /> <workItem from="1609722105304" duration="16893000" /> </task> <servers /> </component> @@ -459,10 +444,10 @@ <screen x="0" y="0" width="1536" height="824" /> </state> <state x="249" y="0" key="#Project_Structure/0.0.1536.824@0.0.1536.824" timestamp="1608546608273" /> <state x="574" y="118" key="#com.intellij.ide.util.MemberChooser" timestamp="1609400589487"> <state x="574" y="118" key="#com.intellij.ide.util.MemberChooser" timestamp="1609759093334"> <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="1609400589487" /> <state x="574" y="118" key="#com.intellij.ide.util.MemberChooser/0.0.1536.824@0.0.1536.824" timestamp="1609759093334" /> <state x="405" y="335" key="#com.intellij.refactoring.move.MoveHandler.SelectRefactoringDialog" timestamp="1606099594079"> <screen x="0" y="0" width="1536" height="824" /> </state> @@ -487,54 +472,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="441" key="GridCell.Tab.0.bottom" timestamp="1609401602573"> <state width="1031" height="570" key="GridCell.Tab.0.bottom" timestamp="1609760426541"> <screen x="0" y="0" width="1536" height="824" /> </state> <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"> <state width="1031" height="570" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1609760426541" /> <state width="1031" height="570" key="GridCell.Tab.0.center" timestamp="1609760426541"> <screen x="0" y="0" width="1536" height="824" /> </state> <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"> <state width="1031" height="570" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1609760426541" /> <state width="1031" height="570" key="GridCell.Tab.0.left" timestamp="1609760426541"> <screen x="0" y="0" width="1536" height="824" /> </state> <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"> <state width="1031" height="570" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1609760426541" /> <state width="1031" height="570" key="GridCell.Tab.0.right" timestamp="1609760426541"> <screen x="0" y="0" width="1536" height="824" /> </state> <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"> <state width="1031" height="570" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1609760426541" /> <state width="1031" height="570" key="GridCell.Tab.1.bottom" timestamp="1609760426542"> <screen x="0" y="0" width="1536" height="824" /> </state> <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"> <state width="1031" height="570" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1609760426542" /> <state width="1031" height="570" key="GridCell.Tab.1.center" timestamp="1609760426541"> <screen x="0" y="0" width="1536" height="824" /> </state> <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"> <state width="1031" height="570" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1609760426541" /> <state width="1031" height="570" key="GridCell.Tab.1.left" timestamp="1609760426541"> <screen x="0" y="0" width="1536" height="824" /> </state> <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"> <state width="1031" height="570" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1609760426541" /> <state width="1031" height="570" key="GridCell.Tab.1.right" timestamp="1609760426542"> <screen x="0" y="0" width="1536" height="824" /> </state> <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"> <state width="1031" height="570" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1609760426542" /> <state width="1031" height="570" key="GridCell.Tab.2.bottom" timestamp="1609760426542"> <screen x="0" y="0" width="1536" height="824" /> </state> <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"> <state width="1031" height="570" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1609760426542" /> <state width="1031" height="570" key="GridCell.Tab.2.center" timestamp="1609760426542"> <screen x="0" y="0" width="1536" height="824" /> </state> <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"> <state width="1031" height="570" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1609760426542" /> <state width="1031" height="570" key="GridCell.Tab.2.left" timestamp="1609760426542"> <screen x="0" y="0" width="1536" height="824" /> </state> <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"> <state width="1031" height="570" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1609760426542" /> <state width="1031" height="570" key="GridCell.Tab.2.right" timestamp="1609760426542"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="441" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1609401602573" /> <state width="1031" height="570" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1609760426542" /> <state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1606714311663"> <screen x="0" y="0" width="1536" height="824" /> </state> @@ -555,10 +540,10 @@ <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="1609398596835"> <state x="468" y="42" width="766" height="782" key="find.popup" timestamp="1609722174373"> <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="1609398596835" /> <state x="468" y="42" width="766" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1609722174373" /> <state x="301" y="45" key="new project wizard" timestamp="1609120520884"> <screen x="0" y="0" width="1536" height="824" /> </state> @@ -571,10 +556,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="1609223814946"> <state x="431" y="145" width="672" height="678" key="search.everywhere.popup" timestamp="1609738864137"> <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="1609223814946" /> <state x="431" y="145" width="672" height="678" key="search.everywhere.popup/0.0.1536.824@0.0.1536.824" timestamp="1609738864137" /> </component> <component name="XDebuggerManager"> <pin-to-top-manager> springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java
@@ -1,12 +1,18 @@ package com.panzhihua.applets.api; import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.model.dtos.PageDTO; 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.ComActEasyPhotoVO; import com.panzhihua.common.model.vos.community.ComActMicroWishVO; import com.panzhihua.common.model.vos.user.SysUserNoticeVO; import com.panzhihua.common.service.community.CommunityService; import com.panzhihua.common.service.user.UserService; import com.panzhihua.common.validated.AddGroup; import com.panzhihua.common.validated.PageGroup; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; @@ -28,6 +34,8 @@ public class IndexApi extends BaseController { @Resource private CommunityService communityService; @Resource private UserService userService; @ApiOperation(value = "分页展示社区随手拍",response = ComActEasyPhotoVO.class) @PostMapping("pageeasyphoto") @@ -138,4 +146,26 @@ return communityService.putMicroWish(comActMicroWishVO); } @ApiOperation(value = "首页广告banner",response = ComOpsAdvVO.class) @GetMapping("listadvertisement") public R listAdvertisement (){ return communityService.listAdvertisement(); } @ApiOperation(value = "分页通知列表",response = SysUserNoticeVO.class) @PostMapping("pagenotice") public R pageNotice (@RequestBody @Validated(PageGroup.class) PageDTO pageDTO){ Long userId = this.getUserId(); pageDTO.setUserId(userId); return userService.pageNotice(pageDTO); } @ApiOperation(value = "通知已读") @PutMapping("notice") public R putNotice (@RequestBody NoticeReadDTO noticeReadDTO){ Long userId = this.getUserId(); noticeReadDTO.setUserId(userId); return userService.putNotice(noticeReadDTO); } } springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/AdvertisingManagementApi.java
New file @@ -0,0 +1,33 @@ package com.panzhihua.applets_backstage.api; import com.panzhihua.common.model.dtos.advertisement.ComOpsAdvDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComActVO; import com.panzhihua.common.validated.AddGroup; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 广告管理 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2021-01-04 09:28 **/ @Api(tags = {"广告管理"}) @RestController @RequestMapping("/advertisingmanagement/") public class AdvertisingManagementApi { @ApiOperation("新增广告") @PostMapping("advertisement") public R addAdvertisement(@RequestBody @Validated(AddGroup.class) ComOpsAdvDTO comOpsAdvDTO){ // comOpsAdvDTO.getLinkType(); // return communityService.addCommunity(comActVO); return null; } } springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/UserManagementApi.java
@@ -2,17 +2,16 @@ import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComActVO; import com.panzhihua.common.model.vos.user.SysUserVO; import com.panzhihua.common.service.community.CommunityService; import com.panzhihua.common.service.user.UserService; import com.panzhihua.common.validated.PageGroup; import com.panzhihua.common.validated.PutGroup; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -28,6 +27,8 @@ public class UserManagementApi { @Resource private UserService userService; @Resource private CommunityService communityService; @ApiOperation(value = "分页查询小程序用户",response = SysUserVO.class ) @PostMapping("pageuser") @@ -40,4 +41,10 @@ public R putUserAppletsBackstage(@RequestBody @Validated(PutGroup.class) PageUserAppletsBackstageDTO pageUserAppletsBackstageDTO){ return userService.putUserAppletsBackstage(pageUserAppletsBackstageDTO); } @ApiOperation(value = "社区下拉列表" ,response = ComActVO.class) @GetMapping("listcommunity") public R listCommunity(){ return communityService.listCommunityAll(); } } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/PageDTO.java
New file @@ -0,0 +1,33 @@ package com.panzhihua.common.model.dtos; import com.panzhihua.common.validated.PageGroup; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.Min; import javax.validation.constraints.NotNull; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 分页 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2021-01-04 17:20 **/ @Data @ApiModel(value = "分页参数") public class PageDTO { @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; @ApiModelProperty(value = "登录用户",hidden = true) private Long userId; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/advertisement/ComOpsAdvDTO.java
New file @@ -0,0 +1,59 @@ package com.panzhihua.common.model.dtos.advertisement; import com.panzhihua.common.validated.AddGroup; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.Min; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.util.Date; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 广告新增 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2021-01-04 09:43 **/ @Data @ApiModel(value = "广告新增") public class ComOpsAdvDTO { @ApiModelProperty("主键id") private Long id; @ApiModelProperty("广告位置id") @NotNull(groups = {AddGroup.class},message = "广告位置不能为空") @Min(value =1,groups = {AddGroup.class},message = "广告位置不能为空") private Long posId; @ApiModelProperty("图片路径") @NotBlank(groups = {AddGroup.class},message = "图片路径不能为空") private String photoPath; @ApiModelProperty("链接类型：0~ 外部链接；1 ~ 内部链接") @NotNull(groups = {AddGroup.class},message = "链接类型不能为空") @Min(value =0,groups = {AddGroup.class},message = "链接类型不能为空") private Integer linkType; @ApiModelProperty(value = "上架时间",example = "2021-01-04 00:00:00") @NotNull(groups = {AddGroup.class},message = "上架时间不能为空") private Date onAt; @ApiModelProperty("下架时间") @NotNull(groups = {AddGroup.class},message = "下架时间不能为空") private Date offAt; @ApiModelProperty("跳转内容id") private Long jumpId; @ApiModelProperty("跳转url地址") private String jumpUrl; @ApiModelProperty("create_at") private Date createAt; @ApiModelProperty("update_at") private Date updateAt; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/NoticeReadDTO.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-04 19:12 **/ @Data @ApiModel("通知已读") public class NoticeReadDTO { @ApiModelProperty("是否全部已读 1 是 0 否") private Integer all; @ApiModelProperty("单独读取某条通知的id") private Long id; @ApiModelProperty(value = "用户id",hidden = true) private Long userId; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java
@@ -1,5 +1,6 @@ package com.panzhihua.common.model.vos; import com.fasterxml.jackson.annotation.JsonFormat; import com.panzhihua.common.model.vos.community.ComActVO; import com.panzhihua.common.model.vos.community.ComMngStructAreaVO; import com.panzhihua.common.model.vos.community.ComMngStructHouseVO; @@ -64,11 +65,10 @@ private String communityName; @ApiModelProperty("性别 1 男 2 女") @Min(value = 1,groups = {AddGroup.class},message = "性别不能为空") private Integer sex; @ApiModelProperty("生日") @NotNull(groups = {AddGroup.class},message = "生日不能为空") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date birthday; @ApiModelProperty("头像") @@ -78,7 +78,6 @@ private Integer type; @ApiModelProperty("职业") @NotBlank(groups = {AddGroup.class},message = "职业不能为空") private String job; @ApiModelProperty("是否志愿者 0否 1 是") springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/advertisement/ComOpsAdvVO.java
@@ -1,5 +1,6 @@ package com.panzhihua.common.model.vos.advertisement; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -19,7 +20,7 @@ @ApiModelProperty("自增id") private Long id; @ApiModelProperty("广告位置id") @ApiModelProperty("广告位置id 1 表示放在首页") private Integer posId; @ApiModelProperty("图片路径") @@ -29,21 +30,25 @@ private Integer linkType; @ApiModelProperty("上架时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date onAt; @ApiModelProperty("下架时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date offAt; @ApiModelProperty("跳转内容id") @ApiModelProperty("跳转内容id 1 随手拍 2 人脸识别 3 政策文件") private Long jumpId; @ApiModelProperty("跳转url地址") private String jumpUrl; @ApiModelProperty("新增时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createAt; @ApiModelProperty("编辑时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date updateAt;
@@ -108,6 +108,7 @@ private Long logInUserId; @ApiModelProperty("反馈时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date feedbackAt; @ApiModelProperty("发起人手机号") springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysUserNoticeVO.java
New file @@ -0,0 +1,62 @@ package com.panzhihua.common.model.vos.user; 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-04 17:07 **/ @Data @ApiModel("系统通知") public class SysUserNoticeVO { @ApiModelProperty("id") private Long id; @ApiModelProperty("用户id") private Long userId; @ApiModelProperty("类型 1活动 2 服务 3系统 4积分消息") private Integer type; @ApiModelProperty("消息标题") private String title; @ApiModelProperty("具体业务类型 1 社区活动 2社区活动 3微心愿通知 4随手拍服务通知 5支援者申请 6实名制审核 7人脸识别审核 8积分获取和消耗 9积分点击直接跳转积分列表") private Integer businessType; @ApiModelProperty("业务标题") private String businessTitle; @ApiModelProperty("业务内容") private String businessContent; @ApiModelProperty("业务发生时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date businessTime; @ApiModelProperty("业务状态 1未通过、取消 2 成功") private Integer businessStatus; @ApiModelProperty("消息发出时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createAt; @ApiModelProperty("消息读取时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date updateAt; @ApiModelProperty("消息状态 0 未读 1 已读") private Integer status; @ApiModelProperty("业务主键 用于跳转") private Long businessId; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -533,4 +533,18 @@ */ @PostMapping("detailvolunteer") R detailVolunteer(@RequestParam("id")Long id); /** * 查询平台所有的社区 * @return 社区集合 按照创建顺序倒序排列 */ @PostMapping("listcommunityall") R listCommunityAll(); /** * 首页广告banner * @return */ @PostMapping("listadvertisement") R listAdvertisement(); } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
@@ -1,5 +1,7 @@ package com.panzhihua.common.service.user; import com.panzhihua.common.model.dtos.PageDTO; import com.panzhihua.common.model.dtos.community.NoticeReadDTO; import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO; import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO; import com.panzhihua.common.model.vos.LoginUserInfoVO; @@ -379,4 +381,20 @@ */ @PostMapping("addfeedback") R addFeedback(@RequestBody SysUserFeedbackDTO sysUserFeedbackDTO); /** * 分页通知列表 * @param pageDTO 分页参数 * @return 分页结果 */ @PostMapping("pagenotice") R pageNotice(@RequestBody PageDTO pageDTO); /** * 通知已读 * @param noticeReadDTO 通知已读 * @return 修改状态 */ @PostMapping("putnotice") R putNotice(@RequestBody NoticeReadDTO noticeReadDTO); } springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/dtos/PageDTO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/dtos/advertisement/ComOpsAdvDTO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/dtos/community/NoticeReadDTO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/LoginUserInfoVO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/advertisement/ComOpsAdvVO.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/user/SysUserNoticeVO.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/user/UserService.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityManagerApi.java
@@ -1,5 +1,6 @@ package com.panzhihua.community_backstage.api; import com.alibaba.fastjson.JSONObject; import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; @@ -75,7 +76,7 @@ if (ok) { Object data = r.getData(); if (!ObjectUtils.isEmpty(data)) { LoginUserInfoVO loginUserInfoVO=(LoginUserInfoVO)data; LoginUserInfoVO loginUserInfoVO= JSONObject.parseObject(JSONObject.toJSONString(data),LoginUserInfoVO.class); R r1=communityService.detailHouse(userId); if (R.isOk(r1)) { Object data1 = r1.getData(); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/AdvertisementApi.java
@@ -42,4 +42,13 @@ public R putJumpContent(@RequestBody AppletesBackstageConfigDTO appletesBackstageConfigDTO){ return comOpsAdvService.putJumpContent(appletesBackstageConfigDTO); } /** * 首页广告banner * @return 广告列表 */ @PostMapping("listadvertisement") public R listAdvertisement(){ return comOpsAdvService.listAdvertisement(); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
@@ -929,4 +929,13 @@ return r; } /** * 查询平台所有的社区 * @return 社区集合 按照创建顺序倒序排列 */ @PostMapping("listcommunityall") public R listCommunityAll(){ return comActService.listCommunityAll(); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDO.java
@@ -92,7 +92,7 @@ /** * 状态 0 启用 1 禁用 */ private boolean state; private Integer state; } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComOpsAdvDO.java
@@ -61,7 +61,7 @@ * 创建时间 */ @TableField(fill = FieldFill.INSERT) private Date createDt; private Date createAt; /** * 修改时间 */ springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActService.java
@@ -41,5 +41,9 @@ * @return 分页集合 */ R pageCommunity(PageComActDTO pageComActDTO); /** * 查询平台所有的社区 * @return 社区集合 按照创建顺序倒序排列 */ R listCommunityAll(); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComOpsAdvService.java
@@ -21,4 +21,9 @@ * @return 编辑结果 */ R putJumpContent(AppletesBackstageConfigDTO appletesBackstageConfigDTO); /** * 首页广告banner * @return 广告列表 */ R listAdvertisement(); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java
@@ -155,9 +155,10 @@ // 操作类型 1审核通过 2驳回 3反馈 ComActEasyPhotoDO cmActEasyPhotoDO=new ComActEasyPhotoDO(); cmActEasyPhotoDO.setId(comActEasyPhotoVO.getId()); int isNeedFeedBack = comActEasyPhotoVO.getIsNeedFeedBack().intValue(); switch (type){ case 1: int isNeedFeedBack = comActEasyPhotoVO.getIsNeedFeedBack().intValue(); if (isNeedFeedBack==1) { cmActEasyPhotoDO.setStatus(2);//进行中 }else{ springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java
@@ -1,5 +1,6 @@ package com.panzhihua.service_community.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.panzhihua.common.model.dtos.community.PageComActDTO; @@ -14,6 +15,7 @@ import org.springframework.util.ObjectUtils; import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; /** @@ -113,7 +115,24 @@ return R.ok(iPage); } /** * 查询平台所有的社区 * * @return 社区集合 按照创建顺序倒序排列 */ @Override public R listCommunityAll() { List<ComActDO> comActDOS = comActDAO.selectList(new QueryWrapper<ComActDO>().lambda().eq(ComActDO::getState, 0).orderByDesc(ComActDO::getCreateAt)); List<ComActVO> comActVOS=new ArrayList<>(); if (!ObjectUtils.isEmpty(comActDOS)) { comActDOS.forEach(comActDO -> { ComActVO comActVO=new ComActVO(); BeanUtils.copyProperties(comActDO,comActVO); comActVOS.add(comActVO); }); } return R.ok(comActVOS); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComOpsAdvServiceImpl.java
@@ -1,14 +1,18 @@ package com.panzhihua.service_community.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.panzhihua.common.exceptions.ServiceException; import com.panzhihua.common.model.dtos.AppletesBackstageConfigDTO; import com.panzhihua.common.model.dtos.advertisement.ComOpsAdvJumpDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.advertisement.ComOpsAdvJumpVO; import com.panzhihua.common.model.vos.advertisement.ComOpsAdvVO; import com.panzhihua.service_community.dao.ComOpsAdvDAO; import com.panzhihua.service_community.dao.ComOpsAdvJumpDAO; import com.panzhihua.service_community.model.dos.ComOpsAdvDO; import com.panzhihua.service_community.model.dos.ComOpsAdvJumpDO; import com.panzhihua.service_community.service.ComOpsAdvService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.ObjectUtils; @@ -87,4 +91,23 @@ }); return R.ok(); } /** * 首页广告banner * * @return 广告列表 */ @Override public R listAdvertisement() { List<ComOpsAdvDO> comOpsAdvDOS = comOpsAdvDAO.selectList(new QueryWrapper<ComOpsAdvDO>().last(" where SYSDATE() BETWEEN on_at and off_at ")); List<ComOpsAdvVO> comOpsAdvVOS=new ArrayList<>(); if (!ObjectUtils.isEmpty(comOpsAdvDOS)) { comOpsAdvDOS.forEach(comOpsAdvDO -> { ComOpsAdvVO comOpsAdvVO=new ComOpsAdvVO(); BeanUtils.copyProperties(comOpsAdvDO,comOpsAdvVO); comOpsAdvVOS.add(comOpsAdvVO); }); } return R.ok(comOpsAdvVOS); } } springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComBpActivityDAO.java
@@ -63,6 +63,7 @@ "activity_time_begin,\n" + "activity_time_end,\n" + "enroll_time_begin,\n" + "cover,\n" + "enroll_time_end \n" + "FROM\n" + "com_pb_activity \n" + springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbDynDAO.java
@@ -27,6 +27,7 @@ "COUNT( u.id ) readingVolume,\n" + "d.`status`,\n" + "d.publish_at,\n" + "d.content,\n" + "d.create_at \n" + "FROM\n" + "com_pb_dyn d\n" + springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
@@ -1,5 +1,7 @@ package com.panzhihua.service_user.api; import com.panzhihua.common.model.dtos.PageDTO; import com.panzhihua.common.model.dtos.community.NoticeReadDTO; import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO; import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO; import com.panzhihua.common.model.vos.LoginUserInfoVO; @@ -392,4 +394,24 @@ public R addFeedback(@RequestBody SysUserFeedbackDTO sysUserFeedbackDTO){ return userService.addFeedback(sysUserFeedbackDTO); } /** * 分页通知列表 * @param pageDTO 分页参数 * @return 分页结果 */ @PostMapping("pagenotice") public R pageNotice(@RequestBody PageDTO pageDTO){ return userService.pageNotice(pageDTO); } /** * 通知已读 * @param noticeReadDTO 通知已读 * @return 修改状态 */ @PostMapping("putnotice") public R putNotice(@RequestBody NoticeReadDTO noticeReadDTO){ return userService.putNotice(noticeReadDTO); } } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserNoticeDAO.java
New file @@ -0,0 +1,17 @@ package com.panzhihua.service_user.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.panzhihua.service_user.model.dos.SysUserFeedbackDO; import com.panzhihua.service_user.model.dos.SysUserNoticeDO; import org.apache.ibatis.annotations.Mapper; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 通知 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2021-01-04 17:24 **/ @Mapper public interface SysUserNoticeDAO extends BaseMapper<SysUserNoticeDO> { } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
@@ -4,9 +4,11 @@ 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.PageDTO; import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.user.AdministratorsUserVO; import com.panzhihua.common.model.vos.user.SysUserNoticeVO; import com.panzhihua.common.model.vos.user.SysUserVO; import com.panzhihua.service_user.model.dos.SysUserDO; import org.apache.ibatis.annotations.Mapper; @@ -42,8 +44,7 @@ "u.phone,\n" + "u.id_card,\n" + "u.face_state,\n" + "c.NAME,\n" + "is_tanant,\n" + "c.name,\n" + "u.create_at \n" + "FROM\n" + "sys_user u\n" + @@ -71,8 +72,7 @@ "u.phone,\n" + "u.id_card,\n" + "u.job,\n" + "c.NAME,\n" + "u.is_tanant,\n" + "c.name,\n" + "u.tags,\n" + "u.create_at \n" + "FROM\n" + @@ -138,7 +138,8 @@ "u.last_login_time\n" + "from sys_user u\n" + "left join com_act a on u.community_id=a.community_id\n" + " <where>" + " where\n" + "u.type=1\n"+ "<if test='pageUserAppletsBackstageDTO.phone != null and pageUserAppletsBackstageDTO.phone.trim() != ""'>" + "and u.phone=#{pageUserAppletsBackstageDTO.phone}\n" + " </if> " + @@ -154,10 +155,11 @@ "<if test='pageUserAppletsBackstageDTO.lastLoginTimeBegin != null '>" + "and u.last_login_time between #{pageUserAppletsBackstageDTO.lastLoginTimeBegin} and #{pageUserAppletsBackstageDTO.lastLoginTimeEnd}\n" + " </if> " + " </where>" + "order by u.create_at desc \n" + "</script>") IPage<SysUserVO> pageUserAppletsBackstage(Page page, @Param("pageUserAppletsBackstageDTO") PageUserAppletsBackstageDTO pageUserAppletsBackstageDTO); @Update("update sys_user set nick_name=null ,community_id=null,area_id=null where user_id=#{userId}") int deleteUserTest(Long userId); @Select("select * from sys_user_notice where user_id=#{pageDTO.userId} order by create_at desc ") IPage<SysUserNoticeVO> pageNotice(Page page, @Param("pageDTO") PageDTO pageDTO); } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserNoticeDO.java
New file @@ -0,0 +1,89 @@ 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 io.swagger.models.auth.In; 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-04 17:06 **/ @Data @TableName("sys_user_notice") public class SysUserNoticeDO implements Serializable { private static final long serialVersionUID = 1L; /** * id */ private Long id; /** * 用户id */ private Long userId; /** * 类型 1活动 2 服务 3系统 4积分消息 */ private Integer type; /** * 消息标题 */ private String title; /** * 具体业务类型 1 社区活动 2社区活动 3微心愿通知 4随手拍服务通知 5支援者申请 6实名制审核 7人脸识别审核 8积分获取和消耗 9积分点击直接跳转积分列表 */ private Integer businessType; /** * 业务标题 */ private String businessTitle; /** * 业务内容 */ private String businessContent; /** * 业务发生时间 */ private Date businessTime; /** * 业务状态 1未通过、取消 2 成功 */ private Integer businessStatus; /** * 消息发出时间 */ @TableField(fill = FieldFill.INSERT) private Date createAt; /** * 消息读取时间 */ @TableField(fill = FieldFill.INSERT_UPDATE) private Date updateAt; /** * 消息状态 0 未读 1 已读 */ private Integer status; /** * 业务主键 用于跳转 */ private Long businessId; } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
@@ -1,5 +1,7 @@ package com.panzhihua.service_user.service; import com.panzhihua.common.model.dtos.PageDTO; import com.panzhihua.common.model.dtos.community.NoticeReadDTO; import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO; import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO; import com.panzhihua.common.model.vos.LoginUserInfoVO; @@ -242,4 +244,16 @@ * @return 反馈结果 */ R addFeedback(SysUserFeedbackDTO sysUserFeedbackDTO); /** * 分页通知列表 * @param pageDTO 分页参数 * @return 分页结果 */ R pageNotice(PageDTO pageDTO); /** * 通知已读 * @param noticeReadDTO 通知已读 * @return 修改状态 */ R putNotice(NoticeReadDTO noticeReadDTO); } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.panzhihua.common.constants.SecurityConstants; import com.panzhihua.common.constants.UserConstants; import com.panzhihua.common.model.dtos.PageDTO; import com.panzhihua.common.model.dtos.community.NoticeReadDTO; import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO; import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO; import com.panzhihua.common.model.vos.LoginUserInfoVO; @@ -59,6 +61,8 @@ private SysUserAgreementDAO sysUserAgreementDAO; @Resource private SysUserFeedbackDAO sysUserFeedbackDAO; @Resource private SysUserNoticeDAO sysUserNoticeDAO; /** @@ -967,6 +971,54 @@ return R.fail(); } /** * 分页通知列表 * * @param pageDTO 分页参数 * @return 分页结果 */ @Override public R pageNotice(PageDTO pageDTO) { Long userId=pageDTO.getUserId(); Integer integer = sysUserNoticeDAO.selectCount(new QueryWrapper<SysUserNoticeDO>().lambda().eq(SysUserNoticeDO::getUserId, userId).eq(SysUserNoticeDO::getStatus, 0)); Page page = new Page<>(); Long pageNum = pageDTO.getPageNum(); Long pageSize = pageDTO.getPageSize(); page.setSize(pageSize); page.setCurrent(pageNum); IPage<SysUserNoticeVO> iPage = userDao.pageNotice(page, pageDTO); Map<String,Object> map=new HashMap<>(2); map.put("page",iPage); map.put("unreadNum",null==integer?0:integer); return R.ok(map); } /** * 通知已读 * * @param noticeReadDTO 通知已读 * @return 修改状态 */ @Override public R putNotice(NoticeReadDTO noticeReadDTO) { Integer all = noticeReadDTO.getAll(); Long userId = noticeReadDTO.getUserId(); int num=0; SysUserNoticeDO sysUserNoticeDO=new SysUserNoticeDO(); if (null!=all&&1==all.intValue()) { sysUserNoticeDO.setStatus(1); num=sysUserNoticeDAO.update(sysUserNoticeDO,new UpdateWrapper<SysUserNoticeDO>().lambda().eq(SysUserNoticeDO::getUserId,userId).eq(SysUserNoticeDO::getStatus,0)); }else{ sysUserNoticeDO.setId(noticeReadDTO.getId()); sysUserNoticeDO.setStatus(1); num=sysUserNoticeDAO.updateById(sysUserNoticeDO); } if (num>0) { return R.ok(); } return R.fail("通知不存在"); } public static void main(String[] args) { String encode = new BCryptPasswordEncoder().encode("123456"); System.out.println(encode);
