springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml
@@ -23,50 +23,51 @@ </component> <component name="ChangeListManager"> <list default="true" id="8ba27629-3e5d-4f42-993e-d0c055bc9371" name="Default Changelist" comment=""> <change afterPath="$PROJECT_DIR$/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/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 afterPath="$PROJECT_DIR$/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/IndexApi.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/dtos/user/PageFeedBackDTO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/IndexDataKanbanVO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/user/NoticeUnReadVO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/user/SysUserFeedbackVO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/model/dtos/DataKanbanDTO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/applets/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/AdvertisingManagementApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/AdvertisingManagementApi.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/CommunityApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/CommunityApi.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/SystemManagementApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/SystemManagementApi.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/UserApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/UserApi.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/UserManagementApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/UserManagementApi.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/applets_backstage/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/applets_backstage/src/main/resources/bootstrap.yml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/auth/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/auth/src/main/resources/bootstrap.yml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/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/dtos/PageDTO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/dtos/PageDTO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/dtos/advertisement/ComOpsAdvDTO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/dtos/advertisement/ComOpsAdvDTO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/advertisement/ComOpsAdvPosVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/advertisement/ComOpsAdvPosVO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/user/MenuRoleVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/user/MenuRoleVO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/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/user/UserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/service/user/UserService.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/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/dtos/PageDTO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/dtos/PageDTO.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/dtos/advertisement/ComOpsAdvDTO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/dtos/advertisement/ComOpsAdvDTO.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/advertisement/ComOpsAdvPosVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/advertisement/ComOpsAdvPosVO.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/user/MenuRoleVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/user/MenuRoleVO.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/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/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/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/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/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/model/dos/ComOpsAdvPosDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComOpsAdvPosDO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComActService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComActService.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComOpsAdvService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComOpsAdvService.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/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/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/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/RoleApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/api/RoleApi.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserFeedbackDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserFeedbackDAO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserNoticeDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserNoticeDAO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysRoleMenuDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysRoleMenuDO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserDO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserFeedbackDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserFeedbackDO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/RoleService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/RoleService.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/impl/RoleServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/impl/RoleServiceImpl.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_user/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/resources/bootstrap.yml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/zuul/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/zuul/src/main/resources/bootstrap.yml" afterDir="false" /> </list> <option name="SHOW_DIALOG" value="false" /> <option name="HIGHLIGHT_CONFLICTS" value="true" /> @@ -118,7 +119,7 @@ <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" /> <property name="WebServerToolWindowFactoryState" value="false" /> <property name="aspect.path.notification.shown" value="true" /> <property name="last_opened_file_path" value="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common" /> <property name="last_opened_file_path" value="$PROJECT_DIR$/../../../pinganxiaoqu/project_branch" /> <property name="project.structure.last.edited" value="Modules" /> <property name="project.structure.proportion" value="0.15" /> <property name="project.structure.side.proportion" value="0.2850575" /> @@ -420,7 +421,7 @@ <workItem from="1609120765557" duration="31000" /> <workItem from="1609121031103" duration="30812000" /> <workItem from="1609219740946" duration="61933000" /> <workItem from="1609722105304" duration="16893000" /> <workItem from="1609722105304" duration="44575000" /> </task> <servers /> </component> @@ -444,10 +445,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="1609759093334"> <state x="574" y="118" key="#com.intellij.ide.util.MemberChooser" timestamp="1609836663929"> <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="1609759093334" /> <state x="574" y="118" key="#com.intellij.ide.util.MemberChooser/0.0.1536.824@0.0.1536.824" timestamp="1609836663929" /> <state x="405" y="335" key="#com.intellij.refactoring.move.MoveHandler.SelectRefactoringDialog" timestamp="1606099594079"> <screen x="0" y="0" width="1536" height="824" /> </state> @@ -460,66 +461,66 @@ <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="1609395795616"> <state width="561" height="466" key="DebuggerActiveHint" timestamp="1609840725565"> <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="1609395795616" /> <state width="561" height="466" key="DebuggerActiveHint/0.0.1536.824@0.0.1536.824" timestamp="1609840725565" /> <state x="93" y="93" width="1350" height="638" key="DiffContextDialog" timestamp="1609316182000"> <screen x="0" y="0" width="1536" height="824" /> </state> <state x="93" y="93" width="1350" height="638" key="DiffContextDialog/0.0.1536.824@0.0.1536.824" timestamp="1609316182000" /> <state x="549" y="167" key="FileChooserDialogImpl" timestamp="1606197830966"> <state x="549" y="167" key="FileChooserDialogImpl" timestamp="1609823156997"> <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="570" key="GridCell.Tab.0.bottom" timestamp="1609760426541"> <state x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1609823156997" /> <state width="1031" height="395" key="GridCell.Tab.0.bottom" timestamp="1609840730065"> <screen x="0" y="0" width="1536" height="824" /> </state> <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"> <state width="1031" height="395" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1609840730065" /> <state width="1031" height="395" key="GridCell.Tab.0.center" timestamp="1609840730065"> <screen x="0" y="0" width="1536" height="824" /> </state> <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"> <state width="1031" height="395" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1609840730065" /> <state width="1031" height="395" key="GridCell.Tab.0.left" timestamp="1609840730064"> <screen x="0" y="0" width="1536" height="824" /> </state> <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"> <state width="1031" height="395" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1609840730064" /> <state width="1031" height="395" key="GridCell.Tab.0.right" timestamp="1609840730065"> <screen x="0" y="0" width="1536" height="824" /> </state> <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"> <state width="1031" height="395" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1609840730065" /> <state width="1031" height="395" key="GridCell.Tab.1.bottom" timestamp="1609840730066"> <screen x="0" y="0" width="1536" height="824" /> </state> <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"> <state width="1031" height="395" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1609840730066" /> <state width="1031" height="395" key="GridCell.Tab.1.center" timestamp="1609840730066"> <screen x="0" y="0" width="1536" height="824" /> </state> <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"> <state width="1031" height="395" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1609840730066" /> <state width="1031" height="395" key="GridCell.Tab.1.left" timestamp="1609840730066"> <screen x="0" y="0" width="1536" height="824" /> </state> <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"> <state width="1031" height="395" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1609840730066" /> <state width="1031" height="395" key="GridCell.Tab.1.right" timestamp="1609840730066"> <screen x="0" y="0" width="1536" height="824" /> </state> <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"> <state width="1031" height="395" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1609840730066" /> <state width="1031" height="395" key="GridCell.Tab.2.bottom" timestamp="1609840730066"> <screen x="0" y="0" width="1536" height="824" /> </state> <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"> <state width="1031" height="395" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1609840730066" /> <state width="1031" height="395" key="GridCell.Tab.2.center" timestamp="1609840730066"> <screen x="0" y="0" width="1536" height="824" /> </state> <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"> <state width="1031" height="395" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1609840730066" /> <state width="1031" height="395" key="GridCell.Tab.2.left" timestamp="1609840730066"> <screen x="0" y="0" width="1536" height="824" /> </state> <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"> <state width="1031" height="395" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1609840730066" /> <state width="1031" height="395" key="GridCell.Tab.2.right" timestamp="1609840730066"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="570" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1609760426542" /> <state width="1031" height="395" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1609840730066" /> <state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1606714311663"> <screen x="0" y="0" width="1536" height="824" /> </state> @@ -528,10 +529,10 @@ <screen x="0" y="0" width="1536" height="824" /> </state> <state x="270" y="57" key="SettingsEditor/0.0.1536.824@0.0.1536.824" timestamp="1606120706449" /> <state width="498" height="540" key="SwitcherDM" timestamp="1609312215199"> <state width="498" height="540" key="SwitcherDM" timestamp="1609839753727"> <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 width="498" height="540" key="SwitcherDM/0.0.1536.824@0.0.1536.824" timestamp="1609839753727" /> <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> @@ -540,10 +541,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="1609722174373"> <state x="468" y="42" width="766" height="782" key="find.popup" timestamp="1609841206383"> <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="1609722174373" /> <state x="468" y="42" width="766" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1609841206382" /> <state x="301" y="45" key="new project wizard" timestamp="1609120520884"> <screen x="0" y="0" width="1536" height="824" /> </state> @@ -556,10 +557,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="1609738864137"> <state x="431" y="145" width="672" height="678" key="search.everywhere.popup" timestamp="1609838280331"> <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="1609738864137" /> <state x="431" y="145" width="672" height="678" key="search.everywhere.popup/0.0.1536.824@0.0.1536.824" timestamp="1609838280331" /> </component> <component name="XDebuggerManager"> <pin-to-top-manager> springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java
@@ -8,6 +8,7 @@ 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.NoticeUnReadVO; import com.panzhihua.common.model.vos.user.SysUserNoticeVO; import com.panzhihua.common.service.community.CommunityService; import com.panzhihua.common.service.user.UserService; @@ -168,4 +169,11 @@ return userService.putNotice(noticeReadDTO); } @ApiOperation(value = "未读消息汇总",response = NoticeUnReadVO.class) @GetMapping("noticeunreadnum") public R noticeUnreadNum (){ Long userId = this.getUserId(); return userService.noticeUnreadNum(userId); } } springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/AdvertisingManagementApi.java
@@ -1,16 +1,19 @@ package com.panzhihua.applets_backstage.api; import com.panzhihua.common.interfaces.OperLog; 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.model.vos.advertisement.ComOpsAdvJumpVO; import com.panzhihua.common.model.vos.advertisement.ComOpsAdvPosVO; import com.panzhihua.common.service.community.CommunityService; import com.panzhihua.common.validated.AddGroup; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.util.ObjectUtils; 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; /** * @program: springcloud_k8s_panzhihuazhihuishequ @@ -22,12 +25,68 @@ @RestController @RequestMapping("/advertisingmanagement/") public class AdvertisingManagementApi { @Resource private CommunityService communityService; @ApiOperation("新增广告") @PostMapping("advertisement") @OperLog(operModul = "广告管理",operType = 1) public R addAdvertisement(@RequestBody @Validated(AddGroup.class) ComOpsAdvDTO comOpsAdvDTO){ // comOpsAdvDTO.getLinkType(); // return communityService.addCommunity(comActVO); return null; Integer linkType = comOpsAdvDTO.getLinkType(); if (linkType.intValue()==1) { Long jumpId = comOpsAdvDTO.getJumpId(); if (null==jumpId||0==jumpId.intValue()) { return R.fail("跳转内容不能为空"); } comOpsAdvDTO.setJumpUrl(null); } else { String jumpUrl = comOpsAdvDTO.getJumpUrl(); if (ObjectUtils.isEmpty(jumpUrl)) { return R.fail("跳转url地址不能为空"); } comOpsAdvDTO.setJumpId(null); } return communityService.addAdvertisement(comOpsAdvDTO); } @ApiOperation("编辑广告") @PutMapping("advertisement") @OperLog(operModul = "广告管理",operType = 2) public R putAdvertisement(@RequestBody ComOpsAdvDTO comOpsAdvDTO){ Long posId = comOpsAdvDTO.getPosId(); if (null!=posId&&posId==0) { comOpsAdvDTO.setPosId(null); } Long id = comOpsAdvDTO.getId(); if (null==id||id.intValue()==0) { return R.fail("广告主键不能为空"); } Integer linkType = comOpsAdvDTO.getLinkType(); if (linkType.intValue()==1) { Long jumpId = comOpsAdvDTO.getJumpId(); if (null==jumpId||0==jumpId.intValue()) { return R.fail("跳转内容不能为空"); } comOpsAdvDTO.setJumpUrl(null); } else { String jumpUrl = comOpsAdvDTO.getJumpUrl(); if (ObjectUtils.isEmpty(jumpUrl)) { return R.fail("跳转url地址不能为空"); } comOpsAdvDTO.setJumpId(null); } return communityService.putAdvertisement(comOpsAdvDTO); } @ApiOperation(value = "广告位置下拉列表",response = ComOpsAdvPosVO.class) @GetMapping("listadvpos") public R listadvpos(){ return communityService.listAdvpos(); } @ApiOperation(value = "跳转内容下拉列表",response = ComOpsAdvJumpVO.class) @GetMapping("listadvjump") public R listadvjump(){ return communityService.listAdvjump(); } } springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/CommunityApi.java
@@ -1,5 +1,6 @@ package com.panzhihua.applets_backstage.api; import com.panzhihua.common.interfaces.OperLog; import com.panzhihua.common.model.dtos.community.PageComActDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComActVO; @@ -31,12 +32,14 @@ @ApiOperation("新增社区") @PostMapping("community") @OperLog(operModul = "社区管理",operType = 1) public R addCommunity(@RequestBody @Validated(AddGroup.class) ComActVO comActVO){ return communityService.addCommunity(comActVO); } @ApiOperation("编辑社区") @PutMapping("community") @OperLog(operModul = "社区管理",operType = 2) public R putCommunity(@RequestBody ComActVO comActVO){ Long communityId = comActVO.getCommunityId(); if (null==communityId||0==communityId) { springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/IndexApi.java
New file @@ -0,0 +1,32 @@ package com.panzhihua.applets_backstage.api; import com.panzhihua.common.model.vos.IndexDataKanbanVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.service.user.UserService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 首页接口 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2021-01-05 15:17 **/ @Api(tags = {"首页接口"}) @RestController @RequestMapping("/index/") public class IndexApi { @Resource private UserService userService; @ApiOperation(value = "数据看板",response = IndexDataKanbanVO.class) @GetMapping("datakanban") public R dataKanban(){ return userService.dataKanban(); } } springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/SystemManagementApi.java
@@ -4,6 +4,7 @@ import com.panzhihua.common.interfaces.OperLog; import com.panzhihua.common.model.dtos.AppletesBackstageConfigDTO; import com.panzhihua.common.model.dtos.advertisement.ComOpsAdvJumpDTO; import com.panzhihua.common.model.dtos.user.PageFeedBackDTO; import com.panzhihua.common.model.vos.AppletesBackstageConfigVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.advertisement.ComOpsAdvJumpVO; @@ -12,6 +13,7 @@ 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.ApiOperation; import org.springframework.util.ObjectUtils; @@ -129,6 +131,7 @@ @PutMapping("menu") @OperLog(operModul = "角色管理",operType = 2) public R putMenuRole(@RequestBody @Validated MenuRoleVO menuRoleVO){ menuRoleVO.setCommunityId(0l); return userService.putMenuRole(menuRoleVO); } @@ -148,6 +151,7 @@ @ApiOperation(value = "编辑用户协议") @PutMapping("agreement") @OperLog(operModul = "用户协议",operType = 2) public R putAgreement(@RequestBody SysUserAgreementVO sysUserAgreementVO){ Long id = sysUserAgreementVO.getId(); if (null==id||id==0) { @@ -164,6 +168,7 @@ @ApiOperation(value = "编辑系统配置") @PutMapping("config") @OperLog(operModul = "系统配置",operType = 2) public R putConfig(@RequestBody AppletesBackstageConfigDTO appletesBackstageConfigDTO){ List<ComOpsAdvJumpDTO> comOpsAdvJumpDTOS = appletesBackstageConfigDTO.getComOpsAdvJumpDTOS(); if (ObjectUtils.isEmpty(comOpsAdvJumpDTOS)) { @@ -171,4 +176,16 @@ } return communityService.putJumpContent(appletesBackstageConfigDTO); } @ApiOperation(value = "分页查询用户意见反馈",response = SysUserFeedbackVO.class) @PostMapping("pagefeedback") public R pageFeedback(@RequestBody @Validated(PageGroup.class) PageFeedBackDTO pageFeedBackDTO){ return userService.pageFeedback(pageFeedBackDTO); } @ApiOperation(value = "反馈意见详情",response = SysUserFeedbackVO.class) @GetMapping("feedback") public R detailFeedback(@RequestParam("id") Long id){ return userService.detailFeedback(id); } } springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/UserApi.java
@@ -3,9 +3,11 @@ import com.panzhihua.common.constants.HttpStatus; import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.exceptions.UnAuthenticationException; import com.panzhihua.common.interfaces.OperLog; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.user.ChangePasswordVO; import com.panzhihua.common.model.vos.user.SysMenuVO; import com.panzhihua.common.service.user.UserService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -36,6 +38,7 @@ @ApiOperation(value = "修改密码") @PutMapping("changepassword") @OperLog(operModul = "密码管理",operType = 2) public R changePassword(@Validated @RequestBody ChangePasswordVO changePasswordVO){ Long userId = this.getUserId(); String newPassword = changePasswordVO.getNewPassword(); @@ -46,4 +49,11 @@ changePasswordVO.setUserId(userId); return userService.changePassword(changePasswordVO); } @ApiOperation(value = "用户菜单获取",response = SysMenuVO.class) @GetMapping("listmenu") public R listmenu(){ Long userId = this.getUserId(); return userService.listmenu(userId); } } springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/UserManagementApi.java
@@ -1,5 +1,6 @@ package com.panzhihua.applets_backstage.api; import com.panzhihua.common.interfaces.OperLog; import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComActVO; @@ -38,6 +39,7 @@ @ApiOperation(value = "编辑用户状态" ) @PostMapping("user") @OperLog(operModul = "居民用户管理",operType = 2) public R putUserAppletsBackstage(@RequestBody @Validated(PutGroup.class) PageUserAppletsBackstageDTO pageUserAppletsBackstageDTO){ return userService.putUserAppletsBackstage(pageUserAppletsBackstageDTO); } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/PageDTO.java
@@ -30,4 +30,7 @@ @ApiModelProperty(value = "登录用户",hidden = true) private Long userId; @ApiModelProperty(value = "通知数据类型 类型 0查询所有 1活动 2 服务 3系统 4积分消息",example = "0") private Integer type; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/advertisement/ComOpsAdvDTO.java
@@ -1,5 +1,6 @@ package com.panzhihua.common.model.dtos.advertisement; import com.fasterxml.jackson.annotation.JsonFormat; import com.panzhihua.common.validated.AddGroup; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -39,10 +40,12 @@ @ApiModelProperty(value = "上架时间",example = "2021-01-04 00:00:00") @NotNull(groups = {AddGroup.class},message = "上架时间不能为空") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date onAt; @ApiModelProperty("下架时间") @ApiModelProperty(value = "下架时间",example = "2024-01-04 00:00:00") @NotNull(groups = {AddGroup.class},message = "下架时间不能为空") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date offAt; @ApiModelProperty("跳转内容id") @@ -51,9 +54,9 @@ @ApiModelProperty("跳转url地址") private String jumpUrl; @ApiModelProperty("create_at") @ApiModelProperty(value = "create_at",hidden = true) private Date createAt; @ApiModelProperty("update_at") @ApiModelProperty(value = "update_at",hidden = true) private Date updateAt; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/PageFeedBackDTO.java
New file @@ -0,0 +1,35 @@ package com.panzhihua.common.model.dtos.user; 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-05 10:56 **/ @Data @ApiModel(value = "意见反馈") public class PageFeedBackDTO { @ApiModelProperty(value = "分页-当前页数",example = "1") @NotNull(groups = {PageGroup.class},message = "分页-当前页数不能为空") @Min(groups = {PageGroup.class},value = 1,message = "分页-当前页数不能为空") private Long pageNum; @ApiModelProperty(value = "分页-每页记录数",example = "10") @NotNull(groups = {PageGroup.class},message = "分页-每页记录数不能为空") @Min(groups = {PageGroup.class},value = 1,message = "分页-每页记录数不能为空") private Long pageSize; @ApiModelProperty(value = "用户昵称",example = "") private String nickName; @ApiModelProperty(value = "用户名称",example = "") private String name; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/IndexDataKanbanVO.java
New file @@ -0,0 +1,35 @@ package com.panzhihua.common.model.vos; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.List; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 运营后台数据看板 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2021-01-05 15:23 **/ @Data @ApiModel(value = "运营后台数据看板") public class IndexDataKanbanVO { @ApiModelProperty("全部用户") private Integer allUser; @ApiModelProperty("新增用户") private Integer addUser; @ApiModelProperty("日活跃用户") private Integer activeDayUser; @ApiModelProperty("周活跃用户") private Integer activeWeekUser; @ApiModelProperty("社区用户量x轴") private List<String> communityUserX; @ApiModelProperty("社区用户量y轴") private List<Integer> communityUserY; @ApiModelProperty("社区活跃度x轴") private List<String> communityActiveUserX; @ApiModelProperty("社区活跃度y轴") private List<Integer> communityActiveUserY; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/advertisement/ComOpsAdvPosVO.java
@@ -19,5 +19,5 @@ private Long id; @ApiModelProperty("广告位置中文描述") private String desc; private String advDesc; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/MenuRoleVO.java
@@ -25,4 +25,6 @@ @ApiModelProperty("被操作的角色id") @Min(value = 1,message = "角色id不能为空") private Long roleId; @ApiModelProperty(value = "所在社区",hidden = true) private Long communityId; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/NoticeUnReadVO.java
New file @@ -0,0 +1,34 @@ package com.panzhihua.common.model.vos.user; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.List; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 通知未读汇总 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2021-01-05 11:20 **/ @Data @ApiModel("通知未读汇总") public class NoticeUnReadVO { // { // activityUnread:3, // serviceUnread:4, // systemUnread:5, // scoreUnread:6 // } @ApiModelProperty("活动通知未读数量") private Long activityUnread; @ApiModelProperty("服务变动未读数量") private Long serviceUnread; @ApiModelProperty("系统审核未读数量") private Long systemUnread; @ApiModelProperty("积分通知未读数量") private Long scoreUnread; @ApiModelProperty("四种通知最新四条数据") private List<SysUserNoticeVO> sysUserNoticeVOList; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysUserFeedbackVO.java
New file @@ -0,0 +1,60 @@ 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-05 14:32 **/ @Data @ApiModel("用户意见反馈") public class SysUserFeedbackVO { @ApiModelProperty("id") private Long id; @ApiModelProperty("反馈内容") private String content; @ApiModelProperty("反馈图片，多个用逗号隔开") private String photoPath; @ApiModelProperty("反馈时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createAt; @ApiModelProperty("update_at") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date updateAt; @ApiModelProperty("用户的id") private Long userId; @ApiModelProperty("小区id") private Long areaId; @ApiModelProperty("社区id") private Long communityId; @ApiModelProperty("社区名字") private String communityName; @ApiModelProperty("状态 0") private Integer status; @ApiModelProperty("昵称") private String nickName; @ApiModelProperty("用户名称") private String name; @ApiModelProperty("手机号") private String phone; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -1,7 +1,9 @@ package com.panzhihua.common.service.community; import com.panzhihua.common.model.dtos.AppletesBackstageConfigDTO; import com.panzhihua.common.model.dtos.advertisement.ComOpsAdvDTO; import com.panzhihua.common.model.dtos.community.PageComActDTO; import com.panzhihua.common.model.dtos.user.PageFeedBackDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.SystemmanagementConfigVO; import com.panzhihua.common.model.vos.community.*; @@ -547,4 +549,36 @@ */ @PostMapping("listadvertisement") R listAdvertisement(); /** * 新增广告 * @param comOpsAdvDTO * @return */ @PostMapping("addadvertisement") R addAdvertisement(@RequestBody ComOpsAdvDTO comOpsAdvDTO); /** * 编辑广告 * @param comOpsAdvDTO 编辑内容 * @return 编辑结果 */ @PostMapping("putadvertisement") R putAdvertisement(@RequestBody ComOpsAdvDTO comOpsAdvDTO); /** * 广告位置下拉列表 * @return 位置集合 */ @PostMapping("listadvpos") R listAdvpos(); /** * 跳转内容下拉列表 * @return 跳转内容集合 */ @PostMapping("listadvjump") R listAdvjump(); } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
@@ -2,6 +2,7 @@ import com.panzhihua.common.model.dtos.PageDTO; import com.panzhihua.common.model.dtos.community.NoticeReadDTO; import com.panzhihua.common.model.dtos.user.PageFeedBackDTO; import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO; import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO; import com.panzhihua.common.model.vos.LoginUserInfoVO; @@ -397,4 +398,43 @@ */ @PostMapping("putnotice") R putNotice(@RequestBody NoticeReadDTO noticeReadDTO); /** * 分页查询用户意见反馈 * @param pageFeedBackDTO 分页查询参数 * @return 意见集合 */ @PostMapping("pagefeedback") R pageFeedback(@RequestBody PageFeedBackDTO pageFeedBackDTO); /** * 未读消息汇总 * @param userId 登录用户信息 * @return 未读汇总 */ @PostMapping("noticeunreadnum") R noticeUnreadNum(@RequestParam("userId")Long userId); /** * 反馈意见详情 * @param id 反馈主键 * @return 反馈详情 */ @PostMapping("detailfeedback") R detailFeedback(@RequestParam("id")Long id); /** * 数据看板 * @return 运营后台数据看板 */ @PostMapping("datakanban") R dataKanban(); /** * 用户菜单获取 * @param userId 登录用户id * @return 用户菜单 */ @PostMapping("/role/listmenu") R listmenu(@RequestParam("userId")Long userId); } 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/user/PageFeedBackDTO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/IndexDataKanbanVO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/advertisement/ComOpsAdvPosVO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/user/MenuRoleVO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/user/NoticeUnReadVO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/user/SysUserFeedbackVO.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/service_community/src/main/java/com/panzhihua/service_community/api/AdvertisementApi.java
@@ -1,6 +1,7 @@ package com.panzhihua.service_community.api; import com.panzhihua.common.model.dtos.AppletesBackstageConfigDTO; import com.panzhihua.common.model.dtos.advertisement.ComOpsAdvDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.service_community.service.ComOpsAdvService; import lombok.extern.slf4j.Slf4j; @@ -51,4 +52,42 @@ public R listAdvertisement(){ return comOpsAdvService.listAdvertisement(); } /** * 新增广告 * @param comOpsAdvDTO * @return 新增结果 */ @PostMapping("addadvertisement") public R addAdvertisement(@RequestBody ComOpsAdvDTO comOpsAdvDTO){ return comOpsAdvService.addAdvertisement(comOpsAdvDTO); } /** * 编辑广告 * @param comOpsAdvDTO 编辑内容 * @return 编辑结果 */ @PostMapping("putadvertisement") public R putAdvertisement(@RequestBody ComOpsAdvDTO comOpsAdvDTO){ return comOpsAdvService.putAdvertisement(comOpsAdvDTO); } /** * 广告位置下拉列表 * @return 位置集合 */ @PostMapping("listadvpos") public R listadvpos(){ return comOpsAdvService.listadvpos(); } /** * 跳转内容下拉集合 * @return 跳转集合 */ @PostMapping("listadvjump") public R listAdvjump(){ return comOpsAdvService.listAdvjump(); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
@@ -3,7 +3,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.panzhihua.common.exceptions.ServiceException; import com.panzhihua.common.model.dtos.advertisement.ComOpsAdvDTO; import com.panzhihua.common.model.dtos.community.PageComActDTO; import com.panzhihua.common.model.dtos.user.PageFeedBackDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.SystemmanagementConfigVO; import com.panzhihua.common.model.vos.community.*; @@ -938,4 +940,9 @@ return comActService.listCommunityAll(); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComOpsAdvDO.java
@@ -26,7 +26,7 @@ /** * 广告位置id */ private Integer posId; private Long posId; /** * 图片路径 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComOpsAdvPosDO.java
@@ -22,5 +22,5 @@ /** * 广告位置中文描述 */ private String desc; private String advDesc; } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActService.java
@@ -1,6 +1,7 @@ package com.panzhihua.service_community.service; import com.panzhihua.common.model.dtos.community.PageComActDTO; import com.panzhihua.common.model.dtos.user.PageFeedBackDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComActVO; @@ -46,4 +47,5 @@ * @return 社区集合 按照创建顺序倒序排列 */ R listCommunityAll(); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComOpsAdvService.java
@@ -1,6 +1,7 @@ package com.panzhihua.service_community.service; import com.panzhihua.common.model.dtos.AppletesBackstageConfigDTO; import com.panzhihua.common.model.dtos.advertisement.ComOpsAdvDTO; import com.panzhihua.common.model.vos.R; /** @@ -26,4 +27,26 @@ * @return 广告列表 */ R listAdvertisement(); /** * 新增广告 * @param comOpsAdvDTO * @return 新增结果 */ R addAdvertisement(ComOpsAdvDTO comOpsAdvDTO); /** * 编辑广告 * @param comOpsAdvDTO 编辑内容 * @return 编辑结果 */ R putAdvertisement(ComOpsAdvDTO comOpsAdvDTO); /** * 广告位置下拉列表 * @return 位置集合 */ R listadvpos(); /** * 跳转内容下拉集合 * @return 跳转集合 */ R listAdvjump(); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.panzhihua.common.model.dtos.community.PageComActDTO; import com.panzhihua.common.model.dtos.user.PageFeedBackDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComActVO; import com.panzhihua.common.model.vos.community.ComMngStructOtherBuildVO; @@ -135,4 +136,6 @@ } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComOpsAdvServiceImpl.java
@@ -3,14 +3,18 @@ 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.ComOpsAdvDTO; 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.ComOpsAdvPosVO; 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.dao.ComOpsAdvPosDAO; import com.panzhihua.service_community.model.dos.ComOpsAdvDO; import com.panzhihua.service_community.model.dos.ComOpsAdvJumpDO; import com.panzhihua.service_community.model.dos.ComOpsAdvPosDO; import com.panzhihua.service_community.service.ComOpsAdvService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -34,6 +38,8 @@ private ComOpsAdvJumpDAO comOpsAdvJumpDAO; @Resource private ComOpsAdvDAO comOpsAdvDAO; @Resource private ComOpsAdvPosDAO comOpsAdvPosDAO; /** * 获取广告跳转内容配置 * @@ -110,4 +116,74 @@ } return R.ok(comOpsAdvVOS); } /** * 新增广告 * * @param comOpsAdvDTO * @return 新增结果 */ @Override public R addAdvertisement(ComOpsAdvDTO comOpsAdvDTO) { ComOpsAdvDO comOpsAdvDO=new ComOpsAdvDO(); BeanUtils.copyProperties(comOpsAdvDTO,comOpsAdvDO); int insert = comOpsAdvDAO.insert(comOpsAdvDO); if (insert>0) { return R.ok(); } return R.fail(); } /** * 编辑广告 * * @param comOpsAdvDTO 编辑内容 * @return 编辑结果 */ @Override public R putAdvertisement(ComOpsAdvDTO comOpsAdvDTO) { ComOpsAdvDO comOpsAdvDO=new ComOpsAdvDO(); BeanUtils.copyProperties(comOpsAdvDTO,comOpsAdvDO); int update = comOpsAdvDAO.updateById(comOpsAdvDO); if (update>0) { return R.ok(); } return R.fail(); } /** * 广告位置下拉列表 * * @return 位置集合 */ @Override public R listadvpos() { List<ComOpsAdvPosDO> comOpsAdvPosDOS = comOpsAdvPosDAO.selectList(null); List<ComOpsAdvPosVO> comOpsAdvPosVOS=new ArrayList<>(); comOpsAdvPosDOS.forEach(comOpsAdvPosDO -> { ComOpsAdvPosVO comOpsAdvPosVO=new ComOpsAdvPosVO(); BeanUtils.copyProperties(comOpsAdvPosDO,comOpsAdvPosVO); comOpsAdvPosVOS.add(comOpsAdvPosVO); }); return R.ok(comOpsAdvPosVOS); } /** * 跳转内容下拉集合 * * @return 跳转集合 */ @Override public R listAdvjump() { List<ComOpsAdvJumpDO> comOpsAdvJumpDOS = comOpsAdvJumpDAO.selectList(null); List<ComOpsAdvJumpVO> comOpsAdvJumpVOS=new ArrayList<>(); if (!ObjectUtils.isEmpty(comOpsAdvJumpDOS)) { comOpsAdvJumpDOS.forEach(comOpsAdvJumpDO -> { ComOpsAdvJumpVO comOpsAdvJumpVO=new ComOpsAdvJumpVO(); BeanUtils.copyProperties(comOpsAdvJumpDO,comOpsAdvJumpVO); comOpsAdvJumpVOS.add(comOpsAdvJumpVO); }); } return R.ok(comOpsAdvJumpVOS); } } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/RoleApi.java
@@ -100,4 +100,14 @@ public R putMenuRole(@RequestBody MenuRoleVO menuRoleVO){ return roleService.putMenuRole(menuRoleVO); } /** * 用户菜单获取 * @param userId 登录用户id * @return 用户菜单 */ @PostMapping("listmenu") public R listmenu(@RequestParam("userId")Long userId){ return roleService.listmenu(userId); } } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
@@ -2,6 +2,7 @@ import com.panzhihua.common.model.dtos.PageDTO; import com.panzhihua.common.model.dtos.community.NoticeReadDTO; import com.panzhihua.common.model.dtos.user.PageFeedBackDTO; import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO; import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO; import com.panzhihua.common.model.vos.LoginUserInfoVO; @@ -414,4 +415,44 @@ public R putNotice(@RequestBody NoticeReadDTO noticeReadDTO){ return userService.putNotice(noticeReadDTO); } /** * 分页查询用户意见反馈 * @param pageFeedBackDTO 分页查询参数 * @return 意见集合 */ @PostMapping("pagefeedback") public R pageFeedback(@RequestBody PageFeedBackDTO pageFeedBackDTO){ return userService.pageFeedback(pageFeedBackDTO); } /** * 未读消息汇总 * @param userId 登录用户信息 * @return 未读汇总 */ @PostMapping("noticeunreadnum") public R noticeUnreadNum(@RequestParam("userId")Long userId){ return userService.noticeUnreadNum(userId); } /** * 反馈意见详情 * @param id 反馈主键 * @return 反馈详情 * */ @PostMapping("detailfeedback") public R detailFeedback(@RequestParam("id")Long id){ return userService.detailFeedback(id); } /** * 数据看板 * @return 运营后台数据看板 */ @PostMapping("datakanban") public R dataKanban(){ return userService.dataKanban(); } } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserFeedbackDAO.java
@@ -1,8 +1,14 @@ package com.panzhihua.service_user.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.panzhihua.common.model.dtos.user.PageFeedBackDTO; import com.panzhihua.common.model.vos.user.SysUserFeedbackVO; import com.panzhihua.service_user.model.dos.SysUserFeedbackDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; /** * @program: springcloud_k8s_panzhihuazhihuishequ @@ -12,4 +18,52 @@ **/ @Mapper public interface SysUserFeedbackDAO extends BaseMapper<SysUserFeedbackDO> { // @Select("<script> " + // " <where>" + // "<if test='nameCn != null and nameCn.trim() != ""'>" + // " </if> " + // "<if test='nameCn != null and nameCn.trim() != ""'>" + // " </if> " + // "<if test='nameCn != null and nameCn.trim() != ""'>" + // " </if> " + // " </where>" + // "</script>") @Select("<script> " + "select \n" + "u.name,\n" + "u.nick_name,\n" + "f.id,\n" + "u.phone,\n" + "f.create_at,\n" + "f.content,\n" + "f.photo_path,\n" + "c.name communityName\n" + "from sys_user_feedback f\n" + "join sys_user u on f.user_id=u.user_id\n" + "<if test='pageFeedBackDTO.name != null and pageFeedBackDTO.name.trim() != ""'>" + "and u.name=#{pageFeedBackDTO.name}\n" + " </if> " + "<if test='pageFeedBackDTO.nickName != null and pageFeedBackDTO.nickName.trim() != ""'>" + "and u.nick_name=#{pageFeedBackDTO.nickName}\n" + " </if> " + "join com_act c on u.community_id=c.community_id\n" + "order by f.create_at desc\n" + "</script>") IPage<SysUserFeedbackVO> pageFeedback(Page page, @Param("pageFeedBackDTO") PageFeedBackDTO pageFeedBackDTO); @Select("select \n" + "u.name,\n" + "u.nick_name,\n" + "f.id,\n" + "f.content,\n" + "f.photo_path,\n" + "u.phone,\n" + "f.create_at,\n" + "c.name communityName\n" + "from sys_user_feedback f\n" + "join sys_user u on f.user_id=u.user_id\n" + "join com_act c on u.community_id=c.community_id\n" + "where f.id=#{id}\n") SysUserFeedbackVO detailFeedback(Long id); } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserNoticeDAO.java
@@ -1,9 +1,10 @@ package com.panzhihua.service_user.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.panzhihua.service_user.model.dos.SysUserFeedbackDO; import com.panzhihua.common.model.vos.user.NoticeUnReadVO; import com.panzhihua.service_user.model.dos.SysUserNoticeDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; /** * @program: springcloud_k8s_panzhihuazhihuishequ @@ -14,4 +15,14 @@ @Mapper public interface SysUserNoticeDAO extends BaseMapper<SysUserNoticeDO> { @Select("SELECT \n" + "COUNT(case WHEN type=1 then id else null end )activityUnread,\n" + "COUNT(case WHEN type=2 then id else null end )serviceUnread,\n" + "COUNT(case WHEN type=3 then id else null end )systemUnread,\n" + "COUNT(case WHEN type=4 then id else null end )scoreUnread\n" + "FROM\n" + "sys_user_notice \n" + "WHERE\n" + "user_id =#{userId} and `status`=0") NoticeUnReadVO noticeUnreadNum(Long userId); } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
@@ -6,15 +6,19 @@ 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.IndexDataKanbanVO; 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 com.panzhihua.service_user.model.dtos.DataKanbanDTO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; import java.util.List; /** * @program: springcloud_k8s_panzhihuazhihuishequ @@ -158,8 +162,53 @@ "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 ") @Select("<script> " + "select * from \n" + "sys_user_notice \n" + "where \n" + "user_id=#{pageDTO.userId} \n" + "<if test='pageDTO.type != null and pageDTO.type != 0'>" + "and type=#{pageDTO.type}\n" + " </if> " + "order by create_at desc\n" + "</script>") IPage<SysUserNoticeVO> pageNotice(Page page, @Param("pageDTO") PageDTO pageDTO); @Select("SELECT \n" + "COUNT(user_id)allUser,\n" + "COUNT(case WHEN DATE_FORMAT(create_at,'%m-%d-%Y')=DATE_FORMAT(SYSDATE(),'%m-%d-%Y') then user_id else null end )addUser,\n" + "COUNT(case WHEN DATE_FORMAT(last_login_time,'%m-%d-%Y')=DATE_FORMAT(SYSDATE(),'%m-%d-%Y') then user_id else null end )activeDayUser,\n" + "COUNT(case WHEN DATE_FORMAT(last_login_time,'%m-%d-%Y')=DATE_FORMAT(SYSDATE(),'%m-%d-%Y') and continuous_landing_days>=7 then user_id else null end )activeWeekUser\n" + "FROM\n" + "sys_user\n" + "where type=1") IndexDataKanbanVO selectIndexDataKanban(); @Select("select t.`name`,t.num from (\n" + "SELECT \n" + "COUNT(u.user_id)num,\n" + "c.`name`\n" + "FROM\n" + "sys_user u \n" + "join com_act c on u.community_id=c.community_id\n" + "WHERE\n" + "u.type =1\n" + "GROUP BY u.community_id)t ORDER BY t.num desc limit 10") List<DataKanbanDTO> selectCommunityUserOrder(); @Select("select t.`name`,t.num from (\n" + "SELECT \n" + "COUNT(u.user_id)num,\n" + "c.`name`\n" + "FROM\n" + "sys_user u \n" + "join com_act c on u.community_id=c.community_id\n" + "WHERE\n" + "u.type =1 and DATE_FORMAT(u.last_login_time,'%m-%d-%Y')=DATE_FORMAT(SYSDATE(),'%m-%d-%Y') and u.continuous_landing_days>=7\n" + "GROUP BY u.community_id)t ORDER BY t.num desc limit 10") List<DataKanbanDTO> selectCommunityActiveUserOrder(); } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysRoleMenuDO.java
@@ -25,8 +25,5 @@ * 菜单id */ private Long menuId; /** * 协议名字 */ private String name; } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserDO.java
@@ -155,6 +155,10 @@ * 小区id */ private Long areaId; /** * 连续登陆天数 每天凌晨更新 通过判断最后登录时间 */ private Integer continuousLandingDays; } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserFeedbackDO.java
@@ -32,7 +32,7 @@ /** * 反馈图片，多个用逗号隔开 */ private String photoPah; private String photoPath; /** * create_at springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dtos/DataKanbanDTO.java
New file @@ -0,0 +1,16 @@ package com.panzhihua.service_user.model.dtos; import lombok.Data; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 查询运营后台统计数据 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2021-01-05 16:25 **/ @Data public class DataKanbanDTO { private String name; private Integer num; } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/RoleService.java
@@ -63,4 +63,10 @@ * @return 设置结果 */ R putMenuRole(MenuRoleVO menuRoleVO); /** * 用户菜单获取 * @param userId 登录用户id * @return 用户菜单 */ R listmenu(Long userId); } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
@@ -2,6 +2,7 @@ import com.panzhihua.common.model.dtos.PageDTO; import com.panzhihua.common.model.dtos.community.NoticeReadDTO; import com.panzhihua.common.model.dtos.user.PageFeedBackDTO; import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO; import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO; import com.panzhihua.common.model.vos.LoginUserInfoVO; @@ -256,4 +257,28 @@ * @return 修改状态 */ R putNotice(NoticeReadDTO noticeReadDTO); /** * 分页查询用户意见反馈 * @param pageFeedBackDTO 分页查询参数 * @return 意见集合 */ R pageFeedback(PageFeedBackDTO pageFeedBackDTO); /** * 未读消息汇总 * @param userId 登录用户信息 * @return 未读汇总 */ R noticeUnreadNum(Long userId); /** * 反馈意见详情 * @param id 反馈主键 * @return 反馈详情 */ R detailFeedback(Long id); /** * 运营小程序后台数据看板 * @return 展示数据 */ R dataKanban(); } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/RoleServiceImpl.java
@@ -202,7 +202,7 @@ // 创建新的 Integer isAll = menuRoleVO.getIsAll(); if (isAll.intValue()==1) { menuIds = sysMenuDAO.selectList(null).stream().map(sysMenuDO -> sysMenuDO.getMenuId()).collect(Collectors.toList()); menuIds = sysMenuDAO.selectList(new QueryWrapper<SysMenuDO>().lambda().eq(SysMenuDO::getCommunityId,menuRoleVO.getCommunityId())).stream().map(sysMenuDO -> sysMenuDO.getMenuId()).collect(Collectors.toList()); }else{ menuIds=menuRoleVO.getMenuIds(); } @@ -216,4 +216,41 @@ stringRedisTemplate.delete(SecurityConstants.ROLE_ALL); return R.ok(); } /** * 用户菜单获取 * * @param userId 登录用户id * @return 用户菜单 */ @Override public R listmenu(Long userId) { SysUserRoleDO sysUserRoleDO = sysUserRoleDAO.selectOne(new QueryWrapper<SysUserRoleDO>().lambda().eq(SysUserRoleDO::getUserId, userId)); if (ObjectUtils.isEmpty(sysUserRoleDO)) { return R.fail("用户未绑定角色"); } Long roleId = sysUserRoleDO.getRoleId(); List<SysRoleMenuDO> sysRoleMenuDOS = sysRoleMenuDAO.selectList(new QueryWrapper<SysRoleMenuDO>().lambda().eq(SysRoleMenuDO::getRoleId, roleId)); if (ObjectUtils.isEmpty(sysRoleMenuDOS)) { return R.fail("用户没有任何权限"); } List<Long> collect = sysRoleMenuDOS.stream().map(sysRoleMenuDO -> sysRoleMenuDO.getMenuId()).collect(Collectors.toList()); List<SysMenuDO> sysMenuDOS = sysMenuDAO.selectList(new QueryWrapper<SysMenuDO>().lambda().in(SysMenuDO::getMenuId, collect)); List<SysMenuVO> sysMenuVOS=new ArrayList<>(); sysMenuDOS.forEach(sysMenuDO -> { SysMenuVO sysMenuVO=new SysMenuVO(); BeanUtils.copyProperties(sysMenuDO,sysMenuVO); sysMenuVOS.add(sysMenuVO); }); List<SysMenuVO> collect1 = sysMenuVOS.stream().filter(sysMenuVO -> sysMenuVO.getParentId() == 0).collect(Collectors.toList()); if (!ObjectUtils.isEmpty(collect1)) { collect1.forEach(sysMenuVO -> { Long menuId = sysMenuVO.getMenuId(); List<SysMenuVO> sysMenuVOS1=sysMenuVOS.stream().filter(sysMenuVO1 -> sysMenuVO1.getParentId().intValue()==menuId.intValue()).collect(Collectors.toList()); sysMenuVO.setSysMenuVOList(sysMenuVOS1); }); } return R.ok(collect1); } } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -5,20 +5,21 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; 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.PageFeedBackDTO; import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO; import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO; import com.panzhihua.common.model.vos.IndexDataKanbanVO; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.SystemmanagementConfigVO; import com.panzhihua.common.model.vos.partybuilding.ActivityManagerVO; import com.panzhihua.common.model.vos.partybuilding.PageActivityMembersVO; import com.panzhihua.common.model.vos.user.*; import com.panzhihua.service_user.dao.*; import com.panzhihua.service_user.model.dos.*; import com.panzhihua.service_user.model.dtos.DataKanbanDTO; import com.panzhihua.service_user.service.UserService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; @@ -707,6 +708,9 @@ int update1 = sysUserRoleDAO.update(sysUserRoleDO,new UpdateWrapper<SysUserRoleDO>().lambda().eq(SysUserRoleDO::getUserId,administratorsUserVO.getUserId())); if (update1>0) { return R.ok(); }else{ sysUserRoleDO.setUserId(administratorsUserVO.getUserId()); sysUserRoleDAO.insert(sysUserRoleDO); } } return R.ok(); @@ -980,7 +984,13 @@ @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)); Integer type = pageDTO.getType(); int integer =0; if (null!=type&&type.intValue()>0) { integer=sysUserNoticeDAO.selectCount(new QueryWrapper<SysUserNoticeDO>().lambda().eq(SysUserNoticeDO::getUserId, userId).eq(SysUserNoticeDO::getStatus, 0).eq(SysUserNoticeDO::getType,type)); }else{ 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(); @@ -989,7 +999,7 @@ 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); map.put("unreadNum",integer); return R.ok(map); } @@ -1019,6 +1029,90 @@ return R.fail("通知不存在"); } /** * 分页查询用户意见反馈 * * @param pageFeedBackDTO 分页查询参数 * @return 意见集合 */ @Override public R pageFeedback(PageFeedBackDTO pageFeedBackDTO) { Page page = new Page<>(); Long pageNum = pageFeedBackDTO.getPageNum(); Long pageSize = pageFeedBackDTO.getPageSize(); page.setSize(pageSize); page.setCurrent(pageNum); IPage<SysUserFeedbackVO> iPage = sysUserFeedbackDAO.pageFeedback(page, pageFeedBackDTO); return R.ok(iPage); } /** * 未读消息汇总 * * @param userId 登录用户信息 * @return 未读汇总 */ @Override public R noticeUnreadNum(Long userId) { NoticeUnReadVO noticeUnReadVO=sysUserNoticeDAO.noticeUnreadNum(userId); List<SysUserNoticeVO> sysUserNoticeVOList=new ArrayList<>(); List<SysUserNoticeDO> sysUserNoticeDOS = sysUserNoticeDAO.selectList(new QueryWrapper<SysUserNoticeDO>().lambda().eq(SysUserNoticeDO::getUserId, userId).orderByDesc(SysUserNoticeDO::getCreateAt).groupBy(SysUserNoticeDO::getType)); if (!ObjectUtils.isEmpty(sysUserNoticeDOS)) { sysUserNoticeDOS.forEach(sysUserNoticeDO -> { SysUserNoticeVO sysUserNoticeVO=new SysUserNoticeVO(); BeanUtils.copyProperties(sysUserNoticeDO,sysUserNoticeVO); sysUserNoticeVOList.add(sysUserNoticeVO); }); } noticeUnReadVO.setSysUserNoticeVOList(sysUserNoticeVOList); return R.ok(noticeUnReadVO); } /** * 反馈意见详情 * * @param id 反馈主键 * @return 反馈详情 */ @Override public R detailFeedback(Long id) { SysUserFeedbackVO sysUserFeedbackVO=sysUserFeedbackDAO.detailFeedback(id); return R.ok(sysUserFeedbackVO); } /** * 运营小程序后台数据看板 * * @return 展示数据 */ @Override public R dataKanban() { IndexDataKanbanVO indexDataKanbanVO=userDao.selectIndexDataKanban(); List<DataKanbanDTO> dataKanbanDTOS=userDao.selectCommunityUserOrder(); List<DataKanbanDTO> dataKanbanDTOS1=userDao.selectCommunityActiveUserOrder(); List<String> communityUserX=new ArrayList<>(); List<Integer> communityUserY=new ArrayList<>(); List<String> communityActiveUserX=new ArrayList<>(); List<Integer> communityActiveUserY=new ArrayList<>(); if (!ObjectUtils.isEmpty(dataKanbanDTOS)) { dataKanbanDTOS.forEach(dataKanbanDTO -> { communityUserX.add(dataKanbanDTO.getName()); communityUserY.add(dataKanbanDTO.getNum()); }); } if (!ObjectUtils.isEmpty(dataKanbanDTOS1)) { dataKanbanDTOS1.forEach(dataKanbanDTO -> { communityActiveUserX.add(dataKanbanDTO.getName()); communityActiveUserY.add(dataKanbanDTO.getNum()); }); } indexDataKanbanVO.setCommunityActiveUserX(communityActiveUserX); indexDataKanbanVO.setCommunityActiveUserY(communityActiveUserY); indexDataKanbanVO.setCommunityUserX(communityUserX); indexDataKanbanVO.setCommunityUserY(communityUserY); return R.ok(indexDataKanbanVO); } public static void main(String[] args) { String encode = new BCryptPasswordEncoder().encode("123456"); System.out.println(encode);
