springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml
@@ -23,61 +23,47 @@ </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/validated/PutGroup.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/exception/GlobalExceptionCapture.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/SystemManagementApi.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/user/AdministratorsUserVO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/user/SysMenuVO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/service/HanyuPinyinHelper.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/dao/SysMenuDAO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserRoleDAO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysMenuDO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserRoleDO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/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/UserApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/UserApi.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/controller/BaseController.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/controller/BaseController.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/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/ComActActivityVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishVO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructAreaVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructAreaVO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/applets_backstage/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/applets_backstage/pom.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/applets_backstage/src/main/java/com/panzhihua/applets_backstage/exceptions/GlobalExceptionCapture.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets_backstage/src/main/java/com/panzhihua/applets_backstage/exceptions/GlobalExceptionCapture.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/pom.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructHouseVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructHouseVO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/SignactivityVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/SignactivityVO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngFamilyInfoVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngFamilyInfoVO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/user/ChangePasswordVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/user/ChangePasswordVO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/user/RoleVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/user/RoleVO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/service/user/UserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/service/user/UserService.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/controller/BaseController.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/controller/BaseController.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/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/ComActActivityVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/ComActActivityVO.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/ComActMicroWishVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/ComActMicroWishVO.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/ComMngStructAreaVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/ComMngStructAreaVO.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/ComMngStructHouseVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/ComMngStructHouseVO.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/SignactivityVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/SignactivityVO.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/user/ComMngFamilyInfoVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/user/ComMngFamilyInfoVO.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/service/community/CommunityService.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/service/community/CommunityService.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/service/partybuilding/PartyBuildingService.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/service/partybuilding/PartyBuildingService.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/user/ChangePasswordVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/user/ChangePasswordVO.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/user/RoleVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/user/RoleVO.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$/common/target/common-1.0-SNAPSHOT.jar" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/common-1.0-SNAPSHOT.jar" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/maven-archiver/pom.properties" 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$/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/ComActEasyPhotoDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoDO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngStructAreaDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngStructAreaDO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngStructHouseDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngStructHouseDO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngStructHouseUserDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngStructHouseUserDO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComActActivityService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComActActivityService.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComActMicroWishService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComActMicroWishService.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/ComActActivityServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.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/ComActMicroWishServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.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/ComMngStructHouseServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructHouseServiceImpl.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_community/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/resources/bootstrap.yml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/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_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructOtherBuildServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructOtherBuildServiceImpl.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVolunteerMngServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVolunteerMngServiceImpl.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_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_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_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/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/SysDeptDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysDeptDO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysRoleDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysRoleDO.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/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" /> </list> <option name="SHOW_DIALOG" value="false" /> <option name="HIGHLIGHT_CONFLICTS" value="true" /> @@ -163,22 +149,9 @@ </set> </option> </component> <component name="RunManager" selected="Application.UserApi"> <component name="RunManager" selected="Application.HanyuPinyinHelper"> <configuration name="AES" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true"> <option name="MAIN_CLASS_NAME" value="com.panzhihua.common.utlis.AES" /> <module name="common" /> <extension name="coverage"> <pattern> <option name="PATTERN" value="com.panzhihua.common.utlis.*" /> <option name="ENABLED" value="true" /> </pattern> </extension> <method v="2"> <option name="Make" enabled="true" /> </method> </configuration> <configuration name="AESUtils" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true"> <option name="MAIN_CLASS_NAME" value="com.panzhihua.common.utlis.AESUtils" /> <module name="common" /> <extension name="coverage"> <pattern> @@ -209,6 +182,19 @@ <extension name="coverage"> <pattern> <option name="PATTERN" value="com.panzhihua.applets.api.*" /> <option name="ENABLED" value="true" /> </pattern> </extension> <method v="2"> <option name="Make" enabled="true" /> </method> </configuration> <configuration name="HanyuPinyinHelper" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true"> <option name="MAIN_CLASS_NAME" value="com.panzhihua.common.service.HanyuPinyinHelper" /> <module name="common" /> <extension name="coverage"> <pattern> <option name="PATTERN" value="com.panzhihua.common.service.*" /> <option name="ENABLED" value="true" /> </pattern> </extension> @@ -313,7 +299,6 @@ </method> </configuration> <list> <item itemvalue="Application.AESUtils" /> <item itemvalue="Application.AES" /> <item itemvalue="Application.CommonApi" /> <item itemvalue="Spring Boot.AppletsApplication" /> @@ -328,14 +313,15 @@ <item itemvalue="Spring Boot.ServiceCommunityApplication" /> <item itemvalue="Application.BaseController" /> <item itemvalue="Application.UserApi" /> <item itemvalue="Application.HanyuPinyinHelper" /> </list> <recent_temporary> <list> <item itemvalue="Application.HanyuPinyinHelper" /> <item itemvalue="Application.UserApi" /> <item itemvalue="Application.BaseController" /> <item itemvalue="Application.CommonApi" /> <item itemvalue="Application.AES" /> <item itemvalue="Application.AESUtils" /> </list> </recent_temporary> </component> @@ -426,7 +412,7 @@ <workItem from="1608371107059" duration="646000" /> <workItem from="1608371917868" duration="79000" /> <workItem from="1608379508016" duration="46000" /> <workItem from="1608531425658" duration="73725000" /> <workItem from="1608531425658" duration="98495000" /> </task> <servers /> </component> @@ -450,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="1608716210609"> <state x="574" y="118" key="#com.intellij.ide.util.MemberChooser" timestamp="1608795954479"> <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="1608716210609" /> <state x="574" y="118" key="#com.intellij.ide.util.MemberChooser/0.0.1536.824@0.0.1536.824" timestamp="1608795954479" /> <state x="405" y="335" key="#com.intellij.refactoring.move.MoveHandler.SelectRefactoringDialog" timestamp="1606099594079"> <screen x="0" y="0" width="1536" height="824" /> </state> @@ -466,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="1608103012443" /> <state width="561" height="466" key="DebuggerActiveHint" timestamp="1608709007773"> <state width="561" height="466" key="DebuggerActiveHint" timestamp="1608793821455"> <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="1608709007773" /> <state width="561" height="466" key="DebuggerActiveHint/0.0.1536.824@0.0.1536.824" timestamp="1608793821455" /> <state x="93" y="93" width="1350" height="638" key="DiffContextDialog" timestamp="1608535183408"> <screen x="0" y="0" width="1536" height="824" /> </state> @@ -478,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="313" key="GridCell.Tab.0.bottom" timestamp="1608714089778"> <state width="1031" height="313" key="GridCell.Tab.0.bottom" timestamp="1608799034996"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="313" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1608714089778" /> <state width="1031" height="313" key="GridCell.Tab.0.center" timestamp="1608714089778"> <state width="1031" height="313" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1608799034996" /> <state width="1031" height="313" key="GridCell.Tab.0.center" timestamp="1608799034996"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="313" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1608714089778" /> <state width="1031" height="313" key="GridCell.Tab.0.left" timestamp="1608714089778"> <state width="1031" height="313" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1608799034996" /> <state width="1031" height="313" key="GridCell.Tab.0.left" timestamp="1608799034996"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="313" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1608714089778" /> <state width="1031" height="313" key="GridCell.Tab.0.right" timestamp="1608714089778"> <state width="1031" height="313" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1608799034996" /> <state width="1031" height="313" key="GridCell.Tab.0.right" timestamp="1608799034996"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="313" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1608714089778" /> <state width="1031" height="313" key="GridCell.Tab.1.bottom" timestamp="1608714089778"> <state width="1031" height="313" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1608799034996" /> <state width="1031" height="313" key="GridCell.Tab.1.bottom" timestamp="1608799034996"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="313" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1608714089778" /> <state width="1031" height="313" key="GridCell.Tab.1.center" timestamp="1608714089778"> <state width="1031" height="313" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1608799034996" /> <state width="1031" height="313" key="GridCell.Tab.1.center" timestamp="1608799034996"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="313" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1608714089778" /> <state width="1031" height="313" key="GridCell.Tab.1.left" timestamp="1608714089778"> <state width="1031" height="313" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1608799034996" /> <state width="1031" height="313" key="GridCell.Tab.1.left" timestamp="1608799034996"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="313" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1608714089778" /> <state width="1031" height="313" key="GridCell.Tab.1.right" timestamp="1608714089778"> <state width="1031" height="313" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1608799034996" /> <state width="1031" height="313" key="GridCell.Tab.1.right" timestamp="1608799034996"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="313" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1608714089778" /> <state width="1031" height="313" key="GridCell.Tab.2.bottom" timestamp="1608714089778"> <state width="1031" height="313" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1608799034996" /> <state width="1031" height="313" key="GridCell.Tab.2.bottom" timestamp="1608799034996"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="313" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1608714089778" /> <state width="1031" height="313" key="GridCell.Tab.2.center" timestamp="1608714089778"> <state width="1031" height="313" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1608799034996" /> <state width="1031" height="313" key="GridCell.Tab.2.center" timestamp="1608799034996"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="313" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1608714089778" /> <state width="1031" height="313" key="GridCell.Tab.2.left" timestamp="1608714089778"> <state width="1031" height="313" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1608799034996" /> <state width="1031" height="313" key="GridCell.Tab.2.left" timestamp="1608799034996"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="313" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1608714089778" /> <state width="1031" height="313" key="GridCell.Tab.2.right" timestamp="1608714089778"> <state width="1031" height="313" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1608799034996" /> <state width="1031" height="313" key="GridCell.Tab.2.right" timestamp="1608799034996"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="313" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1608714089778" /> <state width="1031" height="313" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1608799034996" /> <state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1606714311663"> <screen x="0" y="0" width="1536" height="824" /> </state> @@ -542,14 +528,14 @@ <screen x="0" y="0" width="1536" height="824" /> </state> <state x="93" y="93" width="1350" height="638" key="com.intellij.history.integration.ui.views.DirectoryHistoryDialog/0.0.1536.824@0.0.1536.824" timestamp="1608535536014" /> <state x="93" y="93" width="1350" height="638" key="com.intellij.history.integration.ui.views.FileHistoryDialog" timestamp="1608535536014"> <state x="93" y="93" width="1350" height="638" key="com.intellij.history.integration.ui.views.FileHistoryDialog" timestamp="1608791484208"> <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="1608535536014" /> <state x="468" y="115" width="703" height="594" key="find.popup" timestamp="1608279950168"> <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="1608791484208" /> <state x="468" y="115" width="766" height="594" key="find.popup" timestamp="1608791474550"> <screen x="0" y="0" width="1536" height="824" /> </state> <state x="468" y="115" width="703" height="594" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1608279950168" /> <state x="468" y="115" width="766" height="594" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1608791474550" /> <state x="301" y="126" key="new project wizard" timestamp="1607319774085"> <screen x="0" y="0" width="1536" height="824" /> </state> springcloud_k8s_panzhihuazhihuishequ/applets_backstage/pom.xml
@@ -47,6 +47,9 @@ <groupId>com.netflix.hystrix</groupId> <artifactId>hystrix-javanica</artifactId> </dependency> </dependencies> <build> springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/SystemManagementApi.java
New file @@ -0,0 +1,108 @@ package com.panzhihua.applets_backstage.api; import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.user.AdministratorsUserVO; import com.panzhihua.common.model.vos.user.RoleVO; import com.panzhihua.common.service.HanyuPinyinHelper; import com.panzhihua.common.service.user.UserService; 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.*; import javax.annotation.Resource; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 系统管理 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2020-12-24 09:19 **/ @Api(tags = {"系统管理"}) @RestController @RequestMapping("/systemmanagement/") public class SystemManagementApi extends BaseController { @Resource private UserService userService; @ApiOperation(value = "新增运营后台账户") @PostMapping("user") public R addUser(@RequestBody @Validated(AddGroup.class) AdministratorsUserVO administratorsUserVO){ administratorsUserVO.setType(2); administratorsUserVO.setAreaId(null); administratorsUserVO.setCommunityId(0l); return userService.addUserBackstage(administratorsUserVO); } @ApiOperation(value = "编辑运营后台账户") @PutMapping("user") public R putUserBackstage(@RequestBody AdministratorsUserVO administratorsUserVO){ Long userId = administratorsUserVO.getUserId(); if (null==userId||0==userId) { return R.fail("用户主键不能为空"); } administratorsUserVO.setType(2); administratorsUserVO.setAreaId(null); administratorsUserVO.setCommunityId(0l); Integer status = administratorsUserVO.getStatus(); if (null!=status&&status.intValue()==0) { administratorsUserVO.setStatus(null); } return userService.putUserBackstage(administratorsUserVO); } @ApiOperation(value = "删除后台用户") @DeleteMapping("user") public R deleteUserBackstage(@RequestBody AdministratorsUserVO administratorsUserVO){ Long userId = administratorsUserVO.getUserId(); if (null==userId||0==userId) { return R.fail("用户主键不能为空"); } return userService.deleteUserBackstage(administratorsUserVO); } @ApiOperation(value = "角色下拉列表",response = RoleVO.class) @GetMapping("listrolebackstage") public R listRoleBackstage(){ Long communityId=0l; return userService.listRoleBackstage(communityId); } @ApiOperation(value = "分页查询后台用户",response = AdministratorsUserVO.class) @PostMapping("pageuser") public R pageUserBackstage(@RequestBody AdministratorsUserVO administratorsUserVO){ administratorsUserVO.setCommunityId(0l); return userService.pageUserBackstage(administratorsUserVO); } @ApiOperation(value = "新增角色") @PostMapping("role") public R addRoleBackstage(@RequestBody RoleVO roleVO){ String roleName = roleVO.getRoleName(); if (ObjectUtils.isEmpty(roleName)) { return R.fail("角色名字不能为空"); } roleVO.setCommunityId(0l); Long userId = this.getUserId(); roleVO.setCreateBy(userId); roleVO.setStatus(0); HanyuPinyinHelper hanyuPinyinHelper = new HanyuPinyinHelper() ; roleVO.setRoleKey(hanyuPinyinHelper.toHanyuPinyin(roleName)); return userService.addRoleBackstage(roleVO); } @ApiOperation(value = "删除角色") @DeleteMapping("role") public R deleteRoleBackstage(@RequestBody RoleVO roleVO){ Long roleId = roleVO.getRoleId(); if (null==roleId||0==roleId) { return R.fail("角色主键不能为空"); } return userService.deleteRoleBackstage(roleVO); } } springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/exceptions/GlobalExceptionCapture.java
@@ -74,14 +74,14 @@ return R.fail(HttpStatus.BAD_REQUEST,errorMessage.toString()); } /** * 全局异常捕捉处理 * @param ex 所有运行时异常 * @return R 500 */ @ExceptionHandler(value = Exception.class) public R errorHandler(Exception ex) { log.error("捕获全局异常【{}】",ex.getMessage()); return R.fail(); } // /** // * 全局异常捕捉处理 // * @param ex 所有运行时异常 // * @return R 500 // */ // @ExceptionHandler(value = Exception.class) // public R errorHandler(Exception ex) { // log.error("捕获全局异常【{}】",ex.getMessage()); // return R.fail(); // } } springcloud_k8s_panzhihuazhihuishequ/common/pom.xml
@@ -100,6 +100,12 @@ <groupId>org.hibernate.validator</groupId> <artifactId>hibernate-validator</artifactId> </dependency> <!-- https://mvnrepository.com/artifact/com.belerweb/pinyin4j --> <dependency> <groupId>com.belerweb</groupId> <artifactId>pinyin4j</artifactId> <version>2.5.1</version> </dependency> </dependencies>
@@ -29,6 +29,9 @@ @ApiModelProperty("房屋地址") private String houseName; @ApiModelProperty("房屋地址简称") private String houseShortName; @ApiModelProperty("父类地址编码") private String parentCode;
New file @@ -0,0 +1,76 @@ package com.panzhihua.common.model.vos.user; import com.fasterxml.jackson.annotation.JsonFormat; import com.panzhihua.common.validated.AddGroup; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.Min; import javax.validation.constraints.Pattern; import java.util.Date; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 管理员账户 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2020-12-24 09:31 **/ @Data @ApiModel("管理员账户") public class AdministratorsUserVO { @ApiModelProperty("账户") @Pattern(groups = {AddGroup.class},message="账户2-20个字符，英文，数字",regexp="^[0-9A-Za-z]{2,20}$") private String account; @ApiModelProperty("密码") @Pattern(groups = {AddGroup.class},message="密码格式为6-16个字符，英文，数字，且必须包含英文和数字",regexp="^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,16}$") private String password; @ApiModelProperty("用户名称") @Pattern(groups = {AddGroup.class},message="用户名称2-16个字符，英文，中文，数字",regexp="^[0-9A-Za-z\u4e00-\u9fa5]{2,16}$") private String name; @ApiModelProperty("角色") @Min(value =1,groups = {AddGroup.class},message = "角色不能为空") private Long roleId; @ApiModelProperty("手机号") @Pattern(groups = {AddGroup.class},message="2-16个字符，英文，中文，数字",regexp = "1[3|4|5|7|8][0-9]\\d{8}") private String phone; @ApiModelProperty("状态") @Min(groups = {AddGroup.class},value =1,message = "账户状态不能为空") private Integer status; @ApiModelProperty(value = "人员所在平台 用户类型 1 小程序 2 运营平台 3 社区平台",hidden = true) private Integer type; @ApiModelProperty(value = "小区id",hidden = true) private Long areaId; @ApiModelProperty(value = "社区id",hidden = true) private Long communityId; @ApiModelProperty(value = "用户主键") private Long userId; @ApiModelProperty(value = "当前页数") private Long pageNum; @ApiModelProperty(value = "每页记录数") private Long pageSize; @ApiModelProperty(value = "创建时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createAt; @ApiModelProperty(value = "最后登录时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date lastLoginTime; @ApiModelProperty(value = "角色名字") private String roleName; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ChangePasswordVO.java
@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.Pattern; @@ -22,7 +23,7 @@ private String oldPassword; @ApiModelProperty("新密码") @NotEmpty(message = "新密码不能为空") @NotBlank(message = "新密码不能为空") @Pattern(message="密码格式为6-16个字符，英文，数字，且必须包含英文和数字",regexp="^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,16}$") private String newPassword;
@@ -1,5 +1,6 @@ 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; @@ -38,23 +39,25 @@ private boolean deptCheckStrictly; @ApiModelProperty("角色状态（0正常 1停用）") private String status; private Integer status; @ApiModelProperty("创建者") private String createBy; private Long createBy; @ApiModelProperty("创建时间") private Date createTime; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createAt; @ApiModelProperty("更新者") private String updateBy; private Long updateBy; @ApiModelProperty("更新时间") private Date updateTime; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date updateAt; @ApiModelProperty("备注") private String remark; @ApiModelProperty("社区id") private Integer communityId; private Long communityId; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysMenuVO.java
New file @@ -0,0 +1,72 @@ 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-24 16:50 **/ @Data @ApiModel("菜单") public class SysMenuVO { @ApiModelProperty("菜单id") private Long menuId; @ApiModelProperty("菜单名称") private String menuName; @ApiModelProperty("父菜单id") private Long parentId; @ApiModelProperty("显示顺序") private Integer orderNum; @ApiModelProperty("路由地址") private String path; @ApiModelProperty("组件路径") private String component; @ApiModelProperty("是否为外链（0是 1否）") private Integer isFrame; @ApiModelProperty("是否缓存（0缓存 1不缓存）") private Integer isCache; @ApiModelProperty("菜单类型（m目录 c菜单 f按钮）") private String menuType; @ApiModelProperty("菜单状态（0显示 1隐藏）") private Integer visible; @ApiModelProperty("菜单状态（0正常 1停用）") private Integer status; @ApiModelProperty("权限标识") private String perms; @ApiModelProperty("菜单图标") private String icon; @ApiModelProperty("创建者") private String createBy; @ApiModelProperty("创建时间") private Date createAt; @ApiModelProperty("更新者") private String updateBy; @ApiModelProperty("更新时间") private Date updateAt; @ApiModelProperty("备注") private String remark; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/HanyuPinyinHelper.java
New file @@ -0,0 +1,131 @@ package com.panzhihua.common.service; import net.sourceforge.pinyin4j.PinyinHelper; import net.sourceforge.pinyin4j.format.HanyuPinyinCaseType; import net.sourceforge.pinyin4j.format.HanyuPinyinOutputFormat; import net.sourceforge.pinyin4j.format.HanyuPinyinToneType; import net.sourceforge.pinyin4j.format.HanyuPinyinVCharType; import net.sourceforge.pinyin4j.format.exception.BadHanyuPinyinOutputFormatCombination; public class HanyuPinyinHelper { /** * 将文字转为汉语拼音 * @param chineselanguage 要转成拼音的中文 */ public String toHanyuPinyin(String ChineseLanguage){ char[] cl_chars = ChineseLanguage.trim().toCharArray(); String hanyupinyin = ""; HanyuPinyinOutputFormat defaultFormat = new HanyuPinyinOutputFormat(); defaultFormat.setCaseType(HanyuPinyinCaseType.LOWERCASE);// 输出拼音全部小写 defaultFormat.setToneType(HanyuPinyinToneType.WITHOUT_TONE);// 不带声调 defaultFormat.setVCharType(HanyuPinyinVCharType.WITH_V) ; try { for (int i=0; i<cl_chars.length; i++){ if (String.valueOf(cl_chars[i]).matches("[\u4e00-\u9fa5]+")){// 如果字符是中文,则将中文转为汉语拼音 hanyupinyin += PinyinHelper.toHanyuPinyinStringArray(cl_chars[i], defaultFormat)[0]; } else {// 如果字符不是中文,则不转换 hanyupinyin += cl_chars[i]; } } } catch (BadHanyuPinyinOutputFormatCombination e) { System.out.println("字符不能转成汉语拼音"); } return hanyupinyin; } public static String getFirstLettersUp(String ChineseLanguage){ return getFirstLetters(ChineseLanguage ,HanyuPinyinCaseType.UPPERCASE); } public static String getFirstLettersLo(String ChineseLanguage){ return getFirstLetters(ChineseLanguage ,HanyuPinyinCaseType.LOWERCASE); } public static String getFirstLetters(String ChineseLanguage,HanyuPinyinCaseType caseType) { char[] cl_chars = ChineseLanguage.trim().toCharArray(); String hanyupinyin = ""; HanyuPinyinOutputFormat defaultFormat = new HanyuPinyinOutputFormat(); defaultFormat.setCaseType(caseType);// 输出拼音全部大写 defaultFormat.setToneType(HanyuPinyinToneType.WITHOUT_TONE);// 不带声调 try { for (int i = 0; i < cl_chars.length; i++) { String str = String.valueOf(cl_chars[i]); if (str.matches("[\u4e00-\u9fa5]+")) {// 如果字符是中文,则将中文转为汉语拼音,并取第一个字母 hanyupinyin += PinyinHelper.toHanyuPinyinStringArray(cl_chars[i], defaultFormat)[0].substring(0, 1); } else if (str.matches("[0-9]+")) {// 如果字符是数字,取数字 hanyupinyin += cl_chars[i]; } else if (str.matches("[a-zA-Z]+")) {// 如果字符是字母,取字母 hanyupinyin += cl_chars[i]; } else {// 否则不转换 hanyupinyin += cl_chars[i];//如果是标点符号的话，带着 } } } catch (BadHanyuPinyinOutputFormatCombination e) { System.out.println("字符不能转成汉语拼音"); } return hanyupinyin; } public static String getPinyinString(String ChineseLanguage){ char[] cl_chars = ChineseLanguage.trim().toCharArray(); String hanyupinyin = ""; HanyuPinyinOutputFormat defaultFormat = new HanyuPinyinOutputFormat(); defaultFormat.setCaseType(HanyuPinyinCaseType.LOWERCASE);// 输出拼音全部大写 defaultFormat.setToneType(HanyuPinyinToneType.WITHOUT_TONE);// 不带声调 try { for (int i = 0; i < cl_chars.length; i++) { String str = String.valueOf(cl_chars[i]); if (str.matches("[\u4e00-\u9fa5]+")) {// 如果字符是中文,则将中文转为汉语拼音,并取第一个字母 hanyupinyin += PinyinHelper.toHanyuPinyinStringArray( cl_chars[i], defaultFormat)[0]; } else if (str.matches("[0-9]+")) {// 如果字符是数字,取数字 hanyupinyin += cl_chars[i]; } else if (str.matches("[a-zA-Z]+")) {// 如果字符是字母,取字母 hanyupinyin += cl_chars[i]; } else {// 否则不转换 } } } catch (BadHanyuPinyinOutputFormatCombination e) { System.out.println("字符不能转成汉语拼音"); } return hanyupinyin; } /** * 取第一个汉字的第一个字符 * @Title: getFirstLetter * @Description: TODO * @return String * @throws */ public static String getFirstLetter(String ChineseLanguage){ char[] cl_chars = ChineseLanguage.trim().toCharArray(); String hanyupinyin = ""; HanyuPinyinOutputFormat defaultFormat = new HanyuPinyinOutputFormat(); defaultFormat.setCaseType(HanyuPinyinCaseType.UPPERCASE);// 输出拼音全部大写 defaultFormat.setToneType(HanyuPinyinToneType.WITHOUT_TONE);// 不带声调 try { String str = String.valueOf(cl_chars[0]); if (str.matches("[\u4e00-\u9fa5]+")) {// 如果字符是中文,则将中文转为汉语拼音,并取第一个字母 hanyupinyin = PinyinHelper.toHanyuPinyinStringArray( cl_chars[0], defaultFormat)[0].substring(0, 1);; } else if (str.matches("[0-9]+")) {// 如果字符是数字,取数字 hanyupinyin += cl_chars[0]; } else if (str.matches("[a-zA-Z]+")) {// 如果字符是字母,取字母 hanyupinyin += cl_chars[0]; } else {// 否则不转换 } } catch (BadHanyuPinyinOutputFormatCombination e) { System.out.println("字符不能转成汉语拼音"); } return hanyupinyin; } public static void main(String[] args) { HanyuPinyinHelper hanyuPinyinHelper = new HanyuPinyinHelper() ; System.out.println(hanyuPinyinHelper.toHanyuPinyin("多发的发独守空房阿道夫打发第三方")); } } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
@@ -3,9 +3,7 @@ import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.MenuVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.user.ChangePasswordVO; import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO; import com.panzhihua.common.model.vos.user.UserPhoneVO; import com.panzhihua.common.model.vos.user.*; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -219,4 +217,60 @@ */ @PostMapping("putfamily") R putFamily(@RequestBody ComMngFamilyInfoVO comMngFamilyInfoVO); /** * 新增运营后台账户 * @param administratorsUserVO 账户信息 * @return 新增结果 */ @PostMapping("adduserbackstage") R addUserBackstage(@RequestBody AdministratorsUserVO administratorsUserVO); /** * 编辑运营后台账户 * @param administratorsUserVO 编辑账户内容 * @return 编辑结果 */ @PostMapping("putuserbackstage") R putUserBackstage(@RequestBody AdministratorsUserVO administratorsUserVO); /** * 删除后台用户 * @param administratorsUserVO 用户主键 * @return 删除结果 */ @PostMapping("deleteuserbackstage") R deleteUserBackstage(@RequestBody AdministratorsUserVO administratorsUserVO); /** * 角色下拉列表 * @param communityId 对应社区 0 表示运营后台 * @return 角色集合 */ @PostMapping("/role/listrolebackstage") R listRoleBackstage(@RequestParam("communityId") Long communityId); /** * 分页查询后台用户 * @param administratorsUserVO 查询参数 * @return 后台用户 */ @PostMapping("pageuserbackstage") R pageUserBackstage(@RequestBody AdministratorsUserVO administratorsUserVO); /** * 新增角色 * @param roleVO 角色信息 * @return 新增结果 */ @PostMapping("/role/addrolebackstage") R addRoleBackstage(@RequestBody RoleVO roleVO); /** * 删除角色 * @param roleVO 角色主键 * @return 删除结果 */ @PostMapping("/role/deleterolebackstage") R deleteRoleBackstage(@RequestBody RoleVO roleVO); } springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/community/ComMngStructHouseVO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/user/AdministratorsUserVO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/user/ChangePasswordVO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/user/RoleVO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/user/SysMenuVO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/service/HanyuPinyinHelper.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/service/impl/ComActActivityServiceImpl.java
@@ -87,10 +87,10 @@ Page page = new Page<>(); Long pageNum = comActActivityVO.getPageNum(); Long pageSize = comActActivityVO.getPageSize(); if (ObjectUtils.isEmpty(pageNum)||0==pageNum) { if (null==pageNum||0==pageNum) { pageNum = 1l; } if (ObjectUtils.isEmpty(pageSize)||0==pageSize) { if (null==pageSize||0==pageSize) { pageSize = 10l; } page.setSize(pageSize); @@ -181,10 +181,10 @@ Page page = new Page<>(); Long pageNum = comActActivityVO.getPageNum(); Long pageSize = comActActivityVO.getPageSize(); if (ObjectUtils.isEmpty(pageNum)||0==pageNum) { if (null==pageNum||0==pageNum) { pageNum = 1l; } if (ObjectUtils.isEmpty(pageSize)||0==pageSize) { if (null==pageSize||0==pageSize) { pageSize = 10l; } page.setSize(pageSize); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.java
@@ -42,10 +42,10 @@ Page page = new Page<>(); Long pageNum = comActDynVO.getPageNum(); Long pageSize = comActDynVO.getPageSize(); if (ObjectUtils.isEmpty(pageNum)||0==pageNum) { if (null==pageNum||0==pageNum) { pageNum = 1l; } if (ObjectUtils.isEmpty(pageSize)||0==pageSize) { if (null==pageSize||0==pageSize) { pageSize = 10l; } page.setSize(pageSize); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java
@@ -42,10 +42,10 @@ Page page = new Page<>(); Long pageNum = comActEasyPhotoVO.getPageNum(); Long pageSize = comActEasyPhotoVO.getPageSize(); if (ObjectUtils.isEmpty(pageNum)||0==pageNum) { if (null==pageNum||0==pageNum) { pageNum = 1l; } if (ObjectUtils.isEmpty(pageSize)||0==pageSize) { if (null==pageSize||0==pageSize) { pageSize = 10l; } page.setSize(pageSize); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java
@@ -43,10 +43,10 @@ Page page = new Page<>(); Long pageNum = comActMicroWishVO.getPageNum(); Long pageSize = comActMicroWishVO.getPageSize(); if (ObjectUtils.isEmpty(pageNum) || 0 == pageNum) { if (null==pageNum || 0 == pageNum) { pageNum = 1l; } if (ObjectUtils.isEmpty(pageSize) || 0 == pageSize) { if (null==pageSize || 0 == pageSize) { pageSize = 10l; } page.setSize(pageSize); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructAreaServiceImpl.java
@@ -69,10 +69,10 @@ Page page = new Page<>(); Long pageNum = comMngStructAreaVO.getPageNum(); Long pageSize = comMngStructAreaVO.getPageSize(); if (ObjectUtils.isEmpty(pageNum)||0==pageNum) { if (null==pageNum||0==pageNum) { pageNum = 1l; } if (ObjectUtils.isEmpty(pageSize)||0==pageSize) { if (null==pageSize||0==pageSize) { pageSize = 10l; } page.setSize(pageSize); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructHouseServiceImpl.java
@@ -419,11 +419,14 @@ @Override public R putVolunteerPhone(String parentCode) { List<ComMngStructHouseVO> comMngStructHouseVOS = new ArrayList<>(); ComMngStructHouseDO comMngStructHouseDO1 = comMngStructHouseDAO.selectOne(new QueryWrapper<ComMngStructHouseDO>().lambda().eq(ComMngStructHouseDO::getHouseCode, parentCode)); String houseName = comMngStructHouseDO1.getHouseName(); List<ComMngStructHouseDO> comMngStructHouseDOList = comMngStructHouseDAO.selectList(new QueryWrapper<ComMngStructHouseDO>().lambda().eq(ComMngStructHouseDO::getParentCode, parentCode)); if (!ObjectUtils.isEmpty(comMngStructHouseDOList)) { comMngStructHouseDOList.forEach(comMngStructHouseDO -> { ComMngStructHouseVO comMngStructHouseVO = new ComMngStructHouseVO(); BeanUtils.copyProperties(comMngStructHouseDO, comMngStructHouseVO); comMngStructHouseVO.setHouseShortName(comMngStructHouseVO.getHouseName().replaceAll(houseName,"")); comMngStructHouseVOS.add(comMngStructHouseVO); }); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructOtherBuildServiceImpl.java
@@ -78,10 +78,10 @@ Page page = new Page<>(); Long pageNum = comMngStructOtherBuildVO.getPageNum(); Long pageSize = comMngStructOtherBuildVO.getPageSize(); if (ObjectUtils.isEmpty(pageNum)||0==pageNum) { if (null==pageNum||0==pageNum) { pageNum = 1l; } if (ObjectUtils.isEmpty(pageSize)||0==pageSize) { if (null==pageSize||0==pageSize) { pageSize = 10l; } page.setSize(pageSize); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVolunteerMngServiceImpl.java
@@ -91,10 +91,10 @@ Page page = new Page<>(); Long pageNum = comMngVolunteerMngVO.getPageNum(); Long pageSize = comMngVolunteerMngVO.getPageSize(); if (ObjectUtils.isEmpty(pageNum)||0==pageNum) { if (null==pageNum||0==pageNum) { pageNum = 1l; } if (ObjectUtils.isEmpty(pageSize)||0==pageSize) { if (null==pageSize||0==pageSize) { pageSize = 10l; } page.setSize(pageSize); @@ -114,10 +114,10 @@ Page page = new Page<>(); Long pageNum = comMngVolunteerMngVO.getPageNum(); Long pageSize = comMngVolunteerMngVO.getPageSize(); if (ObjectUtils.isEmpty(pageNum)||0==pageNum) { if (null==pageNum||0==pageNum) { pageNum = 1l; } if (ObjectUtils.isEmpty(pageSize)||0==pageSize) { if (null==pageSize||0==pageSize) { pageSize = 10l; } page.setSize(pageSize); springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java
@@ -63,10 +63,10 @@ Page page = new Page<>(); Long pageNum = pageActivityMembersVO.getPageNum(); Long pageSize = pageActivityMembersVO.getPageSize(); if (ObjectUtils.isEmpty(pageNum)) { if (null==pageNum) { pageNum = 1l; } if (ObjectUtils.isEmpty(pageSize)) { if (null==pageSize) { pageSize = 10l; } page.setSize(pageSize); @@ -184,10 +184,10 @@ Page page = new Page<>(); Long pageNum = partyBuildingActivityVO.getPageNum(); Long pageSize = partyBuildingActivityVO.getPageSize(); if (ObjectUtils.isEmpty(pageNum)) { if (null==pageNum) { pageNum = 1l; } if (ObjectUtils.isEmpty(pageSize)) { if (null==pageSize) { pageSize = 10l; } page.setSize(pageSize); springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java
@@ -146,10 +146,10 @@ Page page=new Page<>(); Long pageNum = pagePartyOrganizationVO.getPageNum(); Long pageSize = pagePartyOrganizationVO.getPageSize(); if (ObjectUtils.isEmpty(pageNum)||0==pageNum) { if (null==pageNum||0==pageNum) { pageNum=1l; } if (ObjectUtils.isEmpty(pageSize)||0==pageSize) { if (null==pageSize||0==pageSize) { pageSize=10l; } page.setSize(pageSize); @@ -269,10 +269,10 @@ Page page=new Page<>(); Long pageNum = partyCommitteeVO.getPageNum(); Long pageSize = partyCommitteeVO.getPageSize(); if (ObjectUtils.isEmpty(pageNum)) { if (null==pageNum||0==pageNum) { pageNum=1l; } if (ObjectUtils.isEmpty(pageSize)) { if (null==pageSize||0==pageSize) { pageSize=10l; } page.setSize(pageSize); @@ -352,10 +352,10 @@ Page page=new Page<>(); Long pageNum = partyBuildingComPbDynVO.getPageNum(); Long pageSize = partyBuildingComPbDynVO.getPageSize(); if (ObjectUtils.isEmpty(pageNum)) { if (null==pageNum) { pageNum=1l; } if (ObjectUtils.isEmpty(pageSize)) { if (null==pageSize) { pageSize=10l; } page.setSize(pageSize); springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/RoleApi.java
@@ -2,11 +2,9 @@ import com.panzhihua.common.model.vos.MenuVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.user.RoleVO; import com.panzhihua.service_user.service.RoleService; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.List; @@ -51,4 +49,34 @@ public R listIdentity(@RequestParam("communityId")Integer communityId){ return roleService.listIdentity(communityId); } /** * 角色下拉列表 * @param communityId 对应社区 0 表示运营后台 * @return 角色集合 */ @PostMapping("listrolebackstage") public R listRoleBackstage(@RequestParam("communityId") Long communityId){ return roleService.listRoleBackstage(communityId); } /** * 新增角色 * @param roleVO 角色信息 * @return 新增结果 */ @PostMapping("addrolebackstage") public R addRoleBackstage(@RequestBody RoleVO roleVO){ return roleService.addRoleBackstage(roleVO); } /** * 删除角色 * @param roleVO 角色主键 * @return 删除结果 */ @PostMapping("deleterolebackstage") public R deleteRoleBackstage(@RequestBody RoleVO roleVO){ return roleService.deleteRoleBackstage(roleVO); } } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
@@ -2,6 +2,7 @@ import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.user.AdministratorsUserVO; import com.panzhihua.common.model.vos.user.ChangePasswordVO; import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO; import com.panzhihua.common.model.vos.user.UserPhoneVO; @@ -242,4 +243,44 @@ public R putFamily(@RequestBody ComMngFamilyInfoVO comMngFamilyInfoVO){ return userService.putFamily(comMngFamilyInfoVO); } /** * 新增运营后台账户 * @param administratorsUserVO 账户信息 * @return 新增结果 */ @PostMapping("adduserbackstage") public R addUserBackstage(@RequestBody AdministratorsUserVO administratorsUserVO){ return userService.addUserBackstage(administratorsUserVO); } /** * 编辑运营后台账户 * @param administratorsUserVO 编辑账户内容 * @return 编辑结果 */ @PostMapping("putuserbackstage") R putUserBackstage(@RequestBody AdministratorsUserVO administratorsUserVO){ return userService.putUserBackstage(administratorsUserVO); } /** * 删除后台用户 * @param administratorsUserVO 用户主键 * @return 删除结果 */ @PostMapping("deleteuserbackstage") public R deleteUserBackstage(@RequestBody AdministratorsUserVO administratorsUserVO){ return userService.deleteUserBackstage(administratorsUserVO); } /** * 分页查询后台用户 * @param administratorsUserVO 查询参数 * @return 后台用户 */ @PostMapping("pageuserbackstage") public R pageUserBackstage(@RequestBody AdministratorsUserVO administratorsUserVO){ return userService.pageUserBackstage(administratorsUserVO); } } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/SysMenuDAO.java
New file @@ -0,0 +1,15 @@ package com.panzhihua.service_user.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.panzhihua.service_user.model.dos.SysMenuDO; import org.apache.ibatis.annotations.Mapper; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 菜单 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2020-12-24 16:55 **/ @Mapper public interface SysMenuDAO extends BaseMapper<SysMenuDO> { } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserRoleDAO.java
New file @@ -0,0 +1,17 @@ package com.panzhihua.service_user.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.panzhihua.service_user.model.dos.SysUserRoleDO; import org.apache.ibatis.annotations.Mapper; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 用户角色关系 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2020-12-24 10:10 **/ @Mapper public interface SysUserRoleDAO extends BaseMapper<SysUserRoleDO> { } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.user.AdministratorsUserVO; import com.panzhihua.service_user.model.dos.SysUserDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -52,12 +53,13 @@ "and u.`name` = #{loginUserInfoVO.communityName} \n" + " </if> " + "<if test='loginUserInfoVO.phone != null and loginUserInfoVO.phone.trim() != ""'>" + "AND u.phone = #{loginUserInfoVO.phone}"+ "AND u.phone = #{loginUserInfoVO.phone}" + " </if> " + " </where>" + " order by u.face_state asc,u.create_at asc "+ " order by u.face_state asc,u.create_at asc " + "</script>") IPage<LoginUserInfoVO> pageUserFace(Page page, @Param("loginUserInfoVO") LoginUserInfoVO loginUserInfoVO); @Select("<script> " + "SELECT\n" + "u.user_id,\n" + @@ -81,9 +83,40 @@ " and u.`name` = #{loginUserInfoVO.name} \n" + " </if> " + "<if test='loginUserInfoVO.phone != null and loginUserInfoVO.phone.trim() != ""'>" + "AND u.phone = #{loginUserInfoVO.phone}"+ "AND u.phone = #{loginUserInfoVO.phone}" + " </if> " + " </where>" + "</script>") IPage<LoginUserInfoVO> pageUser(Page page, @Param("loginUserInfoVO")LoginUserInfoVO loginUserInfoVO); " </where>" + "</script>") IPage<LoginUserInfoVO> pageUser(Page page, @Param("loginUserInfoVO") LoginUserInfoVO loginUserInfoVO); @Select("<script> " + "SELECT\n" + "u.user_id,\n" + "u.account,\n" + "u.`name`,\n" + "u.phone,\n" + "e.role_name,\n" + "u.`status`,\n" + "u.create_at,\n" + "u.last_login_time \n" + "FROM\n" + "sys_user u\n" + "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}"+ " </if> " + " <where>" + "<if test='administratorsUserVO.communityId != null '>" + "AND u.community_id = #{administratorsUserVO.communityId} \n" + " </if> " + "<if test='administratorsUserVO.name != null and administratorsUserVO.name.trim() != ""'>" + "AND u.name = #{administratorsUserVO.name} \n" + " </if> " + "<if test='administratorsUserVO.account != null and administratorsUserVO.account.trim() != ""'>" + "AND u.account = #{administratorsUserVO.account}" + " </if> " + " </where>" + "</script>") IPage<AdministratorsUserVO> pageUserBackstage(Page page, @Param("administratorsUserVO") AdministratorsUserVO administratorsUserVO); } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysDeptDO.java
@@ -3,6 +3,8 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -13,7 +15,7 @@ * @author ruoyi */ @Data public class SysDeptDO public class SysDeptDO implements Serializable { private static final long serialVersionUID = 1L;
New file @@ -0,0 +1,110 @@ package com.panzhihua.service_user.model.dos; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.io.Serializable; import java.util.Date; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 菜单权限表 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2020-12-24 16:48 **/ @Data @TableName("sys_menu") public class SysMenuDO implements Serializable { private static final long serialVersionUID = 1L; /** * 菜单id */ private Long menuId; /** * 菜单名称 */ private String menuName; /** * 父菜单id */ private Long parentId; /** * 显示顺序 */ private Integer orderNum; /** * 路由地址 */ private String path; /** * 组件路径 */ private String component; /** * 是否为外链（0是 1否） */ private Integer isFrame; /** * 是否缓存（0缓存 1不缓存） */ private Integer isCache; /** * 菜单类型（m目录 c菜单 f按钮） */ private String menuType; /** * 菜单状态（0显示 1隐藏） */ private Integer visible; /** * 菜单状态（0正常 1停用） */ private Integer status; /** * 权限标识 */ private String perms; /** * 菜单图标 */ private String icon; /** * 创建者 */ private String createBy; /** * 创建时间 */ private Date createAt; /** * 更新者 */ private String updateBy; /** * 更新时间 */ private Date updateAt; /** * 备注 */ private String remark; } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysRoleDO.java
@@ -1,12 +1,10 @@ package com.panzhihua.service_user.model.dos; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import java.io.Serializable; import java.util.Date; @@ -17,7 +15,7 @@ */ @Data @TableName("sys_role") public class SysRoleDO public class SysRoleDO implements Serializable { private static final long serialVersionUID = 1L; @@ -60,27 +58,29 @@ /** * 角色状态（0正常 1停用） */ private String status; private Integer status; /** * 创建者 */ private String createBy; private Long createBy; /** * 创建时间 */ private Date createTime; @TableField(fill = FieldFill.INSERT) private Date createAt; /** * 更新者 */ private String updateBy; private Long updateBy; /** * 更新时间 */ private Date updateTime; @TableField(fill = FieldFill.INSERT_UPDATE) private Date updateAt; /** * 备注 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserDO.java
@@ -1,12 +1,10 @@ package com.panzhihua.service_user.model.dos; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import java.io.Serializable; import java.util.Date; import java.util.List; @@ -17,7 +15,7 @@ */ @Data @TableName("sys_user") public class SysUserDO public class SysUserDO implements Serializable { private static final long serialVersionUID = 1L; @@ -121,6 +119,7 @@ /** * 创建时间 */ @TableField(fill = FieldFill.INSERT) private Date createAt; /** @@ -155,7 +154,7 @@ /** * 小区id */ private long areaId; private Long areaId; } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserRoleDO.java
New file @@ -0,0 +1,26 @@ package com.panzhihua.service_user.model.dos; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.io.Serializable; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 用户角色关系 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2020-12-24 10:07 **/ @Data @TableName("sys_user_role") public class SysUserRoleDO implements Serializable { private static final long serialVersionUID = 1L; /** * 用户id */ private Long userId; /** * 角色id */ private Long roleId; } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/RoleService.java
@@ -2,6 +2,7 @@ import com.panzhihua.common.model.vos.MenuVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.user.RoleVO; import java.util.List; @@ -29,4 +30,24 @@ * @return 党委角色列表 */ R listIdentity(Integer communityId); /** * 角色下拉列表 * @param communityId 对应社区 0 表示运营后台 * @return 角色集合 */ R listRoleBackstage(Long communityId); /** * 新增角色 * @param roleVO 角色信息 * @return 新增结果 */ R addRoleBackstage(RoleVO roleVO); /** * 删除角色 * @param roleVO 角色主键 * @return 删除结果 */ R deleteRoleBackstage(RoleVO roleVO); } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
@@ -2,6 +2,7 @@ import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.user.AdministratorsUserVO; import com.panzhihua.common.model.vos.user.ChangePasswordVO; import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO; import com.panzhihua.common.model.vos.user.UserPhoneVO; @@ -150,4 +151,29 @@ * @return 编辑结果 */ R putFamily(ComMngFamilyInfoVO comMngFamilyInfoVO); /** * 新增运营后台账户 * @param administratorsUserVO 账户信息 * @return 新增结果 */ R addUserBackstage(AdministratorsUserVO administratorsUserVO); /** * 编辑运营后台账户 * @param administratorsUserVO 编辑账户内容 * @return 编辑结果 */ R putUserBackstage(AdministratorsUserVO administratorsUserVO); /** * 删除后台用户 * @param administratorsUserVO 用户主键 * @return 删除结果 */ R deleteUserBackstage(AdministratorsUserVO administratorsUserVO); /** * 分页查询后台用户 * @param administratorsUserVO 查询参数 * @return 后台用户 */ R pageUserBackstage(AdministratorsUserVO administratorsUserVO); } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/RoleServiceImpl.java
@@ -5,8 +5,11 @@ import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.user.RoleVO; import com.panzhihua.service_user.dao.RoleDAO; import com.panzhihua.service_user.dao.SysUserRoleDAO; import com.panzhihua.service_user.model.dos.SysRoleDO; import com.panzhihua.service_user.model.dos.SysUserRoleDO; import com.panzhihua.service_user.service.RoleService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; @@ -21,10 +24,13 @@ * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2020-11-25 15:59 **/ @Slf4j @Service public class RoleServiceImpl implements RoleService { @Resource private RoleDAO roleDAO; @Resource private SysUserRoleDAO sysUserRoleDAO; /** * 获取平台所有的菜单按钮权限 * @@ -67,4 +73,70 @@ } return R.ok(roleVOS); } /** * 角色下拉列表 * * @param communityId 对应社区 0 表示运营后台 * @return 角色集合 */ @Override public R listRoleBackstage(Long communityId) { List<SysRoleDO> sysRoleDOS = roleDAO.selectList(new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getCommunityId, communityId)); if (ObjectUtils.isEmpty(sysRoleDOS)) { return R.fail("角色列表为空"); } List<RoleVO>roleVOS=new ArrayList<>(); sysRoleDOS.forEach(sysRoleDO -> { RoleVO roleVO=new RoleVO(); BeanUtils.copyProperties(sysRoleDO,roleVO); roleVOS.add(roleVO); }); return R.ok(roleVOS); } /** * 新增角色 * * @param roleVO 角色信息 * @return 新增结果 */ @Override public R addRoleBackstage(RoleVO roleVO) { SysRoleDO sysRoleDO=new SysRoleDO(); BeanUtils.copyProperties(roleVO,sysRoleDO); int insert = 0; try { insert = roleDAO.insert(sysRoleDO); } catch (Exception e) { e.printStackTrace(); log.error("新增角色失败，失败原因【{}】",e.getMessage()); if (e.getMessage().contains("unique_role_name_community_id")) { return R.fail("角色已经存在"); } } if (insert>0) { return R.ok(); } return R.fail(); } /** * 删除角色 * * @param roleVO 角色主键 * @return 删除结果 */ @Override public R deleteRoleBackstage(RoleVO roleVO) { Integer integer = sysUserRoleDAO.selectCount(new QueryWrapper<SysUserRoleDO>().lambda().eq(SysUserRoleDO::getRoleId, roleVO.getRoleId())); if (integer>0) { return R.fail("该角色的关联用户数量不为0，不能删除"); } int delete = roleDAO.deleteById(roleVO.getRoleId()); if (delete==0) { return R.fail("角色不存在"); } return R.ok(); } } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -10,23 +10,21 @@ import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.partybuilding.ActivityManagerVO; import com.panzhihua.common.model.vos.partybuilding.PageActivityMembersVO; import com.panzhihua.common.model.vos.user.AdministratorsUserVO; import com.panzhihua.common.model.vos.user.ChangePasswordVO; import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO; import com.panzhihua.common.model.vos.user.UserPhoneVO; import com.panzhihua.service_user.dao.ComMngFamilyInfoDAO; import com.panzhihua.service_user.dao.ComMngUserTagDAO; import com.panzhihua.service_user.dao.RoleDAO; import com.panzhihua.service_user.dao.UserDao; import com.panzhihua.service_user.model.dos.ComMngFamilyInfoDO; import com.panzhihua.service_user.model.dos.ComMngUserTagDO; import com.panzhihua.service_user.model.dos.SysRoleDO; import com.panzhihua.service_user.model.dos.SysUserDO; import com.panzhihua.service_user.dao.*; import com.panzhihua.service_user.model.dos.*; import com.panzhihua.service_user.service.UserService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.core.ValueOperations; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.ObjectUtils; import org.springframework.util.StringUtils; @@ -40,6 +38,7 @@ * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2020-11-24 09:13 **/ @Slf4j @Service public class UserServiceImpl implements UserService { @Resource @@ -52,6 +51,8 @@ private ComMngFamilyInfoDAO comMngFamilyInfoDAO; @Resource private StringRedisTemplate stringRedisTemplate; @Resource private SysUserRoleDAO sysUserRoleDAO; /** @@ -261,10 +262,10 @@ Page page = new Page<>(); Long pageNum = loginUserInfoVO.getPageNum(); Long pageSize = loginUserInfoVO.getPageSize(); if (ObjectUtils.isEmpty(pageNum)||0==pageNum) { if (null==pageNum||0==pageNum) { pageNum = 1l; } if (ObjectUtils.isEmpty(pageSize)||0==pageSize) { if (null==pageSize||0==pageSize) { pageSize = 10l; } page.setSize(pageSize); @@ -320,10 +321,10 @@ Page page = new Page<>(); Long pageNum = loginUserInfoVO.getPageNum(); Long pageSize = loginUserInfoVO.getPageSize(); if (ObjectUtils.isEmpty(pageNum)||0==pageNum) { if (null==pageNum||0==pageNum) { pageNum = 1l; } if (ObjectUtils.isEmpty(pageSize)||0==pageSize) { if (null==pageSize||0==pageSize) { pageSize = 10l; } page.setSize(pageSize); @@ -605,6 +606,144 @@ return R.fail(); } /** * 新增运营后台账户 * * @param administratorsUserVO 账户信息 * @return 新增结果 */ @Override @Transactional(rollbackFor = Exception.class) public R addUserBackstage(AdministratorsUserVO administratorsUserVO) { SysUserDO sysUserDO=new SysUserDO(); SysRoleDO roleDO = roleDAO.selectById(administratorsUserVO.getRoleId()); if (ObjectUtils.isEmpty(roleDO)) { return R.fail("角色不存在"); } String encode = new BCryptPasswordEncoder().encode(administratorsUserVO.getPassword()); administratorsUserVO.setPassword(encode); BeanUtils.copyProperties(administratorsUserVO,sysUserDO); int insert = 0; try { insert = userDao.insert(sysUserDO); } catch (Exception e) { e.printStackTrace(); log.error("新增后台用户报错【{}】",e.getMessage()); if (e.getMessage().contains("union_phone_type")) { return R.fail("手机号已经存在"); } } if (insert>0) { SysUserDO sysUserDO1 = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getType, administratorsUserVO.getType()).eq(SysUserDO::getPhone, administratorsUserVO.getPhone())); Long userId = sysUserDO1.getUserId(); SysUserRoleDO sysUserRoleDO=new SysUserRoleDO(); sysUserRoleDO.setUserId(userId); sysUserRoleDO.setRoleId(roleDO.getRoleId()); int insert1 = sysUserRoleDAO.insert(sysUserRoleDO); if (insert1>0) { return R.ok(); } } return R.fail(); } /** * 编辑运营后台账户 * * @param administratorsUserVO 编辑账户内容 * @return 编辑结果 */ @Override public R putUserBackstage(AdministratorsUserVO administratorsUserVO) { SysUserDO sysUserDO=new SysUserDO(); Long roleId = administratorsUserVO.getRoleId(); SysRoleDO roleDO=null; if (null!=roleId&&0!=roleId) { roleDO = roleDAO.selectById(roleId); if (ObjectUtils.isEmpty(roleDO)) { return R.fail("角色不存在"); } } String password = administratorsUserVO.getPassword(); if (!ObjectUtils.isEmpty(password)) { String encode = new BCryptPasswordEncoder().encode(password); administratorsUserVO.setPassword(encode); } BeanUtils.copyProperties(administratorsUserVO,sysUserDO); int update=0; try { update = userDao.updateById(sysUserDO); } catch (Exception e) { e.printStackTrace(); log.error("编辑后台用户出错【{}】",e.getMessage()); if (e.getMessage().contains("union_phone_type")) { return R.fail("手机号已经存在"); } } if (update>0&&null!=roleDO) { SysUserRoleDO sysUserRoleDO=new SysUserRoleDO(); sysUserRoleDO.setRoleId(roleDO.getRoleId()); int update1 = sysUserRoleDAO.update(sysUserRoleDO,new UpdateWrapper<SysUserRoleDO>().lambda().eq(SysUserRoleDO::getUserId,administratorsUserVO.getUserId())); if (update1>0) { return R.ok(); } } return R.ok(); } /** * 删除后台用户 * * @param administratorsUserVO 用户主键 * @return 删除结果 */ @Override @Transactional(rollbackFor = Exception.class) public R deleteUserBackstage(AdministratorsUserVO administratorsUserVO) { Long userId = administratorsUserVO.getUserId(); SysUserDO sysUserDO = userDao.selectById(userId); if (ObjectUtils.isEmpty(sysUserDO)) { return R.fail("用户不存在"); } Integer type = sysUserDO.getType(); if (type.intValue()!=2) { return R.fail("用户废运营平台用户"); } //删除用户 int delete = userDao.deleteById(userId); //删除用户角色关系 if (delete>0) { int delete1 = sysUserRoleDAO.delete(new QueryWrapper<SysUserRoleDO>().lambda().eq(SysUserRoleDO::getUserId, userId)); if (delete1==0) { return R.fail("用户没有角色关系"); } } return R.ok(); } /** * 分页查询后台用户 * * @param administratorsUserVO 查询参数 * @return 后台用户 */ @Override public R pageUserBackstage(AdministratorsUserVO administratorsUserVO) { Page page = new Page<>(); Long pageNum = administratorsUserVO.getPageNum(); Long pageSize = administratorsUserVO.getPageSize(); if (null==pageNum||pageNum==0) { pageNum = 1l; } if (null==pageSize||pageSize==0) { pageSize = 10l; } page.setSize(pageSize); page.setCurrent(pageNum); IPage<AdministratorsUserVO> iPage = userDao.pageUserBackstage(page, administratorsUserVO); return R.ok(iPage); } public static void main(String[] args) { String encode = new BCryptPasswordEncoder().encode("123456"); System.out.println(encode); springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/bootstrap.yml
@@ -6,9 +6,9 @@ discovery: enabled: true service-id: config # 注册中心的服务名 profile: test # 指定配置文件的环境 profile: dev # 指定配置文件的环境 profiles: active: test active: dev eureka: client:
