springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml
@@ -24,6 +24,32 @@ <component name="ChangeListManager"> <list default="true" id="8ba27629-3e5d-4f42-993e-d0c055bc9371" name="Default Changelist" comment=""> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/applets/src/main/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/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/ComMngStructBuildTypeVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructBuildTypeVO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/user/MenuRoleVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/user/MenuRoleVO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/service/user/UserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/service/user/UserService.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/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/ComMngStructBuildTypeVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/community/ComMngStructBuildTypeVO.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/user/MenuRoleVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/user/MenuRoleVO.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/service/community/CommunityService.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/service/community/CommunityService.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/service/user/UserService.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/service/user/UserService.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityManagerApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityManagerApi.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/SystemManagementApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/SystemManagementApi.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/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/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/ComMngStructOtherBuildService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/ComMngStructOtherBuildService.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/ComMngStructOtherBuildServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructOtherBuildServiceImpl.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/api/RoleApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/api/RoleApi.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/RoleService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/RoleService.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/impl/RoleServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/impl/RoleServiceImpl.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java" afterDir="false" /> </list> <option name="SHOW_DIALOG" value="false" /> @@ -177,15 +203,13 @@ <option name="Make" enabled="true" /> </method> </configuration> <configuration default="true" type="ArquillianTestNG" factoryName="" nameIsGenerated="true"> <configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true"> <option name="arquillianRunConfiguration"> <value> <option name="containerStateName" value="" /> </value> </option> <option name="TEST_OBJECT" value="CLASS" /> <properties /> <listeners /> <option name="TEST_OBJECT" value="class" /> <method v="2"> <option name="Make" enabled="true" /> </method> @@ -405,7 +429,8 @@ <workItem from="1610930834137" duration="517000" /> <workItem from="1610934956567" duration="1325000" /> <workItem from="1610939265133" duration="8588000" /> <workItem from="1610956684718" duration="4709000" /> <workItem from="1610956684718" duration="7037000" /> <workItem from="1611019208339" duration="9905000" /> </task> <servers /> </component> @@ -429,10 +454,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="1610429000238"> <state x="574" y="118" key="#com.intellij.ide.util.MemberChooser" timestamp="1611023249114"> <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="1610429000238" /> <state x="574" y="118" key="#com.intellij.ide.util.MemberChooser/0.0.1536.824@0.0.1536.824" timestamp="1611023249114" /> <state x="405" y="335" key="#com.intellij.refactoring.move.MoveHandler.SelectRefactoringDialog" timestamp="1606099594079"> <screen x="0" y="0" width="1536" height="824" /> </state> @@ -445,10 +470,10 @@ <screen x="0" y="0" width="1536" height="824" /> </state> <state x="499" y="159" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/0.0.1536.824@0.0.1536.824" timestamp="1608878808962" /> <state width="561" height="466" key="DebuggerActiveHint" timestamp="1609929761399"> <state width="561" height="466" key="DebuggerActiveHint" timestamp="1611021304034"> <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="1609929761399" /> <state width="561" height="466" key="DebuggerActiveHint/0.0.1536.824@0.0.1536.824" timestamp="1611021304034" /> <state x="93" y="93" width="1350" height="638" key="DiffContextDialog" timestamp="1609316182000"> <screen x="0" y="0" width="1536" height="824" /> </state> @@ -457,54 +482,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="248" key="GridCell.Tab.0.bottom" timestamp="1610961345718"> <state width="1031" height="416" key="GridCell.Tab.0.bottom" timestamp="1611029941982"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="248" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610961345718" /> <state width="1031" height="248" key="GridCell.Tab.0.center" timestamp="1610961345718"> <state width="1031" height="416" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611029941982" /> <state width="1031" height="416" key="GridCell.Tab.0.center" timestamp="1611029941981"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="248" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1610961345718" /> <state width="1031" height="248" key="GridCell.Tab.0.left" timestamp="1610961345717"> <state width="1031" height="416" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1611029941981" /> <state width="1031" height="416" key="GridCell.Tab.0.left" timestamp="1611029941980"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="248" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1610961345717" /> <state width="1031" height="248" key="GridCell.Tab.0.right" timestamp="1610961345718"> <state width="1031" height="416" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1611029941980" /> <state width="1031" height="416" key="GridCell.Tab.0.right" timestamp="1611029941982"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="248" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1610961345718" /> <state width="1031" height="248" key="GridCell.Tab.1.bottom" timestamp="1610961345718"> <state width="1031" height="416" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1611029941982" /> <state width="1031" height="416" key="GridCell.Tab.1.bottom" timestamp="1611029941982"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="248" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610961345718" /> <state width="1031" height="248" key="GridCell.Tab.1.center" timestamp="1610961345718"> <state width="1031" height="416" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611029941982" /> <state width="1031" height="416" key="GridCell.Tab.1.center" timestamp="1611029941982"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="248" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1610961345718" /> <state width="1031" height="248" key="GridCell.Tab.1.left" timestamp="1610961345718"> <state width="1031" height="416" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1611029941982" /> <state width="1031" height="416" key="GridCell.Tab.1.left" timestamp="1611029941982"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="248" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1610961345718" /> <state width="1031" height="248" key="GridCell.Tab.1.right" timestamp="1610961345718"> <state width="1031" height="416" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1611029941982" /> <state width="1031" height="416" key="GridCell.Tab.1.right" timestamp="1611029941982"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="248" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1610961345718" /> <state width="1031" height="248" key="GridCell.Tab.2.bottom" timestamp="1610961345718"> <state width="1031" height="416" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1611029941982" /> <state width="1031" height="416" key="GridCell.Tab.2.bottom" timestamp="1611029941982"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="248" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610961345718" /> <state width="1031" height="248" key="GridCell.Tab.2.center" timestamp="1610961345718"> <state width="1031" height="416" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611029941982" /> <state width="1031" height="416" key="GridCell.Tab.2.center" timestamp="1611029941982"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="248" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1610961345718" /> <state width="1031" height="248" key="GridCell.Tab.2.left" timestamp="1610961345718"> <state width="1031" height="416" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1611029941982" /> <state width="1031" height="416" key="GridCell.Tab.2.left" timestamp="1611029941982"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="248" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1610961345718" /> <state width="1031" height="248" key="GridCell.Tab.2.right" timestamp="1610961345718"> <state width="1031" height="416" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1611029941982" /> <state width="1031" height="416" key="GridCell.Tab.2.right" timestamp="1611029941982"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="248" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1610961345718" /> <state width="1031" height="416" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1611029941982" /> <state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1610611848124"> <screen x="0" y="0" width="1536" height="824" /> </state> @@ -513,22 +538,22 @@ <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="1610956123833"> <state width="498" height="540" key="SwitcherDM" timestamp="1611020456179"> <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="1610956123833" /> <state width="498" height="540" key="SwitcherDM/0.0.1536.824@0.0.1536.824" timestamp="1611020456179" /> <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> <state x="93" y="93" width="1350" height="638" key="com.intellij.history.integration.ui.views.DirectoryHistoryDialog/0.0.1536.824@0.0.1536.824" timestamp="1609398421992" /> <state x="93" y="93" width="1350" height="638" key="com.intellij.history.integration.ui.views.FileHistoryDialog" timestamp="1610939578806"> <state x="93" y="93" width="1350" height="639" key="com.intellij.history.integration.ui.views.FileHistoryDialog" timestamp="1611023689827"> <screen x="0" y="0" width="1536" height="824" /> </state> <state x="93" y="93" width="1350" height="638" key="com.intellij.history.integration.ui.views.FileHistoryDialog/0.0.1536.824@0.0.1536.824" timestamp="1610939578806" /> <state x="468" y="42" width="766" height="782" key="find.popup" timestamp="1610961508400"> <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="1611023689827" /> <state x="468" y="42" width="766" height="782" key="find.popup" timestamp="1611029216462"> <screen x="0" y="0" width="1536" height="824" /> </state> <state x="468" y="42" width="766" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1610961508400" /> <state x="468" y="42" width="766" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1611029216462" /> <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/java/com/panzhihua/applets/api/IndexApi.java
@@ -105,6 +105,7 @@ comActMicroWishVO.setCommunityId(communityId); comActMicroWishVO.setIsApplets(1); comActMicroWishVO.setResponsibleId(userId);//责任人暂时放登录用户id comActMicroWishVO.setIsPageMyWish(null); return communityService.pageMicroWish(comActMicroWishVO); }
@@ -208,6 +208,13 @@ Long userId = this.getUserId(); comActMicroWishVO.setUserId(userId); comActMicroWishVO.setCommunityId(null); Integer status = comActMicroWishVO.getStatus(); if (null!=status&&status==1) { comActMicroWishVO.setIsPageMyWish(1); }else{ comActMicroWishVO.setIsPageMyWish(null); } return communityService.pageMicroWish(comActMicroWishVO); }
@@ -135,5 +135,8 @@ @ApiModelProperty(value = "社区后台登录用户",hidden = true) private Long backUserId; @ApiModelProperty(value = "是否是分页查询微心愿接口调用",hidden = true) private Integer isPageMyWish; }
@@ -11,7 +11,7 @@ * @create: 2020-12-14 17:03 **/ @Data @ApiModel("其他建筑") @ApiModel("其他建筑-查询") public class ComMngStructBuildTypeVO { @ApiModelProperty("自增id") springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/MenuRoleVO.java
@@ -23,10 +23,9 @@ private Integer isAll; @ApiModelProperty("所有菜单id集合") private List<Long> menuIds; @ApiModelProperty(value = "被操作的角色id",hidden = true) @ApiModelProperty(value = "被操作的角色id-编辑时使用") private Long roleId; @ApiModelProperty(value = "角色名字",required = true) @NotBlank(message = "角色名字不能为空") @ApiModelProperty(value = "角色名字") private String roleName; @ApiModelProperty(value = "所在社区",hidden = true) private Long communityId; springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -625,4 +625,27 @@ @PostMapping("timedtaskactactivityall") R timedTaskActActivityAll(); /** * 其他建筑详情 * @param id 主键id * @return 建筑内容 */ @PostMapping("detailotherbuild") R detailOtherbuild(@RequestParam("id")Long id); /** * 编辑其他建筑 * @param comMngStructOtherBuildVO 编辑内容 * @return 编辑结果 */ @PostMapping("putotherbuild") R putOtherbuild(@RequestBody ComMngStructOtherBuildVO comMngStructOtherBuildVO); /** * 删除其他建筑 * @param id 主键 * @return 删除结果 */ @PostMapping("deleteotherbuild") R deleteOtherbuild(@RequestParam("id")Long id); } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
@@ -468,4 +468,12 @@ */ @PostMapping("updateuserispartymember") R updateUserIsPartymember(@RequestParam("idCard")String idCard); /** * 获取角色的权限配置列表 * @param roleId 角色id * @return 菜单列表 */ @PostMapping("/role/listmenubackstagebyrole") R listMenuBackstageByRole(@RequestParam("roleId") Long roleId); } 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/ComMngStructBuildTypeVO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/user/MenuRoleVO.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/service/community/CommunityService.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/service/user/UserService.classBinary files differ
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java
@@ -249,6 +249,7 @@ Long userId = loginUserInfo.getUserId(); comActMicroWishVO.setCommunityId(communityId); comActMicroWishVO.setBackUserId(userId); comActMicroWishVO.setIsPageMyWish(null); return communityService.pageMicroWish(comActMicroWishVO); }
@@ -137,6 +137,13 @@ return communityService.pageArea(comMngStructAreaVO); } @ApiOperation(value = "小区基础信息",response =ComMngStructAreaVO.class ) @GetMapping("area") @ApiImplicitParam(name = "id",value = "主键") public R detailArea(@RequestParam("id") Long id){ return communityService.detailArea(id); } @ApiOperation(value = "编辑小区") @PutMapping("area") public R putArea(@RequestBody ComMngStructAreaVO comMngStructAreaVO){ @@ -211,7 +218,39 @@ @ApiOperation(value = "新增其他建筑") @PostMapping("otherbuild") public R addOtherbuild(@RequestBody ComMngStructOtherBuildVO comMngStructOtherBuildVO){ comMngStructOtherBuildVO.setCommunityId(this.getCommunityId()); return communityService.addOtherbuild(comMngStructOtherBuildVO); } @ApiOperation(value = "其他建筑详情",response = ComMngStructOtherBuildVO.class) @GetMapping("otherbuild") public R addOtherbuild(@RequestParam("id") Long id){ return communityService.detailOtherbuild(id); } @ApiOperation(value = "删除其他建筑") @DeleteMapping("otherbuild") public R deleteOtherbuild(@RequestParam("id") Long id){ return communityService.deleteOtherbuild(id); } @ApiOperation(value = "编辑其他建筑") @PutMapping("otherbuild") public R putOtherbuild(@RequestBody ComMngStructOtherBuildVO comMngStructOtherBuildVO){ Long id = comMngStructOtherBuildVO.getId(); if (null==id||id==0) { return R.fail("主键不能为空"); } comMngStructOtherBuildVO.setCommunityId(this.getCommunityId()); Double square = comMngStructOtherBuildVO.getSquare(); if (0==square) { comMngStructOtherBuildVO.setSquare(null); } Integer state = comMngStructOtherBuildVO.getState(); if (null!=state&&0==state) { comMngStructOtherBuildVO.setState(null); } return communityService.putOtherbuild(comMngStructOtherBuildVO); } @ApiOperation(value = "查询所有建筑类型",response = ComMngStructBuildTypeVO.class) @@ -220,6 +259,7 @@ return communityService.listBuildType(); } @ApiOperation(value = "分页查询其他建筑",response = ComMngStructOtherBuildVO.class) @PostMapping("pageotherbuild") public R pageOtherBuild(@RequestBody ComMngStructOtherBuildVO comMngStructOtherBuildVO){ springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/SystemManagementApi.java
@@ -12,6 +12,7 @@ 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 org.springframework.util.ObjectUtils; import org.springframework.validation.annotation.Validated; @@ -124,10 +125,17 @@ return userService.listMenuBackstage(communityId); } @ApiOperation(value = "获取角色的权限配置列表",response = SysMenuVO.class) @GetMapping("listmenurole") @ApiImplicitParam(name = "roleId",value = "角色id") public R listMenuBackstageByRole(@RequestParam("roleId") Long roleId){ return userService.listMenuBackstageByRole(roleId); } @ApiOperation(value = "新增角色-设置角色的权限") @PutMapping("menu") @OperLog(operModul = "角色管理",operType = 2) public R putMenuRole(@RequestBody @Validated MenuRoleVO menuRoleVO){ @PostMapping("menu") @OperLog(operModul = "角色管理",operType = 1) public R addMenuRole(@RequestBody @Validated MenuRoleVO menuRoleVO){ RoleVO roleVO=new RoleVO(); String roleName = menuRoleVO.getRoleName(); if (ObjectUtils.isEmpty(roleName)) { @@ -152,6 +160,12 @@ return r; } @ApiOperation(value = "设置角色的权限") @PutMapping("menu") @OperLog(operModul = "角色管理",operType = 2) public R putMenuRole(@RequestBody @Validated MenuRoleVO menuRoleVO){ return userService.putMenuRole(menuRoleVO); } @ApiOperation(value = "分页展示操作日志",response = SysOperLogVO.class) @PostMapping("pageoperlog") springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
@@ -615,7 +615,22 @@ */ @PostMapping("batchhouse") public R batchHouse(@RequestBody BatchhouseVO batchhouseVO) { return comMngStructHouseService.batchHouse(batchhouseVO); R r = comMngStructHouseService.batchHouse(batchhouseVO); if (R.isOk(r)) { String areaCode = batchhouseVO.getAreaCode(); String ruleDoor = batchhouseVO.getRuleDoor(); String ruleConnector = batchhouseVO.getRuleConnector(); String ruleFloor = batchhouseVO.getRuleFloor(); ComMngStructAreaVO comMngStructAreaVO=new ComMngStructAreaVO(); comMngStructAreaVO.setRoleDoor(ruleDoor); comMngStructAreaVO.setRoleFloor(ruleFloor); comMngStructAreaVO.setRoleConnector(ruleConnector); comMngStructAreaVO.setAreaCode(areaCode); comMngStructAreaVO.setCommunityId(null); comMngStructAreaVO.setIsAccumulation(null); comMngStructAreaService.putArea(comMngStructAreaVO); } return r; } /** @@ -1013,5 +1028,35 @@ return comActActivityService.timedTaskActActivityAll(); } /** * 其他建筑详情 * @param id 主键id * @return 建筑内容 */ @PostMapping("detailotherbuild") public R detailOtherbuild(@RequestParam("id")Long id){ return comMngStructOtherBuildService.detailOtherbuild(id); } /** * 编辑其他建筑 * @param comMngStructOtherBuildVO 编辑内容 * @return 编辑结果 */ @PostMapping("putotherbuild") public R putOtherbuild(@RequestBody ComMngStructOtherBuildVO comMngStructOtherBuildVO){ return comMngStructOtherBuildService.putOtherbuild(comMngStructOtherBuildVO); } /** * 删除其他建筑 * @param id 主键 * @return 删除结果 */ @PostMapping("deleteotherbuild") public R deleteOtherbuild(@RequestParam("id")Long id){ return comMngStructOtherBuildService.deleteOtherbuild(id); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java
@@ -22,7 +22,6 @@ public interface ComActMicroWishDAO extends BaseMapper<ComActMicroWishDO> { @Select("<script> " + "select * from ( "+ "SELECT\n" + "w.id,\n" + "u.name sponsor_name,\n" + @@ -56,15 +55,18 @@ " JOIN sys_user su ON w.responsible_id = su.user_id \n" + "AND su.`name` like concat(#{comActMicroWishVO.responsibleName},'%') \n" + " </if> " + "where w.status!=3 " + " <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 like concat(#{comActMicroWishVO.sponsorPhone},'%') \n" + " </if> " + "<if test='comActMicroWishVO.status != null and comActMicroWishVO.status!=0 '>" + "<if test='comActMicroWishVO.status != null and comActMicroWishVO.status!=0 and comActMicroWishVO.isPageMyWish==null'>" + "AND w.`status` = #{comActMicroWishVO.status} \n" + " </if> " + "<if test='comActMicroWishVO.status != null and comActMicroWishVO.status!=0 and comActMicroWishVO.isPageMyWish!=null and comActMicroWishVO.status==1'>" + "AND w.`status` in (1,2) \n" + " </if> " + "<if test='comActMicroWishVO.createBegin != null '>" + "AND w.create_at BETWEEN #{comActMicroWishVO.createBegin} \n" + @@ -76,69 +78,15 @@ "<if test='comActMicroWishVO.userId != null and comActMicroWishVO.userId != 0'>" + "AND w.sponsor_id =#{comActMicroWishVO.userId} \n" + " </if> " + "<if test='comActMicroWishVO.backUserId != null and comActMicroWishVO.backUserId != 0 and comActMicroWishVO.status==3 '>" + "AND w.responsible_id =#{comActMicroWishVO.backUserId} \n" + " </if> " + "<if test='comActMicroWishVO.backUserId != null and comActMicroWishVO.backUserId != 0 and comActMicroWishVO.status==0 '>" + "and (w.status in(1,2,4,5,6) or (w.status=3 and w.responsible_id =#{comActMicroWishVO.backUserId}))\n" + " </if> " + " </where>" + " group by w.id \n"+ "union all "+ "SELECT\n" + "w.id,\n" + "u.name sponsor_name,\n" + "u.image_url ,\n" + "w.sponsor_phone,\n" + "w.wish_name,\n" + "w.`status`,\n" + "w.`feedback_at`,\n" + "w.`examine_at`,\n" + "w.`distribution_at`,\n" + "w.`evaluate_at`,\n" + "w.`photo_path_list`,\n" + "count(wu.id)star_num,\n" + "w.`detail`,\n" + "w.form,\n" + "w.reject_reason,\n" + "su.`name` responsible_name,\n" + "w.score,\n" + "w.create_at \n" + "FROM\n" + "com_act_micro_wish w\n" + "left join com_act_micro_wish_user wu on w.id=wu.micro_wish_id "+ "JOIN sys_user u ON w.sponsor_id = u.user_id \n" + "<if test='comActMicroWishVO.sponsorName != null and comActMicroWishVO.sponsorName.trim() != ""'>" + "AND u.name like concat(#{comActMicroWishVO.sponsorName},'%') \n" + " </if> " + "<if test='comActMicroWishVO.responsibleName == null or comActMicroWishVO.responsibleName.trim() == ""'>" + "LEFT JOIN sys_user su ON w.responsible_id = su.user_id \n" + " </if> " + "<if test='comActMicroWishVO.responsibleName != null and comActMicroWishVO.responsibleName.trim() != ""'>" + " JOIN sys_user su ON w.responsible_id = su.user_id \n" + "AND su.`name` like concat(#{comActMicroWishVO.responsibleName},'%') \n" + " </if> " + "where w.status=3 and w.form=1 \n" + "<if test='comActMicroWishVO.backUserId != null and comActMicroWishVO.backUserId != 0'>" + "and w.responsible_id=#{comActMicroWishVO.backUserId} \n"+ " </if> " + "<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 like concat(#{comActMicroWishVO.sponsorPhone},'%') \n" + " </if> " + "<if test='comActMicroWishVO.status != null and comActMicroWishVO.status!=0 '>" + "AND w.`status` = #{comActMicroWishVO.status} \n" + " </if> " + "<if test='comActMicroWishVO.createBegin != null '>" + "AND w.create_at BETWEEN #{comActMicroWishVO.createBegin} \n" + "AND #{comActMicroWishVO.createEnd}" + " </if> " + "<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> " + " group by w.id )t\n"+ "ORDER BY t.`status` asc, t.create_at desc "+ "ORDER BY w.`status` asc, w.create_at desc "+ "</script>") IPage<ComActMicroWishVO> pageMicroWish(Page page, @Param("comActMicroWishVO") ComActMicroWishVO comActMicroWishVO); @Select("SELECT\n" + springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActActivityService.java
@@ -96,4 +96,5 @@ * @return 更新结果 */ R timedTaskActActivityAll(); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngStructOtherBuildService.java
@@ -41,4 +41,22 @@ * @return 操作结果 */ R putComMngStructBuildType(SystemmanagementConfigVO systemmanagementConfigVO); /** * 其他建筑详情 * @param id 主键id * @return 建筑内容 */ R detailOtherbuild(Long id); /** * 编辑其他建筑 * @param comMngStructOtherBuildVO 编辑内容 * @return 编辑结果 */ R putOtherbuild(ComMngStructOtherBuildVO comMngStructOtherBuildVO); /** * 删除其他建筑 * @param id 主键 * @return 删除结果 */ R deleteOtherbuild(Long id); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
@@ -322,4 +322,6 @@ } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructOtherBuildServiceImpl.java
@@ -63,8 +63,8 @@ List<ComMngStructBuildTypeVO>comMngStructBuildTypeVOS=new ArrayList<>(); List<ComMngStructBuildTypeDO> comMngStructBuildTypeDOS = comMngStructBuildTypeDAO.selectList(null); if (!ObjectUtils.isEmpty(comMngStructBuildTypeDOS)) { ComMngStructBuildTypeVO comMngStructBuildTypeVO=new ComMngStructBuildTypeVO(); comMngStructBuildTypeDOS.forEach(comMngStructBuildTypeDO -> { ComMngStructBuildTypeVO comMngStructBuildTypeVO=new ComMngStructBuildTypeVO(); BeanUtils.copyProperties(comMngStructBuildTypeDO,comMngStructBuildTypeVO); comMngStructBuildTypeVOS.add(comMngStructBuildTypeVO); }); @@ -151,4 +151,64 @@ }); return R.ok(); } /** * 其他建筑详情 * * @param id 主键id * @return 建筑内容 */ @Override public R detailOtherbuild(Long id) { ComMngStructOtherBuildDO comMngStructOtherBuildDO = comMngStructOtherBuildDAO.selectById(id); if (ObjectUtils.isEmpty(comMngStructOtherBuildDO)) { return R.fail("建筑不存在"); } Long typeId = comMngStructOtherBuildDO.getTypeId(); ComMngStructBuildTypeDO comMngStructBuildTypeDO = comMngStructBuildTypeDAO.selectById(typeId); if (ObjectUtils.isEmpty(comMngStructBuildTypeDO)) { return R.fail("建筑类型不存在"); } ComMngStructOtherBuildVO comMngStructOtherBuildVO=new ComMngStructOtherBuildVO(); BeanUtils.copyProperties(comMngStructOtherBuildDO,comMngStructOtherBuildVO); comMngStructOtherBuildVO.setBuileTypeName(comMngStructBuildTypeDO.getName()); return R.ok(comMngStructOtherBuildVO); } /** * 编辑其他建筑 * * @param comMngStructOtherBuildVO 编辑内容 * @return 编辑结果 */ @Override public R putOtherbuild(ComMngStructOtherBuildVO comMngStructOtherBuildVO) { Long typeId = comMngStructOtherBuildVO.getTypeId(); ComMngStructBuildTypeDO comMngStructBuildTypeDO = comMngStructBuildTypeDAO.selectById(typeId); if (ObjectUtils.isEmpty(comMngStructBuildTypeDO)) { return R.fail("建筑类型不存在"); } ComMngStructOtherBuildDO comMngStructOtherBuildDO=new ComMngStructOtherBuildDO(); BeanUtils.copyProperties(comMngStructOtherBuildVO,comMngStructOtherBuildDO); int update = comMngStructOtherBuildDAO.updateById(comMngStructOtherBuildDO); if (update>0) { return R.ok("编辑成功过"); } return R.fail("编辑失败"); } /** * 删除其他建筑 * * @param id 主键 * @return 删除结果 */ @Override public R deleteOtherbuild(Long id) { int delete = comMngStructOtherBuildDAO.deleteById(id); if (delete>0) { return R.ok(); } return R.fail("删除失败"); } } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/RoleApi.java
@@ -110,4 +110,14 @@ public R listmenu(@RequestParam("userId")Long userId){ return roleService.listmenu(userId); } /** * 获取角色的权限配置列表 * @param roleId 角色id * @return 菜单列表 */ @PostMapping("listmenubackstagebyrole") public R listMenuBackstageByRole(@RequestParam("roleId") Long roleId){ return roleService.listMenuBackstageByRole(roleId); } } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
@@ -495,4 +495,6 @@ public R updateUserIsPartymember(@RequestParam("idCard")String idCard){ return userService.updateUserIsPartymember(idCard); } } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/RoleService.java
@@ -69,4 +69,11 @@ * @return 用户菜单 */ R listmenu(Long userId); /** * 获取角色的权限配置列表 * @param roleId 角色id * @return 菜单列表 */ R listMenuBackstageByRole(Long roleId); } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
@@ -304,4 +304,5 @@ * @return 修改结果 */ R updateUserIsPartymember(String idCard); } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/RoleServiceImpl.java
@@ -27,6 +27,7 @@ import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; /** * @program: springcloud_k8s_panzhihuazhihuishequ @@ -254,4 +255,28 @@ return R.ok(collect1); } /** * 获取角色的权限配置列表 * * @param roleId 角色id * @return 菜单列表 */ @Override public R listMenuBackstageByRole(Long roleId) { List<SysMenuVO> sysMenuVOS=new ArrayList<>(); List<SysRoleMenuDO> sysRoleMenuDOS = sysRoleMenuDAO.selectList(new QueryWrapper<SysRoleMenuDO>().lambda().eq(SysRoleMenuDO::getRoleId, roleId)); if (!ObjectUtils.isEmpty(sysRoleMenuDOS)) { List<Long> longs = sysRoleMenuDOS.stream().map(sysRoleMenuDO -> sysRoleMenuDO.getMenuId()).collect(Collectors.toList()); List<SysMenuDO> sysMenuDOS = sysMenuDAO.selectList(new QueryWrapper<SysMenuDO>().lambda().in(SysMenuDO::getMenuId,longs)); if (!ObjectUtils.isEmpty(sysMenuDOS)) { sysMenuDOS.forEach(sysMenuDO -> { SysMenuVO sysMenuVO1=new SysMenuVO(); BeanUtils.copyProperties(sysMenuDO,sysMenuVO1); sysMenuVOS.add(sysMenuVO1); }); } } return R.ok(sysMenuVOS); } } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -1274,6 +1274,8 @@ return R.fail(); } public static void main(String[] args) { String encode = new BCryptPasswordEncoder().encode("admin123456"); System.out.println(encode);
