springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml
@@ -23,7 +23,61 @@ </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 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$/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/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/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/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_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/resources/bootstrap.yml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java" afterDir="false" /> </list> <option name="SHOW_DIALOG" value="false" /> <option name="HIGHLIGHT_CONFLICTS" value="true" /> @@ -63,7 +117,6 @@ <option name="hideEmptyMiddlePackages" value="true" /> <option name="showExcludedFiles" value="false" /> <option name="showLibraryContents" value="true" /> <option name="showMembers" value="true" /> <option name="showVisibilityIcons" value="true" /> </component> <component name="PropertiesComponent"> @@ -89,11 +142,11 @@ </component> <component name="RecentsManager"> <key name="CopyClassDialog.RECENTS_KEY"> <recent name="com.panzhihua.community_backstage.exception" /> <recent name="com.panzhihua.service_dangjian.config" /> <recent name="com.panzhihua.service_community.config" /> <recent name="com.panzhihua.applets.api" /> <recent name="com.panzhihua.applets.config" /> <recent name="com.panzhihua.zuul.config" /> </key> <key name="CopyFile.RECENT_KEYS"> <recent name="F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\service_user\src\main\java\com\panzhihua\service_user" /> @@ -110,7 +163,7 @@ </set> </option> </component> <component name="RunManager" selected="Application.BaseController"> <component name="RunManager" selected="Application.UserApi"> <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" /> @@ -163,12 +216,12 @@ <option name="Make" enabled="true" /> </method> </configuration> <configuration name="SFTPUtil" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true"> <option name="MAIN_CLASS_NAME" value="com.panzhihua.common.utlis.SFTPUtil" /> <module name="common" /> <configuration name="UserApi" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true"> <option name="MAIN_CLASS_NAME" value="com.panzhihua.applets.api.UserApi" /> <module name="applets" /> <extension name="coverage"> <pattern> <option name="PATTERN" value="com.panzhihua.common.utlis.*" /> <option name="PATTERN" value="com.panzhihua.applets.api.*" /> <option name="ENABLED" value="true" /> </pattern> </extension> @@ -260,7 +313,6 @@ </method> </configuration> <list> <item itemvalue="Application.SFTPUtil" /> <item itemvalue="Application.AESUtils" /> <item itemvalue="Application.AES" /> <item itemvalue="Application.CommonApi" /> @@ -275,14 +327,15 @@ <item itemvalue="Spring Boot.ZuulApplication" /> <item itemvalue="Spring Boot.ServiceCommunityApplication" /> <item itemvalue="Application.BaseController" /> <item itemvalue="Application.UserApi" /> </list> <recent_temporary> <list> <item itemvalue="Application.UserApi" /> <item itemvalue="Application.BaseController" /> <item itemvalue="Application.CommonApi" /> <item itemvalue="Application.AES" /> <item itemvalue="Application.AESUtils" /> <item itemvalue="Application.SFTPUtil" /> </list> </recent_temporary> </component> @@ -373,7 +426,7 @@ <workItem from="1608371107059" duration="646000" /> <workItem from="1608371917868" duration="79000" /> <workItem from="1608379508016" duration="46000" /> <workItem from="1608531425658" duration="46248000" /> <workItem from="1608531425658" duration="73725000" /> </task> <servers /> </component> @@ -397,10 +450,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="1608270254259"> <state x="574" y="118" key="#com.intellij.ide.util.MemberChooser" timestamp="1608716210609"> <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="1608270254259" /> <state x="574" y="118" key="#com.intellij.ide.util.MemberChooser/0.0.1536.824@0.0.1536.824" timestamp="1608716210609" /> <state x="405" y="335" key="#com.intellij.refactoring.move.MoveHandler.SelectRefactoringDialog" timestamp="1606099594079"> <screen x="0" y="0" width="1536" height="824" /> </state> @@ -413,10 +466,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="1608624568355"> <state width="561" height="466" key="DebuggerActiveHint" timestamp="1608709007773"> <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="1608624568355" /> <state width="561" height="466" key="DebuggerActiveHint/0.0.1536.824@0.0.1536.824" timestamp="1608709007773" /> <state x="93" y="93" width="1350" height="638" key="DiffContextDialog" timestamp="1608535183408"> <screen x="0" y="0" width="1536" height="824" /> </state> @@ -425,54 +478,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="342" key="GridCell.Tab.0.bottom" timestamp="1608635825215"> <state width="1031" height="313" key="GridCell.Tab.0.bottom" timestamp="1608714089778"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="342" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1608635825215" /> <state width="1031" height="342" key="GridCell.Tab.0.center" timestamp="1608635825215"> <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"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="342" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1608635825215" /> <state width="1031" height="342" key="GridCell.Tab.0.left" timestamp="1608635825214"> <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"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="342" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1608635825214" /> <state width="1031" height="342" key="GridCell.Tab.0.right" timestamp="1608635825215"> <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"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="342" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1608635825215" /> <state width="1031" height="342" key="GridCell.Tab.1.bottom" timestamp="1608635825215"> <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"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="342" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1608635825215" /> <state width="1031" height="342" key="GridCell.Tab.1.center" timestamp="1608635825215"> <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"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="342" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1608635825215" /> <state width="1031" height="342" key="GridCell.Tab.1.left" timestamp="1608635825215"> <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"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="342" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1608635825215" /> <state width="1031" height="342" key="GridCell.Tab.1.right" timestamp="1608635825215"> <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"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="342" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1608635825215" /> <state width="1031" height="342" key="GridCell.Tab.2.bottom" timestamp="1608635825215"> <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"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="342" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1608635825215" /> <state width="1031" height="342" key="GridCell.Tab.2.center" timestamp="1608635825215"> <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"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="342" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1608635825215" /> <state width="1031" height="342" key="GridCell.Tab.2.left" timestamp="1608635825215"> <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"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="342" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1608635825215" /> <state width="1031" height="342" key="GridCell.Tab.2.right" timestamp="1608635825215"> <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"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="342" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1608635825215" /> <state width="1031" height="313" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1608714089778" /> <state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1606714311663"> <screen x="0" y="0" width="1536" height="824" /> </state> springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
@@ -63,7 +63,7 @@ @ApiOperation(value = "报名/取消报名社区活动") @PutMapping("signactivity") public R signActivity(@RequestBody SignactivityVO signactivityVO){ public R signActivity(@RequestBody @Validated(AddGroup.class) SignactivityVO signactivityVO){ Long userId = this.getUserId(); signactivityVO.setUserId(userId); return communityService.signActivity(signactivityVO); springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/LoginApi.java
@@ -17,9 +17,12 @@ import com.panzhihua.common.exceptions.WeiXinException; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.validated.AddGroup; import com.panzhihua.common.validated.PutGroup; import io.swagger.annotations.*; import lombok.extern.slf4j.Slf4j; import org.springframework.util.ObjectUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -142,23 +145,22 @@ } @ApiOperation(value = "查询社区") @GetMapping("listcommunity") @PostMapping("listcommunity") public R listCommunity(@RequestBody ComActVO comActVO){ return communityService.listCommunity(comActVO); } @ApiOperation(value = "查询小区") @GetMapping("listarea") @ApiImplicitParam(name ="communityId",value = "社区id",required = true) public R listArea(@RequestParam("communityId") Long communityId){ return communityService.listArea(communityId); } @ApiOperation(value = "用户绑定社区、小区") @PutMapping("putusercommunityarea") public R putUserCommunityArea(@RequestBody LoginUserInfoVO loginUserInfoVO){ public R putUserCommunityArea(@RequestBody @Validated(PutGroup.class) LoginUserInfoVO loginUserInfoVO){ Long userId = this.getUserId(); Long communityId = loginUserInfoVO.getCommunityId(); Long areaId = loginUserInfoVO.getAreaId(); if (null==communityId||0==communityId) { return R.fail("社区未选择"); } if (null==areaId||0==areaId) { return R.fail("小区未选择"); } loginUserInfoVO.setUserId(userId); return userService.putUserCommunityArea(loginUserInfoVO); } springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
@@ -1,10 +1,14 @@ package com.panzhihua.applets.api; import com.alibaba.fastjson.JSONArray; import com.panzhihua.common.model.vos.community.ComActActivityVO; import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO; import com.panzhihua.common.model.vos.community.ComActMicroWishVO; import com.panzhihua.common.model.vos.community.ComMngStructHouseVO; import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO; import com.panzhihua.common.model.vos.user.UserPhoneVO; import com.panzhihua.common.service.community.CommunityService; import com.panzhihua.common.service.partybuilding.PartyBuildingService; import com.panzhihua.common.service.user.UserService; import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.exceptions.UnAuthenticationException; @@ -19,7 +23,11 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.ArrayList; import java.util.Comparator; import java.util.Date; import java.util.List; import java.util.stream.Collectors; /** * @program: springcloud_k8s_panzhihuazhihuishequ @@ -35,6 +43,8 @@ private UserService userService; @Resource private CommunityService communityService; @Resource private PartyBuildingService partyBuildingService; @ApiOperation(value = "当前登录用户信息", response = LoginUserInfoVO.class) @GetMapping("info") @@ -60,7 +70,7 @@ @ApiOperation(value = "用户实名认证") @PutMapping("putuserauthentication") public R putUserAuthentication(@RequestBody LoginUserInfoVO loginUserInfoVO) { public R putUserAuthentication(@RequestBody @Validated(AddGroup.class) LoginUserInfoVO loginUserInfoVO) { Long userId = this.getUserId(); loginUserInfoVO.setUserId(userId); return userService.putUserAuthentication(loginUserInfoVO); @@ -135,4 +145,71 @@ comMngFamilyInfoVO.setUserId(this.getUserId()); return userService.putFamily(comMngFamilyInfoVO); } @ApiOperation(value = "我的活动",response =ComActActivityVO.class ) @GetMapping("listactivity") public R listActivity() { Long userId = this.getUserId(); List<ComActActivityVO> comActActivityVOS=new ArrayList<>(); R r=communityService.listActivity(userId); if (R.isOk(r)) { comActActivityVOS =(List<ComActActivityVO>) r.getData(); } R r1=partyBuildingService.listActivity(userId); if (R.isOk(r1)) { List<ComActActivityVO> data = (List<ComActActivityVO>) r1.getData(); comActActivityVOS.addAll(data); } if (!ObjectUtils.isEmpty(comActActivityVOS)) { String s = JSONArray.toJSONString(comActActivityVOS); List<ComActActivityVO>comActActivityVOS1=new ArrayList<>(); comActActivityVOS1=JSONArray.parseArray(s,ComActActivityVO.class); List<ComActActivityVO> collect = comActActivityVOS1.stream().sorted(Comparator.comparing(ComActActivityVO::getBeginAt).reversed()).collect(Collectors.toList()); comActActivityVOS=collect; } return R.ok(comActActivityVOS); } @ApiOperation(value = "分页查询我的随手拍",response = ComActEasyPhotoVO.class ) @PostMapping("pageeasyphoto") public R pageEasyPhoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) { Long userId = this.getUserId(); comActEasyPhotoVO.setUserId(userId); comActEasyPhotoVO.setCommunityId(null); return communityService.pageEasyPhoto(comActEasyPhotoVO); } @ApiOperation(value = "分页查询我的微心愿",response = ComActMicroWishVO.class ) @PostMapping("pagemicrowish") public R pageMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO) { Long userId = this.getUserId(); comActMicroWishVO.setUserId(userId); comActMicroWishVO.setCommunityId(null); return communityService.pageMicroWish(comActMicroWishVO); } @ApiOperation(value = "用户确认心愿" ) @PutMapping("microwishconfirm") public R putMicroWishConfirm(@RequestBody ComActMicroWishVO comActMicroWishVO) { Long userId = this.getUserId(); comActMicroWishVO.setUserId(userId); comActMicroWishVO.setCommunityId(null); Long id = comActMicroWishVO.getId(); if (null==id||0==id) { return R.fail("心愿主键不能为空"); } String evaluate = comActMicroWishVO.getEvaluate(); if (ObjectUtils.isEmpty(evaluate)) { return R.fail("用户评价不能为空"); } Integer score = comActMicroWishVO.getScore(); if (null==score||0==score) { return R.fail("评分不能为空"); } comActMicroWishVO.setEvaluateAt(new Date()); comActMicroWishVO.setStatus(6); return communityService.putMicroWishConfirm(comActMicroWishVO); } } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/controller/BaseController.java
@@ -84,11 +84,11 @@ if (empty) { throw new UnAuthenticationException("获取登录人信息失败"); } log.info("userInfo【{}】",userInfo); // log.info("userInfo【{}】",userInfo); byte[] bytes = AES.parseHexStr2Byte(userInfo); log.info("bytes【{}】",bytes); // log.info("bytes【{}】",bytes); byte[] decrypt = AES.decrypt(bytes, Constants.AES_KEY); log.info("decrypt【{}】",decrypt); // log.info("decrypt【{}】",decrypt); userInfo=new String(decrypt); LoginUserInfoVO loginUserInfoVO= JSONObject.parseObject(userInfo,LoginUserInfoVO.class); return loginUserInfoVO; springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java
@@ -2,10 +2,15 @@ import com.panzhihua.common.model.vos.community.ComMngStructHouseVO; import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO; import com.panzhihua.common.validated.AddGroup; 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.NotBlank; import javax.validation.constraints.NotNull; import java.util.Date; import java.util.List; import java.util.Set; @@ -45,27 +50,33 @@ private String nickName; @ApiModelProperty("真实名字") @NotBlank(groups = {AddGroup.class},message = "真实名字不能为空") private String name; @ApiModelProperty("社区id") @Min(value = 1,groups = {PutGroup.class},message = "社区id不能为空") @NotNull(groups = {PutGroup.class},message = "社区id不能为空") private Long communityId; @ApiModelProperty("社区名字") private String communityName; @ApiModelProperty("性别 1 男 2 女") @Min(value = 1,groups = {AddGroup.class},message = "性别不能为空") private Integer sex; @ApiModelProperty("生日") @NotNull(groups = {AddGroup.class},message = "生日不能为空") private Date birthday; @ApiModelProperty("头像") private String imageUrl; @ApiModelProperty("用户类型 1 小程序 2 运营平台 3 社区平台") @ApiModelProperty(value = "用户类型 1 小程序 2 运营平台 3 社区平台") private Integer type; @ApiModelProperty("职业") @NotBlank(groups = {AddGroup.class},message = "职业不能为空") private String job; @ApiModelProperty("是否志愿者 0否 1 是") @@ -96,6 +107,7 @@ private String rejectReson; @ApiModelProperty("身份证号") @NotBlank(groups = {AddGroup.class},message = "身份证号不能为空") private String idCard; @ApiModelProperty("标签 多个用,隔开") @@ -123,6 +135,8 @@ private List<ComMngStructHouseVO> comMngStructHouseVOS; @ApiModelProperty("用户小区id") @Min(value = 1,groups = {PutGroup.class},message = "用户小区id不能为空") @NotNull(groups = {PutGroup.class},message = "用户小区id不能为空") private Long areaId;
@@ -116,5 +116,8 @@ @ApiModelProperty("活动参加人员集合") private List<ActivitySignVO>activitySignVOList; @ApiModelProperty("活动类型 1 支援者活动 2 普通社区活动 3 党建活动") private Integer type; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java
@@ -100,4 +100,10 @@ @ApiModelProperty("操作类型 1审核通过 2驳回 3反馈") private Integer type; @ApiModelProperty(value = "登录用户id",hidden = true) private Long userId; @ApiModelProperty("反馈时间") private Date feedbackAt; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishVO.java
@@ -127,5 +127,8 @@ @ApiModelProperty(value = "是否点赞 1 是 0 不是",example = "1") private Integer haveGiveThumbsUp; @ApiModelProperty(value = "登录用户",hidden = true) private Long userId; }
@@ -1,10 +1,12 @@ package com.panzhihua.common.model.vos.community; import com.panzhihua.common.validated.AddGroup; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.omg.PortableInterceptor.INACTIVE; import javax.validation.constraints.NotBlank; import java.util.Date; /** @@ -21,12 +23,14 @@ private Long id; @ApiModelProperty("社区id") private String communityId; private Long communityId; @ApiModelProperty("小区名称") @NotBlank(groups = {AddGroup.class},message = "小区名称不能为空") private String areaName; @ApiModelProperty("地址详情") @NotBlank(groups = {AddGroup.class},message = "地址详情不能为空") private String addressDetail; @ApiModelProperty("创建时间") springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructHouseVO.java
@@ -53,7 +53,7 @@ @ApiModelProperty("房屋状态 1 自主 2 租住 3 商用") @Min(value = 1,groups = {AddGroup.class},message = "房屋状态不能为空") private Integer states; private Integer state; @ApiModelProperty("身份 1租户 2房主") @Min(value = 1,groups = {AddGroup.class},message = "身份不能为空") @@ -65,4 +65,7 @@ @ApiModelProperty(value = "小区地址id",hidden = true) private Long areaId; @ApiModelProperty(value = "小区地址编码",hidden = true) private String areaCode; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/SignactivityVO.java
@@ -1,8 +1,12 @@ package com.panzhihua.common.model.vos.community; 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.NotNull; /** * @program: springcloud_k8s_panzhihuazhihuishequ @@ -15,10 +19,13 @@ public class SignactivityVO { @ApiModelProperty(value = "类型 1 报名 2 取消报名",example = "1",required = true) @Min(value = 1,groups ={AddGroup.class} ,message = "操作类型不能为空") private Integer type; @ApiModelProperty(value = "是否志愿者 0 否 1 是",example = "1",required = true) @ApiModelProperty(value = "以什么身份报名活动 1 志愿者 0 普通居民",example = "1",required = true) @Min(value = 0,groups ={AddGroup.class},message = "报名身份不能为空") private Integer isVolunteer; @ApiModelProperty(value = "活动主键",required = true) @Min(value = 1,groups = {AddGroup.class},message = "活动主键不能为空") private Long activityId; @ApiModelProperty(value = "当前登录用户id",hidden = true) private Long userId; springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngFamilyInfoVO.java
@@ -47,11 +47,9 @@ private Integer age; @ApiModelProperty("健康状况") @NotBlank(groups = {AddGroup.class},message ="健康状况不能为空" ) private String health; @ApiModelProperty("工作") @NotBlank(groups = {AddGroup.class},message ="工作不能为空" ) private String job; @ApiModelProperty(value = "create_at",hidden = true) springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -8,6 +8,8 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; import java.util.List; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 社区 @@ -443,4 +445,28 @@ */ @PostMapping("addhouses") R addHouses(@RequestBody ComMngStructHouseVO comMngStructHouseVO); /** * 查询小区 * @param communityId 社区id * @return 小区集合 */ @PostMapping("listarea") R<List<ComActActivityVO>> listArea(@RequestParam("communityId")Long communityId); /** * 用户参加的所有社区活动 * @param userId 用户id * @return 活动列表 */ @PostMapping("listactivity") R listActivity(@RequestParam("userId")Long userId ); /** * 用户确认心愿 * @param comActMicroWishVO 用户评价 * @return 确认结果 */ @PostMapping("putmicrowishconfirm") R putMicroWishConfirm(@RequestBody ComActMicroWishVO comActMicroWishVO); } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java
@@ -1,6 +1,7 @@ package com.panzhihua.common.service.partybuilding; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComActActivityVO; import com.panzhihua.common.model.vos.partybuilding.*; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; @@ -226,4 +227,12 @@ */ @PostMapping("/partybuildIng/cancelactivity") R cancelActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO); /** * 用户的所有党建活动 * @param userId 用户id * @return 党建活动列表 */ @PostMapping("/partybuildIng/listactivity") R listActivity(@RequestParam("userId") Long userId); } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
@@ -194,7 +194,7 @@ * @return 修改结果 */ @PostMapping("putuser") R putUser(LoginUserInfoVO loginUserInfoVO); R putUser(@RequestBody LoginUserInfoVO loginUserInfoVO); /** * 家庭成员列表 @@ -210,7 +210,7 @@ * @return 增加结果 */ @PostMapping("addFamily") R addFamily(ComMngFamilyInfoVO comMngFamilyInfoVO); R addFamily(@RequestBody ComMngFamilyInfoVO comMngFamilyInfoVO); /** * 编辑家庭成员 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/validated/PutGroup.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-23 15:02 **/ public interface PutGroup { } springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/controller/BaseController.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/LoginUserInfoVO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/community/ComActActivityVO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/community/ComActMicroWishVO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/community/ComMngStructAreaVO.classBinary files differ
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/community/SignactivityVO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/user/ComMngFamilyInfoVO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/service/community/CommunityService.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/service/partybuilding/PartyBuildingService.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/service/user/UserService.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/validated/PutGroup.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/common-1.0-SNAPSHOT.jarBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/maven-archiver/pom.properties
@@ -1,5 +1,5 @@ #Generated by Maven #Tue Dec 22 17:24:40 CST 2020 #Wed Dec 23 16:25:59 CST 2020 version=1.0-SNAPSHOT groupId=com.panzhihua artifactId=common springcloud_k8s_panzhihuazhihuishequ/common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
New file @@ -0,0 +1,75 @@ com\panzhihua\common\exceptions\PartyBuildingMemberException.class com\panzhihua\common\model\vos\community\ComActDynVO.class com\panzhihua\common\controller\BaseController.class com\panzhihua\common\model\vos\user\ComMngFamilyInfoVO.class com\panzhihua\common\utlis\HttpUtils$TrustAnyHostnameVerifier.class com\panzhihua\common\model\vos\partybuilding\PartyBuildingMemberExcelVO.class com\panzhihua\common\utlis\SpringUtils.class com\panzhihua\common\model\vos\partybuilding\PartyBuildingMemberVO.class com\panzhihua\common\model\vos\user\RoleVO.class com\panzhihua\common\utlis\HTMLFilter.class com\panzhihua\common\utlis\EscapeUtil.class com\panzhihua\common\model\vos\community\ActivitySignVO.class com\panzhihua\common\model\vos\community\ComActActPrizeVO.class com\panzhihua\common\utlis\LogUtils.class com\panzhihua\common\model\vos\user\ChangePasswordVO.class com\panzhihua\common\model\vos\LoginReturnVO.class com\panzhihua\common\service\community\CommunityService.class com\panzhihua\common\constants\HttpStatus.class com\panzhihua\common\exceptions\UnAuthenticationException.class com\panzhihua\common\model\vos\community\ComMngStructAreaVO.class com\panzhihua\common\service\auth\TokenService.class com\panzhihua\common\utlis\ResultUtil.class com\panzhihua\common\model\vos\partybuilding\PartyOrganizationVO.class com\panzhihua\common\utlis\HttpUtils$1.class com\panzhihua\common\model\vos\community\ComMngVolunteerMngVO.class com\panzhihua\common\model\vos\community\ComActEasyPhotoVO.class com\panzhihua\common\model\vos\user\ComMngJobSetVO.class com\panzhihua\common\utlis\SFTPUtil.class com\panzhihua\common\utlis\AddressUtils.class com\panzhihua\common\utlis\AES.class com\panzhihua\common\constants\SecurityConstants.class com\panzhihua\common\model\vos\community\BatchhouseVO.class com\panzhihua\common\utlis\ServletUtils.class com\panzhihua\common\model\vos\MenuVO.class com\panzhihua\common\model\vos\community\ComMngStructHouseVO.class com\panzhihua\common\utlis\CharsetKit.class com\panzhihua\common\exceptions\WeiXinException.class com\panzhihua\common\model\vos\user\UserPhoneVO.class com\panzhihua\common\constants\Constants.class com\panzhihua\common\model\vos\partybuilding\PartyBuildingActivityVO.class com\panzhihua\common\utlis\HttpHelper.class com\panzhihua\common\service\user\UserService.class com\panzhihua\common\utlis\HttpUtils$TrustAnyTrustManager.class com\panzhihua\common\utlis\IpUtils.class com\panzhihua\common\utlis\HttpUtils.class com\panzhihua\common\model\vos\R.class com\panzhihua\common\model\vos\partybuilding\PagePartyOrganizationVO.class com\panzhihua\common\utlis\StringUtils.class com\panzhihua\common\model\vos\LoginUserInfoVO.class com\panzhihua\common\constants\TokenConstant.class com\panzhihua\common\exceptions\TokenException.class com\panzhihua\common\utlis\Convert.class com\panzhihua\common\utlis\MessageUtils.class com\panzhihua\common\model\vos\partybuilding\ActivityManagerVO.class com\panzhihua\common\model\vos\partybuilding\PartyCommitteeVO.class com\panzhihua\common\model\vos\community\ComActMicroWishVO.class com\panzhihua\common\model\vos\partybuilding\PageActivityMembersVO.class com\panzhihua\common\utlis\Threads.class com\panzhihua\common\model\vos\community\ComMngStructOtherBuildVO.class com\panzhihua\common\model\vos\partybuilding\ComPbDynUserVO.class com\panzhihua\common\model\vos\community\ComMngStructBuildTypeVO.class com\panzhihua\common\model\vos\community\SignactivityVO.class com\panzhihua\common\model\vos\user\ComMngUserTagVO.class com\panzhihua\common\model\vos\community\ComActVO.class com\panzhihua\common\validated\AddGroup.class com\panzhihua\common\validated\PutGroup.class com\panzhihua\common\constants\UserConstants.class com\panzhihua\common\exceptions\UnAuthorizationException.class com\panzhihua\common\model\vos\community\ComActActivityVO.class com\panzhihua\common\utlis\JWTTokenUtil.class com\panzhihua\common\model\vos\partybuilding\PartyBuildingComPbDynVO.class com\panzhihua\common\utlis\StrFormatter.class com\panzhihua\common\constants\FtpConstants.class com\panzhihua\common\service\partybuilding\PartyBuildingService.class com\panzhihua\common\enums\UserStatus.class springcloud_k8s_panzhihuazhihuishequ/common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
New file @@ -0,0 +1,72 @@ F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\controller\BaseController.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\model\vos\community\ComMngVolunteerMngVO.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\model\vos\R.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\constants\FtpConstants.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\model\vos\partybuilding\PartyOrganizationVO.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\validated\AddGroup.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\model\vos\community\ActivitySignVO.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\utlis\AddressUtils.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\model\vos\community\ComMngStructBuildTypeVO.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\model\vos\user\ComMngUserTagVO.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\model\vos\user\ComMngJobSetVO.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\enums\UserStatus.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\model\vos\partybuilding\PagePartyOrganizationVO.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\utlis\LogUtils.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\service\user\UserService.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\validated\PutGroup.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\exceptions\UnAuthorizationException.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\model\vos\partybuilding\PartyBuildingMemberExcelVO.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\model\vos\community\ComActDynVO.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\model\vos\user\ChangePasswordVO.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\model\vos\LoginReturnVO.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\model\vos\partybuilding\PartyBuildingMemberVO.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\model\vos\community\ComMngStructAreaVO.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\model\vos\community\ComActActivityVO.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\service\auth\TokenService.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\utlis\SpringUtils.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\constants\TokenConstant.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\exceptions\PartyBuildingMemberException.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\model\vos\community\ComActActPrizeVO.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\model\vos\user\UserPhoneVO.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\model\vos\community\ComMngStructOtherBuildVO.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\model\vos\MenuVO.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\service\partybuilding\PartyBuildingService.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\model\vos\community\ComActMicroWishVO.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\model\vos\community\SignactivityVO.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\model\vos\partybuilding\PartyBuildingActivityVO.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\service\community\CommunityService.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\utlis\HttpHelper.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\constants\UserConstants.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\utlis\ServletUtils.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\utlis\ResultUtil.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\model\vos\community\ComActEasyPhotoVO.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\utlis\StrFormatter.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\utlis\EscapeUtil.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\exceptions\UnAuthenticationException.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\model\vos\partybuilding\PartyBuildingComPbDynVO.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\utlis\StringUtils.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\utlis\HTMLFilter.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\model\vos\LoginUserInfoVO.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\utlis\CharsetKit.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\constants\Constants.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\model\vos\partybuilding\PageActivityMembersVO.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\model\vos\partybuilding\ComPbDynUserVO.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\model\vos\partybuilding\PartyCommitteeVO.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\utlis\HttpUtils.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\model\vos\user\ComMngFamilyInfoVO.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\model\vos\user\RoleVO.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\utlis\Convert.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\utlis\JWTTokenUtil.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\exceptions\TokenException.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\utlis\MessageUtils.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\utlis\AES.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\model\vos\community\ComActVO.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\utlis\Threads.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\constants\SecurityConstants.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\model\vos\community\ComMngStructHouseVO.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\utlis\SFTPUtil.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\model\vos\community\BatchhouseVO.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\constants\HttpStatus.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\model\vos\partybuilding\ActivityManagerVO.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\utlis\IpUtils.java F:\nahan\panzhihua_zhihuishequ\zhihuishequ\springcloud_k8s_panzhihuazhihuishequ\common\src\main\java\com\panzhihua\common\exceptions\WeiXinException.java springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityManagerApi.java
@@ -1,15 +1,18 @@ package com.panzhihua.community_backstage.api; import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.*; import com.panzhihua.common.service.community.CommunityService; import com.panzhihua.common.service.user.UserService; import com.panzhihua.common.validated.AddGroup; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.util.ObjectUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -25,7 +28,7 @@ @Api(tags = {"社区管理"}) @RestController @RequestMapping("/communitymanager/") public class CommunityManagerApi { public class CommunityManagerApi extends BaseController { @Resource private UserService userService; @Resource @@ -98,8 +101,8 @@ @ApiOperation(value = "新增小区") @PostMapping("area") public R addArea(@RequestBody ComMngStructAreaVO comMngStructAreaVO){ String communityId = comMngStructAreaVO.getCommunityId(); public R addArea(@RequestBody @Validated(AddGroup.class) ComMngStructAreaVO comMngStructAreaVO){ Long communityId = this.getCommunityId(); comMngStructAreaVO.setCommunityId(communityId); return communityService.addArea(comMngStructAreaVO); } @@ -107,7 +110,7 @@ @ApiOperation(value = "分页查询小区",response =ComMngStructAreaVO.class ) @PostMapping("pagearea") public R pageArea(@RequestBody ComMngStructAreaVO comMngStructAreaVO){ String communityId = comMngStructAreaVO.getCommunityId(); Long communityId = this.getCommunityId(); comMngStructAreaVO.setCommunityId(communityId); return communityService.pageArea(comMngStructAreaVO); } springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/exception/GlobalExceptionCapture.java
New file @@ -0,0 +1,87 @@ package com.panzhihua.community_backstage.exception; import com.panzhihua.common.constants.HttpStatus; import com.panzhihua.common.exceptions.TokenException; import com.panzhihua.common.exceptions.UnAuthenticationException; import com.panzhihua.common.exceptions.UnAuthorizationException; import com.panzhihua.common.model.vos.R; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.BindingResult; import org.springframework.validation.FieldError; import org.springframework.validation.ObjectError; import org.springframework.web.bind.MethodArgumentNotValidException; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; import java.util.List; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 全局异常捕获 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2020-11-25 14:36 **/ @Slf4j @RestControllerAdvice public class GlobalExceptionCapture { /** * 拦截捕捉自定义异常 TokenException.class * @param ex token 异常 * @return R 401 */ @ExceptionHandler(value = TokenException.class) public R myErrorHandlerTokenException(TokenException ex) { return R.fail(ex.getCode(),ex.getMsg()); } /** * 拦截捕捉自定义异常 UnAuthenticationException.class * @param ex 认证 异常 * @return R 401 */ @ExceptionHandler(value = UnAuthenticationException.class) public R myErrorHandlerUnAuthenticationException(UnAuthenticationException ex) { return R.fail(ex.getCode(),ex.getMsg()); } /** * 拦截捕捉自定义异常 UnAuthorizationException.class * @param ex 权限 异常 * @return R 403 */ @ExceptionHandler(value = UnAuthorizationException.class) public R myErrorHandlerUnAuthorizationException(UnAuthenticationException ex) { return R.fail(ex.getCode(),ex.getMsg()); } // /** // * 全局异常捕捉处理 // * @param ex 所有运行时异常 // * @return R 500 // */ // @ExceptionHandler(value = Exception.class) // public R errorHandler(Exception ex) { // log.error("捕捉到全局异常【{}】",ex.getMessage()); // return R.fail(ex.getMessage()); // } /** * 校验异常 * @param ex valid * @return 返回json */ @ExceptionHandler(value = MethodArgumentNotValidException.class) public R methodArgumentNotValidException(MethodArgumentNotValidException ex) { BindingResult result = ex.getBindingResult(); StringBuilder errorMessage = new StringBuilder(); if (result.hasErrors()) { List<ObjectError> errors = result.getAllErrors(); errors.forEach(p ->{ FieldError fieldError = (FieldError) p; errorMessage.append(fieldError.getDefaultMessage()); errorMessage.append(" "); }); } return R.fail(HttpStatus.BAD_REQUEST,errorMessage.toString()); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
@@ -539,16 +539,13 @@ * @return 新增结果 */ @PostMapping("addarea") @Transactional(rollbackFor = Exception.class) R addArea(@RequestBody ComMngStructAreaVO comMngStructAreaVO) { R r = comMngStructAreaService.addArea(comMngStructAreaVO); if (R.isOk(r)) { String areaCode = (String) r.getData(); String areaCode = String.valueOf(r.getData()) ; comMngStructAreaVO.setAreaCode(areaCode); R r1 = comMngStructHouseService.addHouseArea(comMngStructAreaVO); if (!R.isOk(r1)) { throw new RuntimeException("新增小区地址失败"); } return r1; } return r; } @@ -797,7 +794,9 @@ if (ObjectUtils.isEmpty(parentCode)) { R r = comMngStructAreaService.selectAreaById(areaId); if (R.isOk(r)) { parentCode =(String) r.getData(); parentCode =String.valueOf(r.getData()) ; }else{ return R.fail("用户没有绑定小区"); } } return comMngStructHouseService.putVolunteerPhone(parentCode); @@ -810,10 +809,43 @@ */ @PostMapping("addhouses") public R addHouses(@RequestBody ComMngStructHouseVO comMngStructHouseVO){ R r = comMngStructAreaService.selectAreaById(comMngStructHouseVO.getAreaId()); if (!R.isOk(r)) { return R.fail("用户没有绑定小区"); } String data = String.valueOf(r.getData()); comMngStructHouseVO.setAreaCode(data); return comMngStructHouseService.addHouses(comMngStructHouseVO); } /** * 查询小区 * @param communityId 社区id * @return 小区集合 */ @PostMapping("listarea") public R listArea(@RequestParam("communityId")Long communityId){ return comMngStructAreaService.listArea(communityId); } /** * 用户参加的所有社区活动 * @param userId 用户id * @return 活动列表 */ @PostMapping("listactivity") public R listActivity(@RequestParam("userId")Long userId ){ return comActActivityService.listActivity(userId); } /** * 用户确认心愿 * @param comActMicroWishVO 用户评价 * @return 确认结果 */ @PostMapping("putmicrowishconfirm") R putMicroWishConfirm(@RequestBody ComActMicroWishVO comActMicroWishVO){ return comActMicroWishService.putMicroWishConfirm(comActMicroWishVO); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java
@@ -33,6 +33,9 @@ "FROM\n" + "com_act_easy_photo p\n" + "JOIN sys_user u ON p.sponsor_id = u.user_id \n" + "<if test='comActEasyPhotoVO.userId != null and comActEasyPhotoVO.userId != 0'>" + "AND u.`user_id` = #{comActEasyPhotoVO.userId} \n" + " </if> " + "left join com_act_easy_photo_user pu ON p.id = pu.easy_photo_id \n" + "<if test='comActEasyPhotoVO.sponsorName != null and comActEasyPhotoVO.sponsorName.trim() != ""'>" + "AND u.`name` = #{comActEasyPhotoVO.sponsorName} \n" + @@ -41,7 +44,10 @@ "<if test='comActEasyPhotoVO.handlerName != null and comActEasyPhotoVO.handlerName.trim() != ""'>" + "AND su.`name` = #{comActEasyPhotoVO.handlerName} \n" + " </if> " + " where p.community_id=#{comActEasyPhotoVO.communityId} " + "<where>"+ "<if test='comActEasyPhotoVO.communityId != null and comActEasyPhotoVO.communityId != 0'>" + " and p.community_id=#{comActEasyPhotoVO.communityId} " + " </if> " + "<if test='comActEasyPhotoVO.happenAddr != null and comActEasyPhotoVO.happenAddr.trim() != ""'>" + "AND p.happen_addr = #{comActEasyPhotoVO.happenAddr} \n" + " </if> " + @@ -55,6 +61,7 @@ "<if test='comActEasyPhotoVO.sponsorId != null and comActEasyPhotoVO.sponsorId != 0'>" + "AND p.sponsor_id =#{comActEasyPhotoVO.sponsorId} \n" + " </if> " + "</where>"+ " group by p.id "+ "</script>") IPage<ComActEasyPhotoVO> pageEasyPhoto(Page page, @Param("comActEasyPhotoVO") ComActEasyPhotoVO comActEasyPhotoVO); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java
@@ -43,8 +43,10 @@ "<if test='comActMicroWishVO.responsibleName != null and comActMicroWishVO.responsibleName.trim() != ""'>" + "AND su.`name` = #{comActMicroWishVO.responsibleName} \n" + " </if> " + "WHERE\n" + "w.community_id=#{comActMicroWishVO.communityId} \n" + "<where>" + "<if test='comActMicroWishVO.communityId != null and comActMicroWishVO.communityId != 0'>" + " and w.community_id=#{comActMicroWishVO.communityId} \n" + " </if> " + "<if test='comActMicroWishVO.sponsorPhone != null and comActMicroWishVO.sponsorPhone.trim() != ""'>" + "AND w.sponsor_phone = #{comActMicroWishVO.sponsorPhone} \n" + " </if> " + @@ -58,6 +60,10 @@ "<if test='comActMicroWishVO.isApplets != null and comActMicroWishVO.isApplets != 0'>" + "AND w.status in (3,6) \n" + " </if> " + "<if test='comActMicroWishVO.userId != null and comActMicroWishVO.userId != 0'>" + "AND w.sponsor_id =#{comActMicroWishVO.userId} \n" + " </if> " + "</where>"+ " group by w.id \n"+ "ORDER BY w.`status`, w.create_at "+ "</script>") springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActEasyPhotoDO.java
@@ -88,4 +88,8 @@ * 0 不需要 1 需要 */ private Integer isNeedFeedBack; /** * 反馈时间 */ private Date feedbackAt; } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngStructAreaDO.java
@@ -26,7 +26,7 @@ /** * 社区id */ private String communityId; private Long communityId; /** * 小区名称 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngStructHouseDO.java
@@ -61,5 +61,5 @@ /** * 状态 1 自主 2 租住 3 商用 */ private Integer states; private Integer state; } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngStructHouseUserDO.java
@@ -1,8 +1,6 @@ package com.panzhihua.service_community.model.dos; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import java.io.Serializable; @@ -39,6 +37,7 @@ /** * 绑定时间 */ @TableField(fill = FieldFill.INSERT) private Date createAt; /** * 小区地址编码 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActActivityService.java
@@ -8,6 +8,8 @@ import com.panzhihua.common.model.vos.community.SignactivityVO; import com.panzhihua.service_community.model.dos.ComActActivityDO; import java.util.List; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 社区活动 @@ -71,5 +73,10 @@ * @return 报名 取消报名 结果 */ R signActivity(SignactivityVO signactivityVO); /** * 用户参加的所有社区活动 * @param userId 用户id * @return 活动列表 */ R listActivity(Long userId); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActMicroWishService.java
@@ -37,4 +37,10 @@ * @return 操作结果 */ R comActMicroWishVO(ComActMicroWishVO comActMicroWishVO); /** * 用户确认心愿 * @param comActMicroWishVO 用户评价 * @return 确认结果 */ R putMicroWishConfirm(ComActMicroWishVO comActMicroWishVO); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngStructAreaService.java
@@ -53,4 +53,10 @@ * @return 小区地址编码 */ R selectAreaById(Long areaId); /** * 查询小区 * @param communityId 社区id * @return 小区集合 */ R listArea(Long communityId); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
@@ -19,8 +19,11 @@ import org.springframework.util.ObjectUtils; import javax.annotation.Resource; import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; /** * @program: springcloud_k8s_panzhihuazhihuishequ @@ -218,5 +221,36 @@ return R.fail(); } /** * 用户参加的所有社区活动 * * @param userId 用户id * @return 活动列表 */ @Override public R listActivity(Long userId) { List<ComActActSignDO> comActActSignDOS = comActActSignDAO.selectList(new QueryWrapper<ComActActSignDO>().lambda().eq(ComActActSignDO::getUserId, userId)); if (ObjectUtils.isEmpty(comActActSignDOS)) { return R.fail(); } List<Long> longs = comActActSignDOS.stream().map(comActActSignDO -> comActActSignDO.getActivityId()).collect(Collectors.toList()); List<ComActActivityDO> comActActivityDOS = comActActivityDAO.selectBatchIds(longs); List<ComActActivityVO>comActActivityVOS=new ArrayList<>(); comActActivityDOS.forEach(comActActivityDO -> { ComActActivityVO comActActivityVO=new ComActActivityVO(); BeanUtils.copyProperties(comActActivityDO,comActActivityVO); List<ComActActSignDO> collect = comActActSignDOS.stream().filter(comActActSignDO -> comActActSignDO.getActivityId().equals(comActActivityVO.getId())).limit(1).collect(Collectors.toList()); ComActActSignDO comActActSignDO = collect.get(0); Integer isVolunteer = comActActSignDO.getIsVolunteer(); if (isVolunteer.intValue()==1) { comActActivityVO.setType(1); }else{ comActActivityVO.setType(2); } comActActivityVOS.add(comActActivityVO); }); return R.ok(comActActivityVOS); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java
@@ -16,6 +16,7 @@ import org.springframework.util.ObjectUtils; import javax.annotation.Resource; import java.util.Date; import java.util.List; /** @@ -162,14 +163,17 @@ }else{ cmActEasyPhotoDO.setStatus(4);//已完成 } cmActEasyPhotoDO.setExamineAt(new Date()); break; case 2: cmActEasyPhotoDO.setStatus(3);//已驳回 cmActEasyPhotoDO.setExamineAt(new Date()); break; case 3: cmActEasyPhotoDO.setHandleResult(comActEasyPhotoVO.getHandleResult()); cmActEasyPhotoDO.setHandlePhotoList(comActEasyPhotoVO.getHandlePhotoList()); cmActEasyPhotoDO.setStatus(4);//已完成 cmActEasyPhotoDO.setFeedbackAt(new Date()); break; default:break; } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java
@@ -185,5 +185,34 @@ return R.fail(); } /** * 用户确认心愿 * * @param comActMicroWishVO 用户评价 * @return 确认结果 */ @Override public R putMicroWishConfirm(ComActMicroWishVO comActMicroWishVO) { ComActMicroWishDO comActMicroWishDO1 = comActMicroWishDAO.selectById(comActMicroWishVO.getId()); if (ObjectUtils.isEmpty(comActMicroWishDO1)) { return R.fail("心愿不存在"); } Integer status = comActMicroWishDO1.getStatus(); if (status.intValue()!=5) { return R.fail("心愿状态不是待确认"); } ComActMicroWishDO comActMicroWishDO=new ComActMicroWishDO(); comActMicroWishDO.setId(comActMicroWishVO.getId()); comActMicroWishDO.setExamineAt(comActMicroWishVO.getExamineAt()); comActMicroWishDO.setStatus(comActMicroWishVO.getStatus()); comActMicroWishDO.setScore(comActMicroWishVO.getScore()); comActMicroWishDO.setEvaluate(comActMicroWishVO.getEvaluate()); int update = comActMicroWishDAO.updateById(comActMicroWishDO); if (update>0) { return R.ok(); } return R.fail(); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructAreaServiceImpl.java
@@ -16,6 +16,7 @@ import org.springframework.util.ObjectUtils; import javax.annotation.Resource; import java.util.List; /** * @program: springcloud_k8s_panzhihuazhihuishequ @@ -43,7 +44,14 @@ areaCode = Long.valueOf(comMngStructAreaDO1.getAreaCode())+1; } comMngStructAreaDO.setAreaCode(areaCode+""); int insert = comMngStructAreaDAO.insert(comMngStructAreaDO); int insert = 0; try { insert = comMngStructAreaDAO.insert(comMngStructAreaDO); } catch (Exception e) { if (e.getMessage().contains("unique_address_detail")) { return R.fail("小区地址已经存在"); } } if (insert>0) { return R.ok(areaCode); } @@ -135,5 +143,17 @@ return R.ok(comMngStructAreaDO.getAreaCode()); } /** * 查询小区 * * @param communityId 社区id * @return 小区集合 */ @Override public R listArea(Long communityId) { List<ComMngStructAreaDO> comMngStructAreaDOS = comMngStructAreaDAO.selectList(new QueryWrapper<ComMngStructAreaDO>().lambda().eq(ComMngStructAreaDO::getCommunityId, communityId)); return R.ok(comMngStructAreaDOS); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructHouseServiceImpl.java
@@ -83,7 +83,8 @@ * 批量添加地址功能提取出一个公共方法 * @param batchhouseVO 批量添加小区、同级（楼栋、单元、楼层、房间） */ private void batchSaveHouse(BatchhouseVO batchhouseVO) { @Transactional(rollbackFor = Exception.class) void batchSaveHouse(BatchhouseVO batchhouseVO) { String areaCode = batchhouseVO.getAreaCode(); ComMngStructHouseDO comMngStructHouseDO = comMngStructHouseDAO.selectOne(new QueryWrapper<ComMngStructHouseDO>().lambda().eq(ComMngStructHouseDO::getHouseCode, areaCode)); String areaName = comMngStructHouseDO.getHouseName();//小区地址 @@ -118,6 +119,7 @@ comMngStructHouseDO1.setType(2); comMngStructHouseDOList.add(comMngStructHouseDO1); } for (int m = unitBegin; m <= unitEnd; m++) {//单元 ComMngStructHouseDO comMngStructHouseDO2 = new ComMngStructHouseDO(); if (unitBegin==unitEnd&&null!=type&&type==4) { @@ -130,6 +132,7 @@ comMngStructHouseDOList.add(comMngStructHouseDO2); } int num = 0;//门牌累加时使用 for (int k = floorBegin; k <= floorEnd; k++) {//楼层 ComMngStructHouseDO comMngStructHouseDO3 = new ComMngStructHouseDO(); if (floorBegin==floorEnd&&null!=type&&type==5) { @@ -137,10 +140,11 @@ } else { comMngStructHouseDO3.setType(4); comMngStructHouseDO3.setParentCode(comMngStructHouseDO2.getHouseCode()); comMngStructHouseDO3.setHouseName(comMngStructHouseDO2.getHouseName() + "层"); comMngStructHouseDO3.setHouseName(comMngStructHouseDO2.getHouseName() +k+ "层"); comMngStructHouseDO3.setHouseCode(comMngStructHouseDO2.getHouseCode() + (floorCode + k)); comMngStructHouseDOList.add(comMngStructHouseDO3); } for (int h = doorBegin; h <= doorEnd; h++) {//门牌 num++; ComMngStructHouseDO comMngStructHouseDO4 = new ComMngStructHouseDO(); @@ -215,12 +219,17 @@ comMngStructHouseDO4.setParentCode(comMngStructHouseDO3.getHouseCode()); comMngStructHouseDOList.add(comMngStructHouseDO4); } } } } boolean b = this.saveBatch(comMngStructHouseDOList); if (b) { log.info("批量新增房屋地址数量【{}】", comMngStructHouseDOList.size()); log.info("batchhouse----楼栋数一共【{}】",buildingEnd-buildingBegin+1); log.info("batchhouse----单元数一共【{}】",(unitEnd-unitBegin+1)*(buildingEnd-buildingBegin+1)); log.info("batchhouse----楼层数一共【{}】",(unitEnd-unitBegin+1)*(buildingEnd-buildingBegin+1)*(floorEnd-floorBegin+1)); log.info("batchhouse----房间数量一共【{}】",(unitEnd-unitBegin+1)*(buildingEnd-buildingBegin+1)*(floorEnd-floorBegin+1)*(doorEnd-doorBegin+1)); log.info("batchhouse----批量新增房屋地址数量【{}】", comMngStructHouseDOList.size()); } } @@ -233,10 +242,18 @@ public R addHouseArea(ComMngStructAreaVO comMngStructAreaVO) { ComMngStructHouseDO comMngStructHouseDO = new ComMngStructHouseDO(); comMngStructHouseDO.setHouseCode(comMngStructAreaVO.getAreaCode()); comMngStructHouseDO.setHouseName(comMngStructAreaVO.getAreaName()); comMngStructHouseDO.setHouseName(comMngStructAreaVO.getAddressDetail()); comMngStructHouseDO.setType(1); comMngStructHouseDO.setParentCode("0"); int insert = comMngStructHouseDAO.insert(comMngStructHouseDO); int insert = 0; try { insert = comMngStructHouseDAO.insert(comMngStructHouseDO); } catch (Exception e) { log.error("新增地址错误【{}】",e.getMessage()); if (e.getMessage().contains("unique_house_name")) { return R.fail("小区已经存在"); } } if (insert > 0) { return R.ok(); } @@ -273,8 +290,8 @@ List<ComMngStructHouseVO> comMngStructHouseVOS = new ArrayList<>(); List<ComMngStructHouseDO> comMngStructHouseDOList = comMngStructHouseDAO.selectList(new QueryWrapper<ComMngStructHouseDO>().lambda().eq(ComMngStructHouseDO::getParentCode, houseCode)); if (!ObjectUtils.isEmpty(comMngStructHouseDOList)) { ComMngStructHouseVO comMngStructHouseVO = new ComMngStructHouseVO(); comMngStructHouseDOList.forEach(comMngStructHouseDO -> { ComMngStructHouseVO comMngStructHouseVO = new ComMngStructHouseVO(); int type = comMngStructHouseDO.getType().intValue(); String houseCode1 = comMngStructHouseDO.getHouseCode(); BeanUtils.copyProperties(comMngStructHouseDO, comMngStructHouseVO); @@ -404,8 +421,8 @@ List<ComMngStructHouseVO> comMngStructHouseVOS = new ArrayList<>(); List<ComMngStructHouseDO> comMngStructHouseDOList = comMngStructHouseDAO.selectList(new QueryWrapper<ComMngStructHouseDO>().lambda().eq(ComMngStructHouseDO::getParentCode, parentCode)); if (!ObjectUtils.isEmpty(comMngStructHouseDOList)) { ComMngStructHouseVO comMngStructHouseVO = new ComMngStructHouseVO(); comMngStructHouseDOList.forEach(comMngStructHouseDO -> { ComMngStructHouseVO comMngStructHouseVO = new ComMngStructHouseVO(); BeanUtils.copyProperties(comMngStructHouseDO, comMngStructHouseVO); comMngStructHouseVOS.add(comMngStructHouseVO); }); @@ -423,12 +440,12 @@ @Transactional(rollbackFor = Exception.class) public R addHouses(ComMngStructHouseVO comMngStructHouseVO) { String houseCode = comMngStructHouseVO.getHouseCode(); Integer states1 = comMngStructHouseVO.getStates(); Integer states1 = comMngStructHouseVO.getState(); ComMngStructHouseDO comMngStructHouseDO1 = comMngStructHouseDAO.selectOne(new QueryWrapper<ComMngStructHouseDO>().lambda().eq(ComMngStructHouseDO::getHouseCode, houseCode)); if (ObjectUtils.isEmpty(comMngStructHouseDO1)) { return R.fail("房屋不存在"); } Integer states = comMngStructHouseDO1.getStates(); Integer states = comMngStructHouseDO1.getState(); if (null != states && 0 != states.intValue()) { if (states1.intValue() != states.intValue()) { return R.fail("房屋已经被绑定了,请通过意见反馈联系后台处理"); @@ -436,17 +453,21 @@ } ComMngStructHouseDO comMngStructHouseDO = new ComMngStructHouseDO(); comMngStructHouseDO.setSquare(comMngStructHouseVO.getSquare()); comMngStructHouseDO.setStates(states1); comMngStructHouseDO.setState(states1); comMngStructHouseDO.setId(comMngStructHouseDO1.getId()); int update = comMngStructHouseDAO.updateById(comMngStructHouseDO); if (update == 0) { return R.fail("修改房屋面积、状态失败"); } ComMngStructHouseUserDO comMngStructHouseUserDO1 = comMngStructHouseUserDAO.selectOne(new QueryWrapper<ComMngStructHouseUserDO>().lambda().eq(ComMngStructHouseUserDO::getUserId, comMngStructHouseVO.getUserId()).eq(ComMngStructHouseUserDO::getHouseCode, comMngStructHouseVO.getHouseCode())); if (!ObjectUtils.isEmpty(comMngStructHouseUserDO1)) { return R.ok(); } ComMngStructHouseUserDO comMngStructHouseUserDO = new ComMngStructHouseUserDO(); comMngStructHouseUserDO.setUserId(comMngStructHouseVO.getUserId()); comMngStructHouseUserDO.setIdentity(comMngStructHouseVO.getIdentity()); ComMngStructHouseDO comMngStructHouseDO2 = comMngStructHouseDAO.selectById(comMngStructHouseVO.getAreaId()); comMngStructHouseUserDO.setAreaCode(comMngStructHouseDO2.getHouseCode()); comMngStructHouseUserDO.setAreaCode(comMngStructHouseVO.getAreaCode()); comMngStructHouseUserDO.setHouseCode(comMngStructHouseVO.getHouseCode()); int insert = comMngStructHouseUserDAO.insert(comMngStructHouseUserDO); if (insert > 0) { return R.ok(); springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java
@@ -314,4 +314,15 @@ return r; } /** * 用户的所有党建活动 * @param userId 用户id * @return 党建活动列表 */ @PostMapping("listactivity") public R listActivity(@RequestParam("userId") Long userId){ R r=comBpActivityService.listActivity(userId); return r; } } springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComBpActivityService.java
@@ -67,4 +67,10 @@ * @return 操作结果 */ R cancelActivity(PartyBuildingActivityVO partyBuildingActivityVO); /** * 用户的所有党建活动 * @param userId 用户id * @return 党建活动列表 */ R listActivity(Long userId); } springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComActActivityVO; import com.panzhihua.common.model.vos.partybuilding.PageActivityMembersVO; import com.panzhihua.common.model.vos.partybuilding.PartyBuildingActivityVO; import com.panzhihua.common.model.vos.partybuilding.PartyBuildingMemberVO; @@ -214,5 +215,33 @@ return R.fail(); } /** * 用户的所有党建活动 * * @param userId 用户id * @return 党建活动列表 */ @Override public R listActivity(Long userId) { List<ComPbActivityMemberDO> comPbActivityMemberDOS = comPbActivityMemberDAO.selectList(new QueryWrapper<ComPbActivityMemberDO>().lambda().eq(ComPbActivityMemberDO::getMemberId, userId)); if (ObjectUtils.isEmpty(comPbActivityMemberDOS)) { return R.fail(); } List<Long> collect = comPbActivityMemberDOS.stream().map(comPbActivityMemberDO -> comPbActivityMemberDO.getActivityId()).collect(Collectors.toList()); List<ComPbActivityDO> comPbActivityDOS = comBpActivityDAO.selectBatchIds(collect); List<ComActActivityVO>comActActivityVOS=new ArrayList<>(); comPbActivityDOS.forEach(comPbActivityDO -> { ComActActivityVO comActActivityVO=new ComActActivityVO(); comActActivityVO.setType(3); comActActivityVO.setId(comPbActivityDO.getId()); comActActivityVO.setStatus(comPbActivityDO.getStatus()); comActActivityVO.setActivityName(comPbActivityDO.getName()); comActActivityVO.setCover(comPbActivityDO.getCover()); comActActivityVO.setBeginAt(comPbActivityDO.getActivityTimeBegin()); comActActivityVOS.add(comActActivityVO); }); return R.ok(comActActivityVOS); } } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
@@ -209,7 +209,7 @@ * @return 修改结果 */ @PostMapping("putuser") public R putUser(LoginUserInfoVO loginUserInfoVO){ public R putUser(@RequestBody LoginUserInfoVO loginUserInfoVO){ return userService.putUser(loginUserInfoVO); }
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.panzhihua.common.constants.SecurityConstants; import com.panzhihua.common.constants.UserConstants; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; @@ -422,6 +423,9 @@ sysUserDO.setUserId(loginUserInfoVO.getUserId()); int update = userDao.updateById(sysUserDO); if (update>0) { //删除用户信息缓存 String userKey = UserConstants.LOGIN_USER_INFO + loginUserInfoVO.getUserId(); stringRedisTemplate.delete(userKey); return R.ok(); } return R.fail(); @@ -444,6 +448,10 @@ sysUserDO.setUserId(loginUserInfoVO.getUserId()); sysUserDO.setFaceUrl(loginUserInfoVO.getFaceUrl()); sysUserDO.setFaceState(0); SysUserDO sysUserDO1 = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getIdCard, loginUserInfoVO.getIdCard())); if (!ObjectUtils.isEmpty(sysUserDO1)) { return R.fail("身份证已经存在"); } int update = userDao.updateById(sysUserDO); if (update>0) { return R.ok(); @@ -498,6 +506,38 @@ */ @Override public R putUser(LoginUserInfoVO loginUserInfoVO) { Integer faceState = loginUserInfoVO.getFaceState(); if (null==faceState||0==faceState) { loginUserInfoVO.setFaceState(null); } Integer isPartymember = loginUserInfoVO.getIsPartymember(); if (null==isPartymember||0==isPartymember) { loginUserInfoVO.setIsPartymember(null); } Integer isVolunteer = loginUserInfoVO.getIsVolunteer(); if (null==isVolunteer||0==isVolunteer) { loginUserInfoVO.setIsVolunteer(null); } Integer operationType = loginUserInfoVO.getOperationType(); if (null==operationType||0==operationType) { loginUserInfoVO.setOperationType(null); } Integer sex = loginUserInfoVO.getSex(); if (null==sex||0==sex) { loginUserInfoVO.setSex(null); } Integer status = loginUserInfoVO.getStatus(); if (null==status||0==status) { loginUserInfoVO.setStatus(null); } Integer type = loginUserInfoVO.getType(); if (null==type||0==type) { loginUserInfoVO.setType(null); } Long communityId = loginUserInfoVO.getCommunityId(); if (null==communityId||0==communityId) { loginUserInfoVO.setCommunityId(null); } SysUserDO sysUserDO=new SysUserDO(); BeanUtils.copyProperties(loginUserInfoVO,sysUserDO); int update = userDao.updateById(sysUserDO); springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/bootstrap.yml
@@ -6,9 +6,9 @@ discovery: enabled: true service-id: config # 注册中心的服务名 profile: dev # 指定配置文件的环境 profile: test # 指定配置文件的环境 profiles: active: dev active: test eureka: client:
