springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml
@@ -23,41 +23,40 @@ </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/PageComActDTO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/UserManagementApi.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ActivitySignUpDTO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/dtos/user/PageUserAppletsBackstageDTO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/user/SysUserVO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/validated/PageGroup.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/config_server.log.2020-12-29.log" beforeDir="false" afterPath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/config_server.log.2020-12-29.log" afterDir="false" /> <change beforePath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/eureka_server.log.2020-12-29.log" beforeDir="false" afterPath="$PROJECT_DIR$/LOG_HOME_IS_UNDEFINED/eureka_server.log.2020-12-29.log" 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/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/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/applets_backstage/src/main/resources/bootstrap.yml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/auth/src/main/java/com/panzhihua/auth/exceptions/GlobalExceptionCapture.java" beforeDir="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/community/ComActVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComActVO.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/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/community/ComActVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/ComActVO.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/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/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/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/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/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/community_backstage/src/main/resources/bootstrap.yml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/config_server/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/config_server/src/main/resources/application.yml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/eureka_server/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/eureka_server/src/main/resources/application.yml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.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/ComMngStructAreaService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComMngStructAreaService.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/ComMngStructAreaServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructAreaServiceImpl.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_community/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/resources/bootstrap.yml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/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/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/ComPbMemberDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberDAO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComBpActivityService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComBpActivityService.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/resources/bootstrap.yml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_user/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/pom.xml" 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" /> <change beforePath="$PROJECT_DIR$/zuul/src/main/java/com/panzhihua/zuul/filters/SercuritFilter.java" beforeDir="false" afterPath="$PROJECT_DIR$/zuul/src/main/java/com/panzhihua/zuul/filters/SercuritFilter.java" 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" /> @@ -71,8 +70,8 @@ <component name="FileTemplateManagerImpl"> <option name="RECENT_TEMPLATES"> <list> <option value="Interface" /> <option value="Class" /> <option value="Interface" /> </list> </option> </component> @@ -164,7 +163,7 @@ <module name="applets" /> <extension name="coverage"> <pattern> <option name="PATTERN" value="com.panzhihua.applets.api.*" /> <option name="PATTERN" value="com.panzhihua.applets_backstage.api.*" /> <option name="ENABLED" value="true" /> </pattern> </extension> @@ -203,7 +202,7 @@ <module name="applets" /> <extension name="coverage"> <pattern> <option name="PATTERN" value="com.panzhihua.applets.api.*" /> <option name="PATTERN" value="com.panzhihua.applets_backstage.api.*" /> <option name="ENABLED" value="true" /> </pattern> </extension> @@ -413,7 +412,7 @@ <workItem from="1609120633455" duration="2000" /> <workItem from="1609120765557" duration="31000" /> <workItem from="1609121031103" duration="30812000" /> <workItem from="1609219740946" duration="15166000" /> <workItem from="1609219740946" duration="29821000" /> </task> <servers /> </component> @@ -437,10 +436,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="1609233326560"> <state x="574" y="118" key="#com.intellij.ide.util.MemberChooser" timestamp="1609307599411"> <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="1609233326560" /> <state x="574" y="118" key="#com.intellij.ide.util.MemberChooser/0.0.1536.824@0.0.1536.824" timestamp="1609307599411" /> <state x="405" y="335" key="#com.intellij.refactoring.move.MoveHandler.SelectRefactoringDialog" timestamp="1606099594079"> <screen x="0" y="0" width="1536" height="824" /> </state> @@ -453,10 +452,10 @@ <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="1609229431857"> <state width="561" height="466" key="DebuggerActiveHint" timestamp="1609309867208"> <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="1609229431857" /> <state width="561" height="466" key="DebuggerActiveHint/0.0.1536.824@0.0.1536.824" timestamp="1609309867208" /> <state x="93" y="93" width="1350" height="638" key="DiffContextDialog" timestamp="1608535183408"> <screen x="0" y="0" width="1536" height="824" /> </state> @@ -465,54 +464,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="404" key="GridCell.Tab.0.bottom" timestamp="1609235225397"> <state width="1031" height="303" key="GridCell.Tab.0.bottom" timestamp="1609309985296"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="404" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1609235225397" /> <state width="1031" height="404" key="GridCell.Tab.0.center" timestamp="1609235225397"> <state width="1031" height="303" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1609309985296" /> <state width="1031" height="303" key="GridCell.Tab.0.center" timestamp="1609309985296"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="404" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1609235225397" /> <state width="1031" height="404" key="GridCell.Tab.0.left" timestamp="1609235225395"> <state width="1031" height="303" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1609309985296" /> <state width="1031" height="303" key="GridCell.Tab.0.left" timestamp="1609309985296"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="404" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1609235225395" /> <state width="1031" height="404" key="GridCell.Tab.0.right" timestamp="1609235225397"> <state width="1031" height="303" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1609309985296" /> <state width="1031" height="303" key="GridCell.Tab.0.right" timestamp="1609309985296"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="404" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1609235225397" /> <state width="1031" height="404" key="GridCell.Tab.1.bottom" timestamp="1609235225398"> <state width="1031" height="303" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1609309985296" /> <state width="1031" height="303" key="GridCell.Tab.1.bottom" timestamp="1609309985296"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="404" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1609235225398" /> <state width="1031" height="404" key="GridCell.Tab.1.center" timestamp="1609235225398"> <state width="1031" height="303" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1609309985296" /> <state width="1031" height="303" key="GridCell.Tab.1.center" timestamp="1609309985296"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="404" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1609235225398" /> <state width="1031" height="404" key="GridCell.Tab.1.left" timestamp="1609235225397"> <state width="1031" height="303" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1609309985296" /> <state width="1031" height="303" key="GridCell.Tab.1.left" timestamp="1609309985296"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="404" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1609235225397" /> <state width="1031" height="404" key="GridCell.Tab.1.right" timestamp="1609235225398"> <state width="1031" height="303" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1609309985296" /> <state width="1031" height="303" key="GridCell.Tab.1.right" timestamp="1609309985296"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="404" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1609235225398" /> <state width="1031" height="404" key="GridCell.Tab.2.bottom" timestamp="1609235225398"> <state width="1031" height="303" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1609309985296" /> <state width="1031" height="303" key="GridCell.Tab.2.bottom" timestamp="1609309985296"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="404" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1609235225398" /> <state width="1031" height="404" key="GridCell.Tab.2.center" timestamp="1609235225398"> <state width="1031" height="303" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1609309985296" /> <state width="1031" height="303" key="GridCell.Tab.2.center" timestamp="1609309985296"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="404" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1609235225398" /> <state width="1031" height="404" key="GridCell.Tab.2.left" timestamp="1609235225398"> <state width="1031" height="303" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1609309985296" /> <state width="1031" height="303" key="GridCell.Tab.2.left" timestamp="1609309985296"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="404" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1609235225398" /> <state width="1031" height="404" key="GridCell.Tab.2.right" timestamp="1609235225398"> <state width="1031" height="303" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1609309985296" /> <state width="1031" height="303" key="GridCell.Tab.2.right" timestamp="1609309985296"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="404" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1609235225398" /> <state width="1031" height="303" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1609309985296" /> <state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1606714311663"> <screen x="0" y="0" width="1536" height="824" /> </state> @@ -521,10 +520,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="1609231027096"> <state width="498" height="540" key="SwitcherDM" timestamp="1609294498031"> <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="1609231027096" /> <state width="498" height="540" key="SwitcherDM/0.0.1536.824@0.0.1536.824" timestamp="1609294498031" /> <state x="93" y="93" width="1350" height="638" key="com.intellij.history.integration.ui.views.DirectoryHistoryDialog" timestamp="1608535536014"> <screen x="0" y="0" width="1536" height="824" /> </state> @@ -533,10 +532,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="1609232728287"> <state x="468" y="42" width="766" height="782" key="find.popup" timestamp="1609292338459"> <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="1609232728287" /> <state x="468" y="42" width="766" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1609292338459" /> <state x="301" y="45" key="new project wizard" timestamp="1609120520884"> <screen x="0" y="0" width="1536" height="824" /> </state> springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
@@ -71,7 +71,7 @@ @ApiOperation(value = "活动人员列表",response = ActivitySignVO.class) @ApiImplicitParam(name ="id",value = "社区活动主键",required = true) @PostMapping("listactivitysign") @GetMapping("listactivitysign") public R listActivitySign(@RequestParam("id") Long id){ ActivitySignVO activitySignVO=new ActivitySignVO(); activitySignVO.setActivityId(id); springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java
@@ -29,16 +29,15 @@ @Resource private CommunityService communityService; @ApiOperation("分页展示社区随手拍") @ApiOperation(value = "分页展示社区随手拍",response = ComActEasyPhotoVO.class) @PostMapping("pageeasyphoto") public R pageEasyPhoto (){ public R pageEasyPhoto (@RequestBody ComActEasyPhotoVO comActEasyPhotoVO){ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo(); Long communityId = loginUserInfo.getCommunityId(); Long userId = loginUserInfo.getUserId(); ComActEasyPhotoVO comActEasyPhotoVO=new ComActEasyPhotoVO(); comActEasyPhotoVO.setCommunityId(communityId); comActEasyPhotoVO.setSponsorId(userId); comActEasyPhotoVO.setStatus(4); comActEasyPhotoVO.setLogInUserId(userId); return communityService.pageEasyPhoto(comActEasyPhotoVO); }
@@ -93,8 +93,16 @@ } R<LoginUserInfoVO> r = userService.getUserInfoByUserId(userId + ""); LoginUserInfoVO loginUserInfoVO =r.getData(); WxMaUserInfo wxUserInfo = maService.getUserService().getUserInfo(loginUserInfoVO.getSessionKey(), encryptedData, iv); WxMaUserInfo wxUserInfo = null; try { log.info(encryptedData); log.info(iv); wxUserInfo = maService.getUserService().getUserInfo(loginUserInfoVO.getSessionKey(), encryptedData, iv); } catch (Exception e) { log.error(e.getMessage()); return R.fail("微信解析基本信息失败"); } if (null == wxUserInfo) { return R.fail("微信解析基本信息失败"); } springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java
@@ -1,12 +1,14 @@ package com.panzhihua.applets.api; import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.model.dtos.partybuilding.ActivitySignUpDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.partybuilding.*; import com.panzhihua.common.service.partybuilding.PartyBuildingService; 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.*; import javax.annotation.Resource; @@ -80,5 +82,20 @@ return partyBuildingService.activityinfo(id); } @ApiOperation(value = "党员活动人员参入列表",response = PartyBuildingMemberVO.class) @GetMapping("listpartybuildingmember") public R listPartyBuildingMember(@RequestParam("id") Long id) { return partyBuildingService.listPartyBuildingMember(id); } @ApiOperation(value = "报名、取消报名党员活动") @PutMapping("activitysignup") public R putActivitySignUp(@RequestBody @Validated ActivitySignUpDTO activitySignUpDTO) { activitySignUpDTO.setUserId(this.getUserId()); return partyBuildingService.putActivitySignUp(activitySignUpDTO); } } springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
@@ -57,26 +57,30 @@ if (!ObjectUtils.isEmpty(data)) { LoginUserInfoVO loginUserInfoVO = (LoginUserInfoVO) data; R r1 = communityService.detailHouse(userId); R r2=communityService.detailCommunity(communityId); R r3=communityService.detailArea(areaId); if (null!=communityId&&0!=communityId) { R r2=communityService.detailCommunity(communityId); if (R.isOk(r2)) { Object data1 = r2.getData(); if (!ObjectUtils.isEmpty(data1)) { loginUserInfoVO.setComActVO(JSONObject.parseObject(JSONObject.toJSONString(data1),ComActVO.class)); r.setData(loginUserInfoVO); } } } if (null!=areaId&&areaId!=0) { R r3=communityService.detailArea(areaId); if (R.isOk(r3)) { Object data1 = r3.getData(); if (!ObjectUtils.isEmpty(data1)) { loginUserInfoVO.setComMngStructAreaVO(JSONObject.parseObject(JSONObject.toJSONString(data1),ComMngStructAreaVO.class)); r.setData(loginUserInfoVO); } } } if (R.isOk(r1)) { Object data1 = r1.getData(); if (!ObjectUtils.isEmpty(data1)) { loginUserInfoVO.setComMngStructHouseVOS((List<ComMngStructHouseVO>) data1); r.setData(loginUserInfoVO); } } if (R.isOk(r2)) { Object data1 = r2.getData(); if (!ObjectUtils.isEmpty(data1)) { loginUserInfoVO.setComActVO(JSONObject.parseObject(JSONObject.toJSONString(data1),ComActVO.class)); r.setData(loginUserInfoVO); } } if (R.isOk(r3)) { Object data1 = r3.getData(); if (!ObjectUtils.isEmpty(data1)) { loginUserInfoVO.setComMngStructAreaVO(JSONObject.parseObject(JSONObject.toJSONString(data1),ComMngStructAreaVO.class)); r.setData(loginUserInfoVO); } } springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/UserManagementApi.java
New file @@ -0,0 +1,43 @@ package com.panzhihua.applets_backstage.api; import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.user.SysUserVO; 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 javax.annotation.Resource; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 居民用户管理 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2020-12-30 11:10 **/ @RestController @RequestMapping("/usermanagement/") @Api(tags = {"居民用户管理"}) public class UserManagementApi { @Resource private UserService userService; @ApiOperation(value = "分页查询小程序用户",response = SysUserVO.class ) @PostMapping("pageuser") public R pageUserAppletsBackstage(@RequestBody @Validated(PageGroup.class) PageUserAppletsBackstageDTO pageUserAppletsBackstageDTO){ return userService.pageUserAppletsBackstage(pageUserAppletsBackstageDTO); } @ApiOperation(value = "编辑用户状态" ) @PostMapping("user") 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/partybuilding/ActivitySignUpDTO.java
New file @@ -0,0 +1,32 @@ package com.panzhihua.common.model.dtos.partybuilding; 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: 2020-12-30 10:04 **/ @Data @ApiModel("报名、取消报名党建活动") public class ActivitySignUpDTO { @ApiModelProperty(value = "党建活动id",example ="3",required = true) @Min(value = 1,message ="党建活动不能为空") @NotNull(message ="党建活动不能为空") private Long id; @ApiModelProperty(value = "操作类型 0取消报名 1 报名",example ="1",required = true) @Min(value = 0,message ="操作类型不能为空") @NotNull(message ="操作类型不能为空") private Integer type; @ApiModelProperty(value = "登录用户id",hidden = true) private Long userId; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/PageUserAppletsBackstageDTO.java
New file @@ -0,0 +1,65 @@ package com.panzhihua.common.model.dtos.user; import com.fasterxml.jackson.annotation.JsonFormat; import com.panzhihua.common.validated.PageGroup; import com.panzhihua.common.validated.PutGroup; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.Min; import javax.validation.constraints.NotNull; import java.util.Date; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 运营后台分页查询小程序用户 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2020-12-30 11:27 **/ @Data @ApiModel(value = "运营后台分页查询小程序用户") public class PageUserAppletsBackstageDTO { @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 phone; @ApiModelProperty(value = "所属社区",example = "0") private Long communityId; @ApiModelProperty(value = "搜索-注册开始时间",example = "2020-01-02 00:00:00") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createAtBegin; @ApiModelProperty(value = "搜索-注册结束时间",example = "2020-12-28 00:00:00") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createAtEnd; @ApiModelProperty(value = "状态 1 启用 2 禁用",example = "0") @NotNull(groups = {PutGroup.class},message = "状态不能为空") @Min(value = 1,groups = {PutGroup.class},message = "状态不能为空") private Integer status; @ApiModelProperty(value = "搜索-最后登录时间开始",example = "2020-01-02 00:00:00") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date lastLoginTimeBegin; @ApiModelProperty(value = "搜索-最后登录时间结束",example = "2020-12-28 00:00:00") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date lastLoginTimeEnd; @ApiModelProperty(value = "编辑-用户主键",example = "2") @NotNull(groups = {PutGroup.class},message = "用户主键不能为空") @Min(value = 1,groups = {PutGroup.class},message = "用户主键不能为空") private Long userId; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java
@@ -104,6 +104,9 @@ @ApiModelProperty(value = "登录用户id",hidden = true) private Long userId; @ApiModelProperty(value = "登录用户id",hidden = true) private Long logInUserId; @ApiModelProperty("反馈时间") private Date feedbackAt; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysUserVO.java
New file @@ -0,0 +1,44 @@ package com.panzhihua.common.model.vos.user; 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: 2020-12-30 11:22 **/ @Data @ApiModel("小程序用户") public class SysUserVO { @ApiModelProperty("主键") private Long userId; @ApiModelProperty("手机号") private String phone; @ApiModelProperty("昵称") private String nickName; @ApiModelProperty("真实名字") private String name; @ApiModelProperty("社区名字") private String communityName; @ApiModelProperty("1 启用 2 禁用") private Integer status; @ApiModelProperty("创建时间") private Date createAt; @ApiModelProperty("最后登录时间") private Date lastLoginTime; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java
@@ -1,5 +1,6 @@ package com.panzhihua.common.service.partybuilding; import com.panzhihua.common.model.dtos.partybuilding.ActivitySignUpDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComActActivityVO; import com.panzhihua.common.model.vos.partybuilding.*; @@ -235,4 +236,20 @@ */ @PostMapping("/partybuildIng/listactivity") R listActivity(@RequestParam("userId") Long userId); /** * 党员活动人员参入列表 * @param id 活动id * @return 党员集合 */ @PostMapping("/partybuildIng/listpartybuildingmember") R listPartyBuildingMember(@RequestParam("id")Long id); /** * 报名、取消报名党员活动 * @param activitySignUpDTO 操作参数 * @return 操作结果 */ @PostMapping("/partybuildIng/putactivitysignup") R putActivitySignUp(@RequestBody ActivitySignUpDTO activitySignUpDTO); } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
@@ -1,5 +1,6 @@ package com.panzhihua.common.service.user; import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.MenuVO; import com.panzhihua.common.model.vos.R; @@ -337,4 +338,20 @@ */ @PostMapping("putcommngusertag") R putComMngUserTag(@RequestBody SystemmanagementConfigVO systemmanagementConfigVO); /** * 分页查询小程序用户 * @param pageUserAppletsBackstageDTO 查询参数 * @return 分页集合 */ @PostMapping("pageuserappletsbackstage") R pageUserAppletsBackstage(@RequestBody PageUserAppletsBackstageDTO pageUserAppletsBackstageDTO); /** * 编辑用户状态 * @param pageUserAppletsBackstageDTO 启用或者禁用 1 启用 2 禁用 * @return 编辑结果 */ @PostMapping("putuserappletsbackstage") R putUserAppletsBackstage(@RequestBody PageUserAppletsBackstageDTO pageUserAppletsBackstageDTO); } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/validated/PageGroup.java
New file @@ -0,0 +1,10 @@ package com.panzhihua.common.validated; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 分页校验 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2020-12-30 13:47 **/ public interface PageGroup { } springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/dtos/partybuilding/ActivitySignUpDTO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/dtos/user/PageUserAppletsBackstageDTO.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/SysUserVO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/service/partybuilding/PartyBuildingService.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/service/user/UserService.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/validated/PageGroup.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
@@ -157,8 +157,8 @@ Page<ComActActivityVO> page = (Page<ComActActivityVO>) r.getData(); List<ComActActivityVO> content = page.getRecords(); if (!ObjectUtils.isEmpty(content)) { List<ComActActPrizeVO> comActActPrizeVOList = new ArrayList<>(); content.forEach(comActActivityVO1 -> { List<ComActActPrizeVO> comActActPrizeVOList = new ArrayList<>(); Long id = comActActivityVO1.getId(); List<ComActActPrizeDO> list = comActActPrizeService.list(new QueryWrapper<ComActActPrizeDO>().lambda().eq(ComActActPrizeDO::getActivityId, id)); if (!ObjectUtils.isEmpty(list)) { @@ -169,8 +169,8 @@ }); } comActActivityVO1.setComActActPrizeVOList(comActActPrizeVOList); comActActPrizeVOList.clear(); }); page.setRecords(content); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java
@@ -42,6 +42,7 @@ Page page = new Page<>(); Long pageNum = comActEasyPhotoVO.getPageNum(); Long pageSize = comActEasyPhotoVO.getPageSize(); Long userId = comActEasyPhotoVO.getLogInUserId(); if (null==pageNum||0==pageNum) { pageNum = 1l; } @@ -55,8 +56,7 @@ if (!ObjectUtils.isEmpty(records)) { records.forEach(comActEasyPhotoVO1 -> { Long id = comActEasyPhotoVO1.getId(); Long sponsorId = comActEasyPhotoVO1.getSponsorId(); ComActEasyPhotoUserDO comActEasyPhotoUserDO = comActEasyPhotoUserDAO.selectOne(new QueryWrapper<ComActEasyPhotoUserDO>().lambda().eq(ComActEasyPhotoUserDO::getEasyPhotoId, id).eq(ComActEasyPhotoUserDO::getUserId, sponsorId)); ComActEasyPhotoUserDO comActEasyPhotoUserDO = comActEasyPhotoUserDAO.selectOne(new QueryWrapper<ComActEasyPhotoUserDO>().lambda().eq(ComActEasyPhotoUserDO::getEasyPhotoId, id).eq(ComActEasyPhotoUserDO::getUserId, userId)); if (ObjectUtils.isEmpty(comActEasyPhotoUserDO)) { comActEasyPhotoVO1.setHaveGiveThumbsUp(0); }else { springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java
@@ -1,5 +1,6 @@ package com.panzhihua.service_dangjian.api; import com.panzhihua.common.model.dtos.partybuilding.ActivitySignUpDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.partybuilding.*; import com.panzhihua.service_dangjian.service.ComBpActivityService; @@ -43,8 +44,8 @@ */ @PostMapping("addpartybuildingmember") public R addPartyBuildingMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO){ R r=comPbMemberService.addPartyBuildingMember(partyBuildingMemberVO); return r; return comPbMemberService.addPartyBuildingMember(partyBuildingMemberVO); } /** @@ -53,8 +54,8 @@ */ @PostMapping("listsavepartybuildingmemberexcelvo") public R listSavePartyBuildingMemberExcelVO(@RequestBody List<PartyBuildingMemberExcelVO> list){ R r=comPbMemberService.listSavePartyBuildingMemberExcelVO(list); return r; return comPbMemberService.listSavePartyBuildingMemberExcelVO(list); } /** @@ -64,8 +65,8 @@ */ @PostMapping("pagepartyorganization") public R pagePartyOrganization(@RequestBody PagePartyOrganizationVO pagePartyOrganizationVO){ R r=comPbMemberService.pagePartyOrganization(pagePartyOrganizationVO); return r; return comPbMemberService.pagePartyOrganization(pagePartyOrganizationVO); } /** @@ -79,8 +80,8 @@ if (ObjectUtils.isEmpty(id)) { return R.fail("党员id不能为空"); } R r=comBpActivityService.listPartyMemberActivities(partyBuildingActivityVO); return r; return comBpActivityService.listPartyMemberActivities(partyBuildingActivityVO); } /** @@ -90,8 +91,8 @@ */ @PostMapping("pageactivitymembers") public R pageActivityMembers(@RequestBody PageActivityMembersVO pageActivityMembersVO){ R r=comBpActivityService.pageActivityMembers(pageActivityMembersVO); return r; return comBpActivityService.pageActivityMembers(pageActivityMembersVO); } /** @@ -101,8 +102,8 @@ */ @PostMapping("updatepartybuildingmember") public R updatePartyBuildingMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO){ R r=comPbMemberService.updatePartyBuildingMember(partyBuildingMemberVO); return r; return comPbMemberService.updatePartyBuildingMember(partyBuildingMemberVO); } /** @@ -112,8 +113,8 @@ */ @PostMapping("activityinfo") public R activityinfo(@RequestParam("id") Long id){ R r=comBpActivityService.activityinfo(id); return r; return comBpActivityService.activityinfo(id); } /** @@ -123,8 +124,8 @@ */ @PostMapping("listPartyMember") public R listPartyMember(@RequestParam("communityId")Long communityId){ R r=comPbMemberService.listPartyMember(communityId); return r; return comPbMemberService.listPartyMember(communityId); } /** @@ -134,8 +135,8 @@ */ @PostMapping("addpartycommittee") public R addPartyCommittee(@RequestBody PartyCommitteeVO partyCommitteeVO){ R r=comPbMemberService.addPartyCommittee(partyCommitteeVO); return r; return comPbMemberService.addPartyCommittee(partyCommitteeVO); } /** @@ -145,8 +146,8 @@ */ @PostMapping("updatepartycommittee") public R updatePartyCommittee(@RequestBody PartyCommitteeVO partyCommitteeVO){ R r=comPbMemberService.updatePartyCommittee(partyCommitteeVO); return r; return comPbMemberService.updatePartyCommittee(partyCommitteeVO); } /** @@ -156,8 +157,8 @@ */ @PostMapping("deletepartycommittee") public R deletePartyCommittee(@RequestBody PartyCommitteeVO partyCommitteeVO){ R r=comPbMemberService.deletePartyCommittee(partyCommitteeVO); return r; return comPbMemberService.deletePartyCommittee(partyCommitteeVO); } /** @@ -167,8 +168,8 @@ */ @PostMapping("pagepartycommittee") public R pagePartyCommittee(@RequestBody PartyCommitteeVO partyCommitteeVO){ R r=comPbMemberService.pagePartyCommittee(partyCommitteeVO); return r; return comPbMemberService.pagePartyCommittee(partyCommitteeVO); } /** @@ -178,8 +179,8 @@ */ @PostMapping("adddynamic") public R adddYnamic(@RequestBody PartyBuildingComPbDynVO partyCommitteeVO){ R r=comPbMemberService.adddYnamic(partyCommitteeVO); return r; return comPbMemberService.adddYnamic(partyCommitteeVO); } /** @@ -189,8 +190,8 @@ */ @PostMapping("updatedynamic") public R updateYnamic(@RequestBody PartyBuildingComPbDynVO partyCommitteeVO){ R r=comPbMemberService.updateYnamic(partyCommitteeVO); return r; return comPbMemberService.updateYnamic(partyCommitteeVO); } /** @@ -200,8 +201,8 @@ */ @PostMapping("infodynamic") public R infoYnamic(@RequestParam("id") Integer id){ R r=comPbMemberService.infoYnamic(id); return r; return comPbMemberService.infoYnamic(id); } /** @@ -211,8 +212,8 @@ */ @PostMapping("pagedynamic") public R pageYnamic(@RequestBody PartyBuildingComPbDynVO partyBuildingComPbDynVO){ R r=comPbMemberService.pageYnamic(partyBuildingComPbDynVO); return r; return comPbMemberService.pageYnamic(partyBuildingComPbDynVO); } /** @@ -222,8 +223,8 @@ */ @PostMapping("deletedynamic") public R deleteYnamic(@RequestParam("id") Integer id){ R r=comPbMemberService.deleteYnamic(id); return r; return comPbMemberService.deleteYnamic(id); } /** @@ -233,8 +234,8 @@ */ @PostMapping("addactivity") public R addactivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO){ R r=comBpActivityService.addactivity(partyBuildingActivityVO); return r; return comBpActivityService.addactivity(partyBuildingActivityVO); } /** @@ -244,8 +245,8 @@ */ @PostMapping("updateactivity") public R updateActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO){ R r=comBpActivityService.updateActivity(partyBuildingActivityVO); return r; return comBpActivityService.updateActivity(partyBuildingActivityVO); } /** @@ -255,8 +256,8 @@ */ @PostMapping("releaseactivity") public R releaseActivity(@RequestParam("id") Long id){ R r=comBpActivityService.releaseActivity(id); return r; return comBpActivityService.releaseActivity(id); } /** @@ -266,8 +267,8 @@ */ @PostMapping("deleteactivity") public R deleteActivity(@RequestParam("id") Long id){ R r=comBpActivityService.deleteActivity(id); return r; return comBpActivityService.deleteActivity(id); } /** @@ -277,8 +278,8 @@ */ @PostMapping("pageactivity") public R pageActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO){ R r=comBpActivityService.pageActivity(partyBuildingActivityVO); return r; return comBpActivityService.pageActivity(partyBuildingActivityVO); } /** @@ -288,8 +289,8 @@ */ @PostMapping("adddynuser") public R addDynUser(@RequestBody ComPbDynUserVO comPbDynUserVO){ R r=comPbMemberService.addDynUser(comPbDynUserVO); return r; return comPbMemberService.addDynUser(comPbDynUserVO); } /** @@ -299,8 +300,8 @@ */ @PostMapping("deletepartybuildingmember") public R deleteDynUser(@RequestParam("id") Integer id){ R r=comPbMemberService.deleteDynUser(id); return r; return comPbMemberService.deleteDynUser(id); } /** @@ -310,8 +311,8 @@ */ @PostMapping("cancelactivity") public R cancelActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO){ R r=comBpActivityService.cancelActivity(partyBuildingActivityVO); return r; return comBpActivityService.cancelActivity(partyBuildingActivityVO); } /** @@ -321,8 +322,28 @@ */ @PostMapping("listactivity") public R listActivity(@RequestParam("userId") Long userId){ R r=comBpActivityService.listActivity(userId); return r; return comBpActivityService.listActivity(userId); } /** * 党员活动人员参入列表 * @param id 活动id * @return 党员集合 */ @PostMapping("listpartybuildingmember") public R listPartyBuildingMember(@RequestParam("id")Long id){ return comBpActivityService.listPartyBuildingMember(id); } /** * 报名、取消报名党员活动 * @param activitySignUpDTO 操作参数 * @return 操作结果 */ @PostMapping("putactivitysignup") public R putActivitySignUp(@RequestBody ActivitySignUpDTO activitySignUpDTO){ return comBpActivityService.putActivitySignUp(activitySignUpDTO); } } springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberDAO.java
@@ -67,4 +67,7 @@ "order by m.join_time desc "+ "</script>") IPage<PartyBuildingMemberVO> pagePartyOrganization(Page page, @Param("pagePartyOrganizationVO") PagePartyOrganizationVO pagePartyOrganizationVO); @Select("select m.* from sys_user u join com_pb_member m on u.id_card=m.id_card where u.user_id=#{userId}") ComPbMemberDO selectByUserId(Long userId); } springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComBpActivityService.java
@@ -1,5 +1,6 @@ package com.panzhihua.service_dangjian.service; import com.panzhihua.common.model.dtos.partybuilding.ActivitySignUpDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.partybuilding.PageActivityMembersVO; import com.panzhihua.common.model.vos.partybuilding.PartyBuildingActivityVO; @@ -73,4 +74,16 @@ * @return 党建活动列表 */ R listActivity(Long userId); /** * 党员活动人员参入列表 * @param id 活动id * @return 党员集合 */ R listPartyBuildingMember(Long id); /** * 报名、取消报名党员活动 * @param activitySignUpDTO 操作参数 * @return 操作结果 */ R putActivitySignUp(ActivitySignUpDTO activitySignUpDTO); } springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java
@@ -3,6 +3,7 @@ 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.partybuilding.ActivitySignUpDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComActActivityVO; import com.panzhihua.common.model.vos.partybuilding.PageActivityMembersVO; @@ -63,10 +64,10 @@ Page page = new Page<>(); Long pageNum = pageActivityMembersVO.getPageNum(); Long pageSize = pageActivityMembersVO.getPageSize(); if (null==pageNum) { if (null == pageNum) { pageNum = 1l; } if (null==pageSize) { if (null == pageSize) { pageSize = 10l; } page.setSize(pageSize); @@ -85,25 +86,29 @@ public R activityinfo(Long id) { ComPbActivityDO comPbActivityDO = comBpActivityDAO.selectById(id); if (ObjectUtils.isEmpty(comPbActivityDO)) { return R.fail(); return R.fail("活动不存在"); } PartyBuildingActivityVO partyBuildingActivityVO=new PartyBuildingActivityVO(); BeanUtils.copyProperties(comPbActivityDO,partyBuildingActivityVO); List<ComPbActivityMemberDO> comPbActivityMemberDOS = comPbActivityMemberDAO.selectList(new QueryWrapper<ComPbActivityMemberDO>().lambda().eq(ComPbActivityMemberDO::getActivityId, id)); PartyBuildingActivityVO partyBuildingActivityVO = new PartyBuildingActivityVO(); BeanUtils.copyProperties(comPbActivityDO, partyBuildingActivityVO); List<ComPbActivityMemberDO> comPbActivityMemberDOS = comPbActivityMemberDAO.selectList(new QueryWrapper<ComPbActivityMemberDO>().lambda().eq(ComPbActivityMemberDO::getActivityId, id).orderByDesc(ComPbActivityMemberDO::getCreateAt)); List<PartyBuildingMemberVO> partyBuildingMemberVOS = new ArrayList<>(); if (!ObjectUtils.isEmpty(comPbActivityMemberDOS)) { List<Long> collect = comPbActivityMemberDOS.stream().map(ComPbActivityMemberDO::getMemberId).collect(Collectors.toList()); int size = collect.size(); if (size>=6) { collect=collect.subList(0,6); } List<ComPbMemberDO> comPbMemberDOS = comPbMemberDAO.selectList(new QueryWrapper<ComPbMemberDO>().lambda().in(ComPbMemberDO::getId, collect)); List<PartyBuildingMemberVO> partyBuildingMemberVOS=new ArrayList<>(); comPbMemberDOS.forEach(comPbMemberDO -> { PartyBuildingMemberVO partyBuildingMemberVO=new PartyBuildingMemberVO(); BeanUtils.copyProperties(comPbMemberDO,partyBuildingMemberVO); PartyBuildingMemberVO partyBuildingMemberVO = new PartyBuildingMemberVO(); BeanUtils.copyProperties(comPbMemberDO, partyBuildingMemberVO); partyBuildingMemberVOS.add(partyBuildingMemberVO); }); partyBuildingActivityVO.setPartyBuildingMemberVOS(partyBuildingMemberVOS); partyBuildingActivityVO.setParticipationActualNum(partyBuildingMemberVOS.size()); }else{ partyBuildingActivityVO.setParticipationActualNum(size); } else { partyBuildingActivityVO.setParticipationActualNum(0); } partyBuildingActivityVO.setPartyBuildingMemberVOS(partyBuildingMemberVOS); return R.ok(partyBuildingActivityVO); } @@ -115,11 +120,11 @@ */ @Override public R addactivity(PartyBuildingActivityVO partyBuildingActivityVO) { ComPbActivityDO comPbActivityDO =new ComPbActivityDO(); ComPbActivityDO comPbActivityDO = new ComPbActivityDO(); BeanUtils.copyProperties(partyBuildingActivityVO, comPbActivityDO); comPbActivityDO.setCreateAt(new Date()); int insert = comBpActivityDAO.insert(comPbActivityDO); if (insert>0) { if (insert > 0) { return R.ok(); } return R.fail(); @@ -133,10 +138,10 @@ */ @Override public R updateActivity(PartyBuildingActivityVO partyBuildingActivityVO) { ComPbActivityDO comPbActivityDO =new ComPbActivityDO(); ComPbActivityDO comPbActivityDO = new ComPbActivityDO(); BeanUtils.copyProperties(partyBuildingActivityVO, comPbActivityDO); int update = comBpActivityDAO.updateById(comPbActivityDO); if (update>0) { if (update > 0) { return R.ok(); } return R.fail(); @@ -150,12 +155,12 @@ */ @Override public R releaseActivity(Long id) { ComPbActivityDO comPbActivityDO =new ComPbActivityDO(); ComPbActivityDO comPbActivityDO = new ComPbActivityDO(); comPbActivityDO.setId(id); comPbActivityDO.setStatus(2); comPbActivityDO.setReleaseTime(new Date()); int update = comBpActivityDAO.updateById(comPbActivityDO); if (update>0) { if (update > 0) { return R.ok(); } return R.fail(); @@ -170,7 +175,7 @@ @Override public R deleteActivity(Long id) { int delete = comBpActivityDAO.deleteById(id); if (delete>0) { if (delete > 0) { return R.ok(); } return R.fail(); @@ -187,10 +192,10 @@ Page page = new Page<>(); Long pageNum = partyBuildingActivityVO.getPageNum(); Long pageSize = partyBuildingActivityVO.getPageSize(); if (null==pageNum) { if (null == pageNum) { pageNum = 1l; } if (null==pageSize) { if (null == pageSize) { pageSize = 10l; } page.setSize(pageSize); @@ -207,12 +212,12 @@ */ @Override public R cancelActivity(PartyBuildingActivityVO partyBuildingActivityVO) { ComPbActivityDO comPbActivityDO =new ComPbActivityDO(); ComPbActivityDO comPbActivityDO = new ComPbActivityDO(); comPbActivityDO.setId(partyBuildingActivityVO.getId()); comPbActivityDO.setCancelReason(partyBuildingActivityVO.getCancelReason()); comPbActivityDO.setCreateBy(partyBuildingActivityVO.getCreateBy()); int update = comBpActivityDAO.updateById(comPbActivityDO); if (update>0) { if (update > 0) { return R.ok(); } return R.fail(); @@ -232,9 +237,9 @@ } List<Long> collect = comPbActivityMemberDOS.stream().map(comPbActivityMemberDO -> comPbActivityMemberDO.getActivityId()).collect(Collectors.toList()); List<ComPbActivityDO> comPbActivityDOS = comBpActivityDAO.selectBatchIds(collect); List<ComActActivityVO>comActActivityVOS=new ArrayList<>(); List<ComActActivityVO> comActActivityVOS = new ArrayList<>(); comPbActivityDOS.forEach(comPbActivityDO -> { ComActActivityVO comActActivityVO=new ComActActivityVO(); ComActActivityVO comActActivityVO = new ComActActivityVO(); comActActivityVO.setType(3); comActActivityVO.setId(comPbActivityDO.getId()); comActActivityVO.setStatus(comPbActivityDO.getStatus()); @@ -246,5 +251,70 @@ return R.ok(comActActivityVOS); } /** * 党员活动人员参入列表 * * @param id 活动id * @return 党员集合 */ @Override public R listPartyBuildingMember(Long id) { List<PartyBuildingMemberVO> partyBuildingMemberVOS = new ArrayList<>(); List<ComPbActivityMemberDO> comPbActivityMemberDOS = comPbActivityMemberDAO.selectList(new QueryWrapper<ComPbActivityMemberDO>().lambda().eq(ComPbActivityMemberDO::getActivityId, id).orderByDesc(ComPbActivityMemberDO::getCreateAt)); if (!ObjectUtils.isEmpty(comPbActivityMemberDOS)) { List<Long> collect = comPbActivityMemberDOS.stream().map(ComPbActivityMemberDO::getMemberId).collect(Collectors.toList()); List<ComPbMemberDO> comPbMemberDOS = comPbMemberDAO.selectList(new QueryWrapper<ComPbMemberDO>().lambda().in(ComPbMemberDO::getId, collect)); comPbMemberDOS.forEach(comPbMemberDO -> { PartyBuildingMemberVO partyBuildingMemberVO = new PartyBuildingMemberVO(); BeanUtils.copyProperties(comPbMemberDO, partyBuildingMemberVO); partyBuildingMemberVOS.add(partyBuildingMemberVO); }); } return R.ok(partyBuildingMemberVOS); } /** * 报名、取消报名党员活动 * * @param activitySignUpDTO 操作参数 * @return 操作结果 */ @Override public R putActivitySignUp(ActivitySignUpDTO activitySignUpDTO) { Long id=activitySignUpDTO.getId(); Long userId=activitySignUpDTO.getUserId(); ComPbActivityDO comPbActivityDO = comBpActivityDAO.selectById(id); if (ObjectUtils.isEmpty(comPbActivityDO)) { return R.fail("活动不存在"); } ComPbMemberDO comPbMemberDO=comPbMemberDAO.selectByUserId(userId); if (ObjectUtils.isEmpty(comPbMemberDO)) { return R.fail("您不是党员"); } Integer type=activitySignUpDTO.getType(); ComPbActivityMemberDO comPbActivityMemberDO = comPbActivityMemberDAO.selectOne(new QueryWrapper<ComPbActivityMemberDO>().lambda().eq(ComPbActivityMemberDO::getMemberId, comPbMemberDO.getId()).eq(ComPbActivityMemberDO::getActivityId, id)); boolean empty = ObjectUtils.isEmpty(comPbActivityMemberDO); int mum=0; if (type.intValue()==1) { if (empty) { ComPbActivityMemberDO comPbActivityMemberDO1=new ComPbActivityMemberDO(); comPbActivityMemberDO1.setActivityId(id); comPbActivityMemberDO1.setMemberId(comPbMemberDO.getId()); comPbActivityMemberDO1.setCreateAt(new Date()); mum=comPbActivityMemberDAO.insert(comPbActivityMemberDO1); } else { return R.ok(null,"已经加入了"); } }else{ if (empty) { return R.ok(null,"已经取消"); }else{ mum=comPbActivityMemberDAO.deleteById(comPbActivityMemberDO.getId()); } } if (mum>0) { return R.ok(); } return R.fail(); } } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
@@ -1,5 +1,6 @@ package com.panzhihua.service_user.api; import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.SystemmanagementConfigVO; @@ -340,4 +341,24 @@ public R putComMngUserTag(@RequestBody SystemmanagementConfigVO systemmanagementConfigVO){ return userService.putComMngUserTag(systemmanagementConfigVO); } /** * 分页查询小程序用户 * @param pageUserAppletsBackstageDTO 查询参数 * @return 分页集合 */ @PostMapping("pageuserappletsbackstage") public R pageUserAppletsBackstage(@RequestBody PageUserAppletsBackstageDTO pageUserAppletsBackstageDTO){ return userService.pageUserAppletsBackstage(pageUserAppletsBackstageDTO); } /** * 编辑用户状态 * @param pageUserAppletsBackstageDTO 启用或者禁用 1 启用 2 禁用 * @return 编辑结果 */ @PostMapping("putuserappletsbackstage") public R putUserAppletsBackstage(@RequestBody PageUserAppletsBackstageDTO pageUserAppletsBackstageDTO){ return userService.putUserAppletsBackstage(pageUserAppletsBackstageDTO); } } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
@@ -4,8 +4,10 @@ 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.PageUserAppletsBackstageDTO; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.user.AdministratorsUserVO; import com.panzhihua.common.model.vos.user.SysUserVO; import com.panzhihua.service_user.model.dos.SysUserDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -104,7 +106,7 @@ "JOIN sys_user_role r ON u.user_id = r.user_id\n" + "JOIN sys_role e ON r.role_id = e.role_id \n" + "<if test='administratorsUserVO.roleId != null and administratorsUserVO.roleId!=0'>" + " and e.role_id=#{administratorsUserVO.roleId}"+ " and e.role_id=#{administratorsUserVO.roleId}" + " </if> " + " <where>" + "<if test='administratorsUserVO.communityId != null '>" + @@ -122,4 +124,37 @@ " </where>" + "</script>") IPage<AdministratorsUserVO> pageUserBackstage(Page page, @Param("administratorsUserVO") AdministratorsUserVO administratorsUserVO); @Select("<script> " + "select \n" + "u.userId,\n" + "u.phone,\n" + "u.nick_name,\n" + "u.name,\n" + "a.name communityName,\n" + "a.status,\n" + "a.create_at,\n" + "a.last_login_time\n" + "from sys_user u\n" + "left join com_act a on u.community_id=a.community_id\n" + " <where>" + "<if test='pageUserAppletsBackstageDTO.phone != null and pageUserAppletsBackstageDTO.phone.trim() != ""'>" + "and u.phone=#{pageUserAppletsBackstageDTO.phone}\n" + " </if> " + "<if test='pageUserAppletsBackstageDTO.communityId != null and pageUserAppletsBackstageDTO.communityId != 0'>" + "and u.community_id=#{pageUserAppletsBackstageDTO.communityId}\n" + " </if> " + "<if test='pageUserAppletsBackstageDTO.status != null and pageUserAppletsBackstageDTO.status != 0'>" + "and u.status=#{pageUserAppletsBackstageDTO.status}\n" + " </if> " + "<if test='pageUserAppletsBackstageDTO.createAtBegin != null '>" + "and u.create_at between #{pageUserAppletsBackstageDTO.createAtBegin} and #{pageUserAppletsBackstageDTO.createAtEnd}\n" + " </if> " + "<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); } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
@@ -1,5 +1,6 @@ package com.panzhihua.service_user.service; import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.SystemmanagementConfigVO; @@ -210,4 +211,16 @@ * @return 操作结果 */ R putComMngUserTag(SystemmanagementConfigVO systemmanagementConfigVO); /** * 分页查询小程序用户 * @param pageUserAppletsBackstageDTO 查询参数 * @return 分页集合 */ R pageUserAppletsBackstage(PageUserAppletsBackstageDTO pageUserAppletsBackstageDTO); /** * 编辑用户状态 * @param pageUserAppletsBackstageDTO 启用或者禁用 1 启用 2 禁用 * @return 编辑结果 */ R putUserAppletsBackstage(PageUserAppletsBackstageDTO pageUserAppletsBackstageDTO); } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -7,6 +7,7 @@ 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.user.PageUserAppletsBackstageDTO; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.SystemmanagementConfigVO; @@ -882,6 +883,43 @@ } /** * 分页查询小程序用户 * * @param pageUserAppletsBackstageDTO 查询参数 * @return 分页集合 */ @Override public R pageUserAppletsBackstage(PageUserAppletsBackstageDTO pageUserAppletsBackstageDTO) { Page page = new Page<>(); Long pageNum = pageUserAppletsBackstageDTO.getPageNum(); Long pageSize = pageUserAppletsBackstageDTO.getPageSize(); page.setSize(pageSize); page.setCurrent(pageNum); IPage<SysUserVO> iPage = userDao.pageUserAppletsBackstage(page, pageUserAppletsBackstageDTO); return R.ok(iPage); } /** * 编辑用户状态 * * @param pageUserAppletsBackstageDTO 启用或者禁用 1 启用 2 禁用 * @return 编辑结果 */ @Override public R putUserAppletsBackstage(PageUserAppletsBackstageDTO pageUserAppletsBackstageDTO) { Long userId = pageUserAppletsBackstageDTO.getUserId(); Integer status = pageUserAppletsBackstageDTO.getStatus(); SysUserDO sysUserDO=new SysUserDO(); sysUserDO.setUserId(userId); sysUserDO.setStatus(status); int update = userDao.updateById(sysUserDO); if (update>0) { return R.ok(); } return R.fail("用户不存在"); } public static void main(String[] args) { String encode = new BCryptPasswordEncoder().encode("123456"); System.out.println(encode);
