springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml
@@ -23,46 +23,30 @@ </component> <component name="ChangeListManager"> <list default="true" id="8ba27629-3e5d-4f42-993e-d0c055bc9371" name="Default Changelist" comment=""> <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussDTO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ComPbActivityDTO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussOptionVO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussVO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/DiscussApi.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/api/DiscussApi.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussCommentDAO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussDAO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussOptionDAO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussOptionUserDAO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussUserDAO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussCommentDO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussDO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussOptionDO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussOptionUserDO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussUserDO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComActDiscussOptionService.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComActDiscussService.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDiscussOptionServiceImpl.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDiscussServiceImpl.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussCommentDTO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComActDiscussCommentDTO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComActDiscussDTO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussCommentVO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussCommentUserDAO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussCommentUserDO.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/PartyBuildingApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/applets/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/applets/src/main/resources/bootstrap.yml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/applets_backstage/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/applets_backstage/src/main/resources/bootstrap.yml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/auth/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/auth/src/main/resources/bootstrap.yml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/constants/TokenConstant.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/constants/TokenConstant.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussDTO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussDTO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussVO.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/target/classes/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/service/community/CommunityService.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/service/community/CommunityService.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/service/partybuilding/PartyBuildingService.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/service/partybuilding/PartyBuildingService.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/DiscussApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/DiscussApi.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/community_backstage/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/community_backstage/src/main/resources/bootstrap.yml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/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/api/DiscussApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/api/DiscussApi.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussDAO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussCommentDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussCommentDO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussDO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussUserDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussUserDO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComActDiscussService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComActDiscussService.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDiscussServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDiscussServiceImpl.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_community/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/resources/bootstrap.yml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComBpActivityDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComBpActivityDAO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbActivityDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbActivityDO.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/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/resources/bootstrap.yml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/timejob/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/timejob/src/main/resources/bootstrap.yml" afterDir="false" /> @@ -79,8 +63,8 @@ <component name="FileTemplateManagerImpl"> <option name="RECENT_TEMPLATES"> <list> <option value="Class" /> <option value="Interface" /> <option value="Class" /> </list> </option> </component> @@ -219,13 +203,15 @@ <option name="Make" enabled="true" /> </method> </configuration> <configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true"> <configuration default="true" type="ArquillianTestNG" factoryName="" nameIsGenerated="true"> <option name="arquillianRunConfiguration"> <value> <option name="containerStateName" value="" /> </value> </option> <option name="TEST_OBJECT" value="class" /> <option name="TEST_OBJECT" value="CLASS" /> <properties /> <listeners /> <method v="2"> <option name="Make" enabled="true" /> </method> @@ -446,7 +432,8 @@ <workItem from="1610934956567" duration="1325000" /> <workItem from="1610939265133" duration="8588000" /> <workItem from="1610956684718" duration="7037000" /> <workItem from="1611019208339" duration="93801000" /> <workItem from="1611019208339" duration="94460000" /> <workItem from="1611365644515" duration="11851000" /> </task> <servers /> </component> @@ -470,10 +457,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="1611305989460"> <state x="574" y="118" key="#com.intellij.ide.util.MemberChooser" timestamp="1611383660534"> <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="1611305989460" /> <state x="574" y="118" key="#com.intellij.ide.util.MemberChooser/0.0.1536.824@0.0.1536.824" timestamp="1611383660534" /> <state x="405" y="335" key="#com.intellij.refactoring.move.MoveHandler.SelectRefactoringDialog" timestamp="1606099594079"> <screen x="0" y="0" width="1536" height="824" /> </state> @@ -502,54 +489,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="1610606590056" /> <state width="1031" height="448" key="GridCell.Tab.0.bottom" timestamp="1611294821130"> <state width="1031" height="384" key="GridCell.Tab.0.bottom" timestamp="1611388089438"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="448" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611294821130" /> <state width="1031" height="448" key="GridCell.Tab.0.center" timestamp="1611294821130"> <state width="1031" height="384" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611388089438" /> <state width="1031" height="384" key="GridCell.Tab.0.center" timestamp="1611388089438"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="448" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1611294821130" /> <state width="1031" height="448" key="GridCell.Tab.0.left" timestamp="1611294821129"> <state width="1031" height="384" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1611388089438" /> <state width="1031" height="384" key="GridCell.Tab.0.left" timestamp="1611388089438"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="448" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1611294821129" /> <state width="1031" height="448" key="GridCell.Tab.0.right" timestamp="1611294821130"> <state width="1031" height="384" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1611388089438" /> <state width="1031" height="384" key="GridCell.Tab.0.right" timestamp="1611388089438"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="448" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1611294821130" /> <state width="1031" height="448" key="GridCell.Tab.1.bottom" timestamp="1611294821130"> <state width="1031" height="384" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1611388089438" /> <state width="1031" height="384" key="GridCell.Tab.1.bottom" timestamp="1611388089438"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="448" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611294821130" /> <state width="1031" height="448" key="GridCell.Tab.1.center" timestamp="1611294821130"> <state width="1031" height="384" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611388089438" /> <state width="1031" height="384" key="GridCell.Tab.1.center" timestamp="1611388089438"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="448" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1611294821130" /> <state width="1031" height="448" key="GridCell.Tab.1.left" timestamp="1611294821130"> <state width="1031" height="384" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1611388089438" /> <state width="1031" height="384" key="GridCell.Tab.1.left" timestamp="1611388089438"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="448" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1611294821130" /> <state width="1031" height="448" key="GridCell.Tab.1.right" timestamp="1611294821130"> <state width="1031" height="384" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1611388089438" /> <state width="1031" height="384" key="GridCell.Tab.1.right" timestamp="1611388089438"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="448" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1611294821130" /> <state width="1031" height="448" key="GridCell.Tab.2.bottom" timestamp="1611294821130"> <state width="1031" height="384" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1611388089438" /> <state width="1031" height="384" key="GridCell.Tab.2.bottom" timestamp="1611388089438"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="448" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611294821130" /> <state width="1031" height="448" key="GridCell.Tab.2.center" timestamp="1611294821130"> <state width="1031" height="384" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611388089438" /> <state width="1031" height="384" key="GridCell.Tab.2.center" timestamp="1611388089438"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="448" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1611294821130" /> <state width="1031" height="448" key="GridCell.Tab.2.left" timestamp="1611294821130"> <state width="1031" height="384" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1611388089438" /> <state width="1031" height="384" key="GridCell.Tab.2.left" timestamp="1611388089438"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="448" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1611294821130" /> <state width="1031" height="448" key="GridCell.Tab.2.right" timestamp="1611294821130"> <state width="1031" height="384" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1611388089438" /> <state width="1031" height="384" key="GridCell.Tab.2.right" timestamp="1611388089438"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="448" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1611294821130" /> <state width="1031" height="384" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1611388089438" /> <state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1610611848124"> <screen x="0" y="0" width="1536" height="824" /> </state> @@ -562,10 +549,10 @@ <screen x="0" y="0" width="1536" height="824" /> </state> <state x="270" y="57" key="SettingsEditor/0.0.1536.824@0.0.1536.824" timestamp="1606120706449" /> <state width="498" height="540" key="SwitcherDM" timestamp="1611223998805"> <state width="498" height="540" key="SwitcherDM" timestamp="1611386897102"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="498" height="540" key="SwitcherDM/0.0.1536.824@0.0.1536.824" timestamp="1611223998805" /> <state width="498" height="540" key="SwitcherDM/0.0.1536.824@0.0.1536.824" timestamp="1611386897102" /> <state x="93" y="93" width="1350" height="638" key="com.intellij.history.integration.ui.views.DirectoryHistoryDialog" timestamp="1609398421992"> <screen x="0" y="0" width="1536" height="824" /> </state> @@ -574,10 +561,10 @@ <screen x="0" y="0" width="1536" height="824" /> </state> <state x="93" y="93" width="1350" height="639" key="com.intellij.history.integration.ui.views.FileHistoryDialog/0.0.1536.824@0.0.1536.824" timestamp="1611130640592" /> <state x="233" y="42" width="921" height="782" key="find.popup" timestamp="1611301827536"> <state x="233" y="42" width="921" height="782" key="find.popup" timestamp="1611365723051"> <screen x="0" y="0" width="1536" height="824" /> </state> <state x="233" y="42" width="921" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1611301827536" /> <state x="233" y="42" width="921" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1611365723051" /> <state width="600" height="428" key="javadoc.popup" timestamp="1610005781618"> <screen x="0" y="0" width="1536" height="824" /> </state> springcloud_k8s_panzhihuazhihuishequ/applets/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: springcloud_k8s_panzhihuazhihuishequ/applets_backstage/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: springcloud_k8s_panzhihuazhihuishequ/auth/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: springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussCommentDTO.java
New file @@ -0,0 +1,41 @@ package com.panzhihua.common.model.dtos.community; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 一起议评论 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2021-01-23 09:47 **/ @Data @ApiModel("一起议评论") public class ComActDiscussCommentDTO { @ApiModelProperty("主键") private Long id; @ApiModelProperty("一起议主键") private Long discussId; @ApiModelProperty("评论内容") private String comment; @ApiModelProperty("是否置顶 0 否 1 是") private Integer isTopping; @ApiModelProperty("评论时间") private Date createAt; @ApiModelProperty("是否作者本人回复 0 否 1 是") private Integer isAuthor; @ApiModelProperty("上级评论id 默认0表示一级评论") private Long parentId; @ApiModelProperty("用户主键") private Long userId; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussDTO.java
@@ -24,7 +24,7 @@ @ApiModelProperty("主题") @NotBlank(groups = {AddGroup.class},message = "主题不能为空") private String subject; private String discussSubject; @ApiModelProperty("类型 1 图文 2 投票") @Min(value =1,groups = {AddGroup.class},message = "类型不能为空") @@ -46,7 +46,7 @@ private Date createAt; @ApiModelProperty("1 单选 2 多选") private Integer option; private Integer discussOption; @ApiModelProperty("投票标题") private String voteTitle; springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComActDiscussCommentDTO.java
New file @@ -0,0 +1,34 @@ package com.panzhihua.common.model.dtos.community; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 一起议分页评论查询 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2021-01-23 14:29 **/ @Data @ApiModel("一起议分页评论查询") public class PageComActDiscussCommentDTO { @ApiModelProperty(value = "分页-当前页数",example = "1") private Long pageNum; @ApiModelProperty(value = "分页-每页记录数",example = "10") private Long pageSize; @ApiModelProperty(value = "账号") private String account; @ApiModelProperty(value = "姓名") private String name; @ApiModelProperty(value = "评论内容") private String comment; @ApiModelProperty(value = "一起议主键id") private Long id; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComActDiscussDTO.java
New file @@ -0,0 +1,40 @@ package com.panzhihua.common.model.dtos.community; 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.NotBlank; import java.util.Date; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 分页查询一起议 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2021-01-23 11:11 **/ @Data @ApiModel("分页查询一起议") public class PageComActDiscussDTO { @ApiModelProperty(value = "分页-当前页数",example = "1") private Long pageNum; @ApiModelProperty(value = "分页-每页记录数",example = "10") private Long pageSize; @ApiModelProperty("主题") private String subject; @ApiModelProperty(value = "社区id",hidden = true) private Long communityId; @ApiModelProperty("查询开始时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date begin; @ApiModelProperty("查询结束时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date end; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussCommentVO.java
New file @@ -0,0 +1,59 @@ package com.panzhihua.common.model.vos.community; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 一起议评论详情 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2021-01-23 13:44 **/ @Data @ApiModel("一起议评论详情") public class ComActDiscussCommentVO { @ApiModelProperty("主键") private Long id; @ApiModelProperty("一起议主键") private Long discussId; @ApiModelProperty("评论内容") private String comment; @ApiModelProperty("是否置顶 0 否 1 是") private Integer isTopping; @ApiModelProperty("评论时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createAt; @ApiModelProperty("是否作者本人回复 0 否 1 是") private Integer isAuthor; @ApiModelProperty("上级评论id 默认0表示一级评论") private Long parentId; @ApiModelProperty("用户主键") private Long userId; @ApiModelProperty("评论人名字") private String userName; @ApiModelProperty("评论人手机号") private String phone; @ApiModelProperty("点赞数量") private Integer num; @ApiModelProperty("回复内容") private String commentBack; @ApiModelProperty("回复时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date timeBack; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussVO.java
@@ -21,7 +21,7 @@ private Long id; @ApiModelProperty("主题") private String subject; private String discussSubject; @ApiModelProperty("类型 1 图文 2 投票") private Integer type; @@ -43,7 +43,7 @@ private Date createAt; @ApiModelProperty("1 单选 2 多选") private Integer option; private Integer discussOption; @ApiModelProperty("投票标题") private String voteTitle; springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -710,4 +710,52 @@ */ @PostMapping("deletediscuss") R deleteDiscuss(@RequestParam("id") Long id); /** * 一起议-回复 * @param comActDiscussCommentDTO 评论内容 * @return 回复结果 */ @PostMapping("adddiscusscomment") R addDiscussComment(@RequestBody ComActDiscussCommentDTO comActDiscussCommentDTO); /** * 一起议-分页查询 * @param pageComActDiscussDTO 查询参数 * @return ComActDiscussVO */ @PostMapping("pagediscuss") R pageDiscuss(@RequestBody PageComActDiscussDTO pageComActDiscussDTO); /** * 一起议-评论-查看 * @param id 主键 * @return 详情 */ @PostMapping("detaildiscusscomment") R detailDiscussComment(@RequestParam("id") Long id); /** * 一起议-评论-置顶 * @param id 主键 * @return 置顶结果 */ @PostMapping("putdiscusscommenttop") R putDiscussCommentTop(@RequestParam("id") Long id); /** * 一起议-评论-回复 * @param comActDiscussCommentDTO 回复内容 * @return 回复结果 */ @PostMapping("adddiscusscommentback") R addDiscussCommentBack(@RequestBody ComActDiscussCommentDTO comActDiscussCommentDTO); /** * 一起议-评论-分页查询 * @param pageComActDiscussCommentDTO 分页查询参数 * @return ComActDiscussCommentVO */ @PostMapping("pagediscusscomment") R pageDiscussComment(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO); } springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/dtos/community/ComActDiscussCommentDTO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/dtos/community/ComActDiscussDTO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/dtos/community/PageComActDiscussCommentDTO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/dtos/community/PageComActDiscussDTO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/community/ComActDiscussCommentVO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/community/ComActDiscussVO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/service/community/CommunityService.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/DiscussApi.java
@@ -1,9 +1,13 @@ package com.panzhihua.community_backstage.api; import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.model.dtos.community.ComActDiscussCommentDTO; import com.panzhihua.common.model.dtos.community.ComActDiscussDTO; import com.panzhihua.common.model.dtos.community.PageComActDiscussCommentDTO; import com.panzhihua.common.model.dtos.community.PageComActDiscussDTO; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComActDiscussCommentVO; import com.panzhihua.common.model.vos.community.ComActDiscussVO; import com.panzhihua.common.service.community.CommunityService; import com.panzhihua.common.validated.AddGroup; @@ -66,6 +70,63 @@ } @ApiOperation(value = "一起议-回复") @PostMapping("discusscomment") public R addDiscussComment(@RequestBody ComActDiscussCommentDTO comActDiscussCommentDTO) { String comment = comActDiscussCommentDTO.getComment(); if (ObjectUtils.isEmpty(comment)) { return R.fail("回复不能为空"); } Long discussId = comActDiscussCommentDTO.getDiscussId(); if (null==discussId||0==discussId) { return R.fail("一起议主键不能为空"); } comActDiscussCommentDTO.setUserId(this.getUserId()); return communityService.addDiscussComment(comActDiscussCommentDTO); } @ApiOperation(value = "一起议-分页查询",response = ComActDiscussVO.class) @PostMapping("pagediscuss") public R pageDiscuss(@RequestBody PageComActDiscussDTO pageComActDiscussDTO) { pageComActDiscussDTO.setCommunityId(this.getCommunityId()); return communityService.pageDiscuss(pageComActDiscussDTO); } @ApiOperation(value = "一起议-评论-查看",response = ComActDiscussCommentVO.class) @GetMapping("discusscomment") public R detailDiscussComment(@RequestParam("id") Long id) { return communityService.detailDiscussComment(id); } @ApiOperation(value = "一起议-评论-置顶") @GetMapping("discusscommenttop") public R putDiscussCommentTop(@RequestParam("id") Long id) { return communityService.putDiscussCommentTop(id); } @ApiOperation(value = "一起议-评论-回复") @PostMapping("discusscommentback") public R addDiscussCommentBack(@RequestBody ComActDiscussCommentDTO comActDiscussCommentDTO) { String comment = comActDiscussCommentDTO.getComment(); if (ObjectUtils.isEmpty(comment)) { return R.fail("回复不能为空"); } Long id = comActDiscussCommentDTO.getId(); if (null==id||0==id) { return R.fail("评论主键不能为空"); } comActDiscussCommentDTO.setUserId(this.getUserId()); return communityService.addDiscussCommentBack(comActDiscussCommentDTO); } @ApiOperation(value = "一起议-评论-分页查询",response = ComActDiscussCommentVO.class) @PostMapping("pagediscusscomment") public R pageDiscussComment(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO) { Long id = pageComActDiscussCommentDTO.getId(); if (null==id||0==id) { return R.fail("一起议主键不能为空"); } return communityService.pageDiscussComment(pageComActDiscussCommentDTO); } } springcloud_k8s_panzhihuazhihuishequ/community_backstage/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: springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/DiscussApi.java
@@ -1,6 +1,9 @@ package com.panzhihua.service_community.api; import com.panzhihua.common.model.dtos.community.ComActDiscussCommentDTO; import com.panzhihua.common.model.dtos.community.ComActDiscussDTO; import com.panzhihua.common.model.dtos.community.PageComActDiscussCommentDTO; import com.panzhihua.common.model.dtos.community.PageComActDiscussDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.service_community.service.ComActActivityService; import com.panzhihua.service_community.service.ComActDiscussService; @@ -17,7 +20,7 @@ **/ @Slf4j @RestController @RequestMapping("/discuss/") @RequestMapping("/") public class DiscussApi { @Resource private ComActDiscussService comActDiscussService; @@ -52,4 +55,64 @@ return comActDiscussService.deleteDiscuss(id); } /** * 一起议-回复 * @param comActDiscussCommentDTO 评论内容 * @return 回复结果 */ @PostMapping("adddiscusscomment") public R addDiscussComment(@RequestBody ComActDiscussCommentDTO comActDiscussCommentDTO){ return comActDiscussService.addDiscussComment(comActDiscussCommentDTO); } /** * 一起议-分页查询 * @param pageComActDiscussDTO 查询参数 * @return ComActDiscussVO */ @PostMapping("pagediscuss") public R pageDiscuss(@RequestBody PageComActDiscussDTO pageComActDiscussDTO){ return comActDiscussService.pageDiscuss(pageComActDiscussDTO); } /** * 一起议-评论-查看 * @param id 主键 * @return 详情 */ @PostMapping("detaildiscusscomment") public R detailDiscusscomment(@RequestParam("id") Long id){ return comActDiscussService.detailDiscusscomment(id); } /** * 一起议-评论-置顶 * @param id 主键 * @return 置顶结果 */ @PostMapping("putdiscusscommenttop") R putDiscussCommentTop(@RequestParam("id") Long id){ return comActDiscussService.putDiscussCommentTop(id); } /** * 一起议-评论-回复 * @param comActDiscussCommentDTO 回复内容 * @return 回复结果 */ @PostMapping("adddiscusscommentback") public R addDiscussCommentBack(@RequestBody ComActDiscussCommentDTO comActDiscussCommentDTO){ return comActDiscussService.addDiscussCommentBack(comActDiscussCommentDTO); } /** * 一起议-评论-分页查询 * @param pageComActDiscussCommentDTO 分页查询参数 * @return ComActDiscussCommentVO */ @PostMapping("pagediscusscomment") public R pageDiscussComment(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO){ return comActDiscussService.pageDiscussComment(pageComActDiscussCommentDTO); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussCommentUserDAO.java
New file @@ -0,0 +1,25 @@ package com.panzhihua.service_community.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.panzhihua.service_community.model.dos.ComActDiscussCommentUserDO; import org.apache.ibatis.annotations.Mapper; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 一起议评论点赞 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2021-01-23 14:00 **/ @Mapper public interface ComActDiscussCommentUserDAO extends BaseMapper<ComActDiscussCommentUserDO> { // @Select("<script> " + // " <where>" + // "<if test='nameCn != null and nameCn.trim() != ""'>" + // " </if> " + // "<if test='nameCn != null and nameCn.trim() != ""'>" + // " </if> " + // "<if test='nameCn != null and nameCn.trim() != ""'>" + // " </if> " + // " </where>" + // "</script>") } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussDAO.java
@@ -1,9 +1,16 @@ package com.panzhihua.service_community.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.panzhihua.common.model.dtos.community.PageComActDiscussCommentDTO; import com.panzhihua.common.model.dtos.community.PageComActDiscussDTO; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.community.ComActDiscussCommentVO; import com.panzhihua.common.model.vos.community.ComActDiscussVO; import com.panzhihua.service_community.model.dos.ComActDiscussDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; /** @@ -24,6 +31,63 @@ // " </if> " + // " </where>" + // "</script>") @Select("select type,name from sys_user where user_id=#{userId}") @Select("select type,name,phone from sys_user where user_id=#{userId}") LoginUserInfoVO selectUserByUserId(Long userId); @Select("<script> " + "select t.* from ("+ "SELECT\n" + "d.id,\n" + "d.`discuss_subject`,\n" + "d.type,\n" + "COUNT( c.id ) commentNum,\n" + "u.name userName,\n" + "d.create_at \n" + "FROM\n" + "com_act_discuss d\n" + "JOIN sys_user u ON d.user_id = u.user_id\n" + "LEFT JOIN com_act_discuss_comment c ON d.id = c.discuss_id \n" + " where d.community_id=#{pageComActDiscussDTO.communityId}" + "<if test='pageComActDiscussDTO.subject != null and pageComActDiscussDTO.subject.trim() != ""'>" + " and d.`discuss_subject` LIKE concat( #{pageComActDiscussDTO.subject}, '%' ) \n" + " </if> " + "<if test='pageComActDiscussDTO.begin != null '>" + "AND d.create_at BETWEEN #{pageComActDiscussDTO.begin} \n" + "AND #{pageComActDiscussDTO.end} \n" + " </if> " + "GROUP BY\n" + "d.id" + ")t order by t.commentNum desc ,t.create_at desc "+ "</script>") IPage<ComActDiscussVO> pageDiscuss(Page page, @Param("pageComActDiscussDTO") PageComActDiscussDTO pageComActDiscussDTO); @Select("<script> " + "select * from ("+ "SELECT\n" + "u.`name` userName,\n" + "u.phone,\n" + "c.`comment`,\n" + "COUNT( cu.id ) num,\n" + "c.create_at,\n" + "c.id \n" + "FROM\n" + "com_act_discuss_comment c\n" + "JOIN sys_user u ON c.user_id = u.user_id \n" + "<if test='pageComActDiscussCommentDTO.name != null and pageComActDiscussCommentDTO.name.trim() != ""'>" + "AND u.`name` LIKE concat( #{pageComActDiscussCommentDTO.name}, '%' ) \n" + " </if> " + "<if test='pageComActDiscussCommentDTO.account != null and pageComActDiscussCommentDTO.account.trim() != ""'>" + "AND u.phone LIKE concat( #{pageComActDiscussCommentDTO.account}, '%' )\n" + " </if> " + "LEFT JOIN com_act_discuss_comment_user cu ON c.id = cu.disscuss_comment_id \n" + " <where>" + "<if test='pageComActDiscussCommentDTO.comment != null and pageComActDiscussCommentDTO.comment.trim() != ""'>" + "c.`comment` LIKE concat( '%', #{pageComActDiscussCommentDTO.comment" + "}, '%' ) \n" + " </if> " + " </where>" + "GROUP BY\n" + "c.id\n" + ")t order by num desc ,t.create_at desc"+ "</script>") IPage<ComActDiscussCommentVO> pageDiscussComment(Page page, @Param("pageComActDiscussCommentDTO")PageComActDiscussCommentDTO pageComActDiscussCommentDTO); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussCommentDO.java
@@ -13,7 +13,7 @@ * @create: 2021-01-22 15:09 **/ @Data @TableName(value = "com_act_discuss") @TableName(value = "com_act_discuss_comment") public class ComActDiscussCommentDO implements Serializable { private static final long serialVersionUID = 1L;
New file @@ -0,0 +1,42 @@ package com.panzhihua.service_community.model.dos; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import java.io.Serializable; import java.util.Date; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 一起议评论点赞 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2021-01-23 13:59 **/ @Data @TableName(value = "com_act_discuss_comment_user") public class ComActDiscussCommentUserDO implements Serializable { private static final long serialVersionUID = 1L; /** * 主键 */ @TableId(type = IdType.AUTO) private Long id; /** * 评论主键 */ private Long disscussCommentId; /** * 用户主键 */ private Long userId; /** * 评论点赞时间 */ @TableField(fill = FieldFill.INSERT) private Date createAt; } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussDO.java
@@ -26,7 +26,7 @@ /** * 主题 */ private String subject; private String discussSubject; /** * 类型 1 图文 2 投票 @@ -62,7 +62,7 @@ /** * 1 单选 2 多选 */ private Integer option; private Integer discussOption; /** * 投票标题 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussUserDO.java
@@ -13,7 +13,7 @@ * @create: 2021-01-22 14:57 **/ @Data @TableName(value = "com_act_discuss") @TableName(value = "com_act_discuss_user") public class ComActDiscussUserDO implements Serializable { private static final long serialVersionUID = 1L;
@@ -1,6 +1,9 @@ package com.panzhihua.service_community.service; import com.panzhihua.common.model.dtos.community.ComActDiscussCommentDTO; import com.panzhihua.common.model.dtos.community.ComActDiscussDTO; import com.panzhihua.common.model.dtos.community.PageComActDiscussCommentDTO; import com.panzhihua.common.model.dtos.community.PageComActDiscussDTO; import com.panzhihua.common.model.vos.R; /** @@ -28,4 +31,40 @@ * @return 删除结果 */ R deleteDiscuss(Long id); /** * 一起议-回复 * @param comActDiscussCommentDTO 评论内容 * @return 回复结果 */ R addDiscussComment(ComActDiscussCommentDTO comActDiscussCommentDTO); /** * 一起议-分页查询 * @param pageComActDiscussDTO 查询参数 * @return ComActDiscussVO */ R pageDiscuss(PageComActDiscussDTO pageComActDiscussDTO); /** * 一起议-评论-查看 * @param id 主键 * @return 详情 */ R detailDiscusscomment(Long id); /** * 一起议-评论-置顶 * @param id 主键 * @return 置顶结果 */ R putDiscussCommentTop(Long id); /** * 一起议-评论-回复 * @param comActDiscussCommentDTO 回复内容 * @return 回复结果 */ R addDiscussCommentBack(ComActDiscussCommentDTO comActDiscussCommentDTO); /** * 一起议-评论-分页查询 * @param pageComActDiscussCommentDTO 分页查询参数 * @return ComActDiscussCommentVO */ R pageDiscussComment(PageComActDiscussCommentDTO pageComActDiscussCommentDTO); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDiscussServiceImpl.java
@@ -1,9 +1,16 @@ package com.panzhihua.service_community.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.model.dtos.community.ComActDiscussCommentDTO; import com.panzhihua.common.model.dtos.community.ComActDiscussDTO; import com.panzhihua.common.model.dtos.community.PageComActDiscussCommentDTO; import com.panzhihua.common.model.dtos.community.PageComActDiscussDTO; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComActDiscussCommentVO; import com.panzhihua.common.model.vos.community.ComActDiscussOptionVO; import com.panzhihua.common.model.vos.community.ComActDiscussVO; import com.panzhihua.service_community.dao.*; @@ -38,6 +45,8 @@ @Resource private ComActDiscussOptionDAO comActDiscussOptionDAO; @Resource private ComActDiscussCommentUserDAO comActDiscussCommentUserDAO; @Resource private ComActDiscussOptionService comActDiscussOptionService; /** @@ -53,7 +62,7 @@ BeanUtils.copyProperties(comActDiscussDTO,comActDiscussDO); int insert = comActDiscussDAO.insert(comActDiscussDO); if (insert>0) { ComActDiscussDO comActDiscussDO1 = comActDiscussDAO.selectOne(new QueryWrapper<ComActDiscussDO>().lambda().eq(ComActDiscussDO::getSubject, comActDiscussDTO.getSubject()).eq(ComActDiscussDO::getUserId, comActDiscussDTO.getUserId()).last(" order by create_at desc limit 1 ")); ComActDiscussDO comActDiscussDO1 = comActDiscussDAO.selectOne(new QueryWrapper<ComActDiscussDO>().lambda().eq(ComActDiscussDO::getDiscussSubject, comActDiscussDTO.getDiscussSubject()).eq(ComActDiscussDO::getUserId, comActDiscussDTO.getUserId()).last(" order by create_at desc limit 1 ")); Long comActDiscussDO1Id = comActDiscussDO1.getId(); Integer type = comActDiscussDTO.getType(); if (type.intValue()==2) { @@ -124,4 +133,158 @@ } return R.fail(); } /** * 一起议-回复 * @param comActDiscussCommentDTO 评论内容 * @return 回复结果 */ @Override public R addDiscussComment(ComActDiscussCommentDTO comActDiscussCommentDTO) { Long discussId = comActDiscussCommentDTO.getDiscussId(); ComActDiscussDO comActDiscussDO = comActDiscussDAO.selectById(discussId); if (ObjectUtils.isEmpty(comActDiscussDO)) { return R.fail("一起议不存在"); } ComActDiscussCommentDO comActDiscussCommentDO=new ComActDiscussCommentDO(); BeanUtils.copyProperties(comActDiscussCommentDTO,comActDiscussCommentDO); int insert = comActDiscussCommentDAO.insert(comActDiscussCommentDO); if (insert>0) { return R.ok(); } return R.fail(); } /** * 一起议-分页查询 * * @param pageComActDiscussDTO 查询参数 * @return ComActDiscussVO */ @Override public R pageDiscuss(PageComActDiscussDTO pageComActDiscussDTO) { Page page = new Page<>(); Long pageNum = pageComActDiscussDTO.getPageNum(); Long pageSize = pageComActDiscussDTO.getPageSize(); if (null==pageNum||0==pageNum) { pageNum = 1l; } if (null==pageSize||0==pageSize) { pageSize = 10l; } page.setSize(pageSize); page.setCurrent(pageNum); IPage<ComActDiscussVO> iPage = comActDiscussDAO.pageDiscuss(page, pageComActDiscussDTO); return R.ok(iPage); } /** * 一起议-评论-查看 * * @param id 主键 * @return 详情 ComActDiscussCommentVO */ @Override public R detailDiscusscomment(Long id) { ComActDiscussCommentDO comActDiscussCommentDO = comActDiscussCommentDAO.selectById(id); if (ObjectUtils.isEmpty(comActDiscussCommentDO)) { return R.fail("评论不存在"); } ComActDiscussCommentVO comActDiscussCommentVO=new ComActDiscussCommentVO(); Long parentId = comActDiscussCommentDO.getParentId(); if (parentId.intValue()==0) { // 一级评论 BeanUtils.copyProperties(comActDiscussCommentDO,comActDiscussCommentVO); }else { ComActDiscussCommentDO comActDiscussCommentDO1 = comActDiscussCommentDAO.selectById(parentId); BeanUtils.copyProperties(comActDiscussCommentDO1,comActDiscussCommentVO); comActDiscussCommentVO.setCommentBack(comActDiscussCommentDO.getComment()); comActDiscussCommentVO.setTimeBack(comActDiscussCommentDO.getCreateAt()); comActDiscussCommentVO.setParentId(parentId); } Integer count = comActDiscussCommentUserDAO.selectCount(new QueryWrapper<ComActDiscussCommentUserDO>().lambda().eq(ComActDiscussCommentUserDO::getDisscussCommentId, id)); comActDiscussCommentVO.setNum(count); LoginUserInfoVO loginUserInfoVO=comActDiscussDAO.selectUserByUserId(comActDiscussCommentDO.getUserId()); comActDiscussCommentVO.setUserName(loginUserInfoVO.getName()); comActDiscussCommentVO.setPhone(loginUserInfoVO.getPhone()); return R.ok(comActDiscussCommentVO); } /** * 一起议-评论-置顶 * * @param id 主键 * @return 置顶结果 */ @Override public R putDiscussCommentTop(Long id) { ComActDiscussCommentDO comActDiscussCommentDO = comActDiscussCommentDAO.selectById(id); if (ObjectUtils.isEmpty(comActDiscussCommentDO)) { return R.fail("评论不存在"); } Long parentId = comActDiscussCommentDO.getParentId(); if (parentId.intValue()!=0) { return R.fail("二级评论不能置顶"); } Long discussId = comActDiscussCommentDO.getDiscussId(); ComActDiscussCommentDO comActDiscussCommentDO1=new ComActDiscussCommentDO(); comActDiscussCommentDO1.setIsTopping(0); comActDiscussCommentDAO.update(comActDiscussCommentDO1,new UpdateWrapper<ComActDiscussCommentDO>().lambda().eq(ComActDiscussCommentDO::getDiscussId,discussId)); comActDiscussCommentDO1.setIsTopping(1); comActDiscussCommentDO1.setId(id); int update = comActDiscussCommentDAO.updateById(comActDiscussCommentDO1); if (update>0) { return R.ok(); } return R.fail(); } /** * 一起议-评论-回复 * * @param comActDiscussCommentDTO 回复内容 * @return 回复结果 */ @Override public R addDiscussCommentBack(ComActDiscussCommentDTO comActDiscussCommentDTO) { Long id = comActDiscussCommentDTO.getId(); ComActDiscussCommentDO comActDiscussCommentDO = comActDiscussCommentDAO.selectById(id); if (ObjectUtils.isEmpty(comActDiscussCommentDO)) { return R.fail("评论不存在"); } Long discussId = comActDiscussCommentDO.getDiscussId(); ComActDiscussCommentDO comActDiscussCommentDO1=new ComActDiscussCommentDO(); comActDiscussCommentDO1.setDiscussId(discussId); comActDiscussCommentDO1.setComment(comActDiscussCommentDTO.getComment()); comActDiscussCommentDO1.setUserId(comActDiscussCommentDTO.getUserId()); comActDiscussCommentDO1.setParentId(id); int insert = comActDiscussCommentDAO.insert(comActDiscussCommentDO1); if (insert>0) { return R.ok(); } return R.fail(); } /** * 一起议-评论-分页查询 * * @param pageComActDiscussCommentDTO 分页查询参数 * @return ComActDiscussCommentVO */ @Override public R pageDiscussComment(PageComActDiscussCommentDTO pageComActDiscussCommentDTO) { Page page = new Page<>(); Long pageNum = pageComActDiscussCommentDTO.getPageNum(); Long pageSize = pageComActDiscussCommentDTO.getPageSize(); if (null==pageNum||0==pageNum) { pageNum = 1l; } if (null==pageSize||0==pageSize) { pageSize = 10l; } page.setSize(pageSize); page.setCurrent(pageNum); IPage<ComActDiscussCommentVO> iPage = comActDiscussDAO.pageDiscussComment(page, pageComActDiscussCommentDTO); return R.ok(iPage); } } springcloud_k8s_panzhihuazhihuishequ/service_community/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: springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/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: 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: springcloud_k8s_panzhihuazhihuishequ/timejob/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: springcloud_k8s_panzhihuazhihuishequ/zuul/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:
