springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml
@@ -23,32 +23,28 @@ </component> <component name="ChangeListManager"> <list default="true" id="8ba27629-3e5d-4f42-993e-d0c055bc9371" name="Default Changelist" comment=""> <change afterPath="$PROJECT_DIR$/applets_backstage/src/main/java/com/panzhihua/applets_backstage/aop/OperLogAspect.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/interfaces/OperLog.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/user/MenuRoleVO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/user/SysOperLogVO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/user/SysUserAgreementVO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/utlis/IPUtil.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/dao/SysOperLogDAO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/dao/SysRoleMenuDAO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserAgreementDAO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysOperLogDO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysRoleMenuDO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserAgreementDO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/SystemmanagementConfigVO.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/aop/OperLogAspect.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/SystemManagementApi.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/IndexApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/applets_backstage/src/main/java/com/panzhihua/applets_backstage/AppletsBackstageApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets_backstage/src/main/java/com/panzhihua/applets_backstage/AppletsBackstageApplication.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/SystemManagementApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/SystemManagementApi.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/pom.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/user/SysMenuVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/user/SysMenuVO.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/ComMngUserTagVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngUserTagVO.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/user/SysMenuVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/user/SysMenuVO.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/ComMngUserTagVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/panzhihua/common/model/vos/user/ComMngUserTagVO.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$/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/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/model/dos/ComMngStructBuildTypeDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngStructBuildTypeDO.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/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/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_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_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/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/dao/UserDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/model/dos/ComMngUserTagDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/model/dos/ComMngUserTagDO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysMenuDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysMenuDO.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" /> @@ -64,8 +60,8 @@ <component name="FileTemplateManagerImpl"> <option name="RECENT_TEMPLATES"> <list> <option value="Class" /> <option value="Interface" /> <option value="Class" /> </list> </option> </component> @@ -116,11 +112,11 @@ </component> <component name="RecentsManager"> <key name="CopyClassDialog.RECENTS_KEY"> <recent name="com.panzhihua.community_backstage.aop" /> <recent name="com.panzhihua.community_backstage.api" /> <recent name="com.panzhihua.applets_backstage.aop" /> <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" /> </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" /> @@ -400,7 +396,7 @@ <workItem from="1608371107059" duration="646000" /> <workItem from="1608371917868" duration="79000" /> <workItem from="1608379508016" duration="46000" /> <workItem from="1608531425658" duration="122677000" /> <workItem from="1608531425658" duration="126772000" /> </task> <servers /> </component> @@ -424,10 +420,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="1608884062293"> <state x="574" y="118" key="#com.intellij.ide.util.MemberChooser" timestamp="1608887711448"> <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="1608884062293" /> <state x="574" y="118" key="#com.intellij.ide.util.MemberChooser/0.0.1536.824@0.0.1536.824" timestamp="1608887711448" /> <state x="405" y="335" key="#com.intellij.refactoring.move.MoveHandler.SelectRefactoringDialog" timestamp="1606099594079"> <screen x="0" y="0" width="1536" height="824" /> </state> @@ -452,54 +448,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="490" key="GridCell.Tab.0.bottom" timestamp="1608884771066"> <state width="1031" height="490" key="GridCell.Tab.0.bottom" timestamp="1608884849373"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="490" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1608884771066" /> <state width="1031" height="490" key="GridCell.Tab.0.center" timestamp="1608884771065"> <state width="1031" height="490" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1608884849373" /> <state width="1031" height="490" key="GridCell.Tab.0.center" timestamp="1608884849373"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="490" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1608884771065" /> <state width="1031" height="490" key="GridCell.Tab.0.left" timestamp="1608884771064"> <state width="1031" height="490" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1608884849373" /> <state width="1031" height="490" key="GridCell.Tab.0.left" timestamp="1608884849373"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="490" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1608884771064" /> <state width="1031" height="490" key="GridCell.Tab.0.right" timestamp="1608884771066"> <state width="1031" height="490" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1608884849373" /> <state width="1031" height="490" key="GridCell.Tab.0.right" timestamp="1608884849373"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="490" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1608884771066" /> <state width="1031" height="490" key="GridCell.Tab.1.bottom" timestamp="1608884771066"> <state width="1031" height="490" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1608884849373" /> <state width="1031" height="490" key="GridCell.Tab.1.bottom" timestamp="1608884849373"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="490" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1608884771066" /> <state width="1031" height="490" key="GridCell.Tab.1.center" timestamp="1608884771066"> <state width="1031" height="490" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1608884849373" /> <state width="1031" height="490" key="GridCell.Tab.1.center" timestamp="1608884849373"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="490" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1608884771066" /> <state width="1031" height="490" key="GridCell.Tab.1.left" timestamp="1608884771066"> <state width="1031" height="490" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1608884849373" /> <state width="1031" height="490" key="GridCell.Tab.1.left" timestamp="1608884849373"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="490" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1608884771066" /> <state width="1031" height="490" key="GridCell.Tab.1.right" timestamp="1608884771066"> <state width="1031" height="490" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1608884849373" /> <state width="1031" height="490" key="GridCell.Tab.1.right" timestamp="1608884849373"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="490" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1608884771066" /> <state width="1031" height="490" key="GridCell.Tab.2.bottom" timestamp="1608884771066"> <state width="1031" height="490" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1608884849373" /> <state width="1031" height="490" key="GridCell.Tab.2.bottom" timestamp="1608884849373"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="490" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1608884771066" /> <state width="1031" height="490" key="GridCell.Tab.2.center" timestamp="1608884771066"> <state width="1031" height="490" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1608884849373" /> <state width="1031" height="490" key="GridCell.Tab.2.center" timestamp="1608884849373"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="490" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1608884771066" /> <state width="1031" height="490" key="GridCell.Tab.2.left" timestamp="1608884771066"> <state width="1031" height="490" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1608884849373" /> <state width="1031" height="490" key="GridCell.Tab.2.left" timestamp="1608884849373"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="490" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1608884771066" /> <state width="1031" height="490" key="GridCell.Tab.2.right" timestamp="1608884771066"> <state width="1031" height="490" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1608884849373" /> <state width="1031" height="490" key="GridCell.Tab.2.right" timestamp="1608884849373"> <screen x="0" y="0" width="1536" height="824" /> </state> <state width="1031" height="490" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1608884771066" /> <state width="1031" height="490" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1608884849373" /> <state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1606714311663"> <screen x="0" y="0" width="1536" height="824" /> </state> springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/SystemmanagementConfigVO.java
New file @@ -0,0 +1,27 @@ package com.panzhihua.common.model.vos; import com.panzhihua.common.model.vos.community.ComMngStructBuildTypeVO; import com.panzhihua.common.model.vos.user.ComMngUserTagVO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.List; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 系统配置 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2020-12-25 16:53 **/ @Data @ApiModel(value = "系统配置") public class SystemmanagementConfigVO { @ApiModelProperty("建筑类型") List<ComMngStructBuildTypeVO> comMngStructBuildTypeVOList; @ApiModelProperty("用户标签") List<ComMngUserTagVO> comMngUserTagVOList; @ApiModelProperty("社区id") private Long communityId; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructBuildTypeVO.java
@@ -19,4 +19,7 @@ @ApiModelProperty("建筑类型名称") private String name; @ApiModelProperty(value = "社区id",hidden = true) private Long communityId; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngUserTagVO.java
@@ -6,12 +6,12 @@ /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 工作类型 * @description: 用户标签 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2020-12-14 17:27 **/ @Data @ApiModel("社区》社区管理》工作类型") @ApiModel("社区》社区管理》用户标签") public class ComMngUserTagVO { @ApiModelProperty("自增id") @@ -19,4 +19,7 @@ @ApiModelProperty("标签名称") private String tagName; @ApiModelProperty(value = "社区id",hidden = true) private Long communityId; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -1,6 +1,7 @@ package com.panzhihua.common.service.community; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.SystemmanagementConfigVO; import com.panzhihua.common.model.vos.community.*; import com.panzhihua.common.model.vos.user.UserPhoneVO; import org.springframework.cloud.openfeign.FeignClient; @@ -469,4 +470,20 @@ */ @PostMapping("putmicrowishconfirm") R putMicroWishConfirm(@RequestBody ComActMicroWishVO comActMicroWishVO); /** * 建筑类型 * @param communityId 社区id * @return 建筑集合 */ @PostMapping("listcommngstructbuildtype") R listComMngStructBuildType(@RequestParam("communityId") Long communityId); /** * 增加删除建筑类型 * @param systemmanagementConfigVO 操作内容 * @return 操作结果 */ @PostMapping("putcommngstructbuildtype") R putComMngStructBuildType(@RequestBody SystemmanagementConfigVO systemmanagementConfigVO); } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
@@ -3,6 +3,7 @@ import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.MenuVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.SystemmanagementConfigVO; import com.panzhihua.common.model.vos.user.*; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; @@ -320,4 +321,20 @@ */ @PostMapping("putagreement") R putAgreement(@RequestBody SysUserAgreementVO sysUserAgreementVO); /** * 用户标签 * @param communityId 社区id * @return 标签集合 */ @PostMapping("listcommngusertag") R listComMngUserTag(@RequestParam("communityId")Long communityId); /** * 新增删除用户标签 * @param systemmanagementConfigVO 操作内容 * @return 操作结果 */ @PostMapping("putcommngusertag") R putComMngUserTag(@RequestBody SystemmanagementConfigVO systemmanagementConfigVO); } springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/SystemmanagementConfigVO.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/ComMngUserTagVO.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/aop/OperLogAspect.java
New file @@ -0,0 +1,227 @@ package com.panzhihua.community_backstage.aop; import com.alibaba.fastjson.JSONObject; import com.panzhihua.common.constants.Constants; import com.panzhihua.common.constants.TokenConstant; import com.panzhihua.common.interfaces.OperLog; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.user.SysOperLogVO; import com.panzhihua.common.service.user.UserService; import com.panzhihua.common.utlis.AES; import com.panzhihua.common.utlis.IPUtil; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.AfterReturning; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Pointcut; import org.aspectj.lang.reflect.MethodSignature; import org.springframework.stereotype.Component; import org.springframework.util.ObjectUtils; import org.springframework.web.context.request.RequestAttributes; import org.springframework.web.context.request.RequestContextHolder; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.BufferedReader; import java.io.IOException; import java.lang.reflect.Method; import java.util.Date; import java.util.HashMap; import java.util.Map; /** * 切面处理类，操作日志异常日志记录处理 * * @author wu * @date 2019/03/21 */ @Slf4j @Aspect @Component public class OperLogAspect { @Resource private UserService userService; /** * 设置操作日志切入点 记录操作日志 在注解的位置切入代码 */ @Pointcut("@annotation(com.panzhihua.common.interfaces.OperLog)") public void operLogPoinCut() { } // /** // * 设置操作异常切入点记录异常日志 扫描所有controller包下操作 // */ // @Pointcut("execution(* com.hyd.zcar.cms.controller..*.*(..))") // public void operExceptionLogPoinCut() { // } /** * 正常返回通知，拦截用户操作日志，连接点正常执行完成后执行， 如果连接点抛出异常，则不会执行 * * @param joinPoint 切入点 * @param keys 返回结果 */ @AfterReturning(value = "operLogPoinCut()", returning = "keys") public void saveOperLog(JoinPoint joinPoint, Object keys) { log.info("进入切面"); // 获取RequestAttributes RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes(); // 从获取RequestAttributes中获取HttpServletRequest的信息 HttpServletRequest request = (HttpServletRequest) requestAttributes .resolveReference(RequestAttributes.REFERENCE_REQUEST); // 登录对象信息 String userInfo = request.getHeader(TokenConstant.TOKEN_USERINFO); boolean empty = ObjectUtils.isEmpty(userInfo); if (empty) { log.error("操作日志获取登录用户信息失败【{}】",joinPoint); return; } byte[] bytes = AES.parseHexStr2Byte(userInfo); byte[] decrypt = AES.decrypt(bytes, Constants.AES_KEY); userInfo=new String(decrypt); LoginUserInfoVO loginUserInfoVO= JSONObject.parseObject(userInfo,LoginUserInfoVO.class); SysOperLogVO operlog = new SysOperLogVO(); try { // 从切面织入点处通过反射机制获取织入点处的方法 MethodSignature signature = (MethodSignature) joinPoint.getSignature(); // 获取切入点所在的方法 Method method = signature.getMethod(); // 获取操作 OperLog opLog = method.getAnnotation(OperLog.class); if (opLog != null) { String operModul = opLog.operModul(); int operType = opLog.operType(); operlog.setTitle(operModul); // 操作模块 operlog.setBusinessType(operType); // 操作类型 } // 获取请求的类名 String className = joinPoint.getTarget().getClass().getName(); // 获取请求的方法名 String methodName = method.getName(); methodName = className + "." + methodName; operlog.setMethod(methodName); // 请求方法 if (joinPoint.getArgs().length > 0) { for (Object o : joinPoint.getArgs()) { if (o instanceof HttpServletRequest || o instanceof HttpServletResponse) { continue; } operlog.setOperParam(JSONObject.toJSONString(o)); // 请求参数 } } operlog.setJsonResult(JSONObject.toJSONString(keys)); // 返回结果 operlog.setAccount(loginUserInfoVO.getAccount()); operlog.setOperName(loginUserInfoVO.getName()); // 请求用户名称 operlog.setOperIp(IPUtil.getIpAddress(request)); // 请求IP operlog.setOperUrl(request.getRequestURI()); // 请求URI operlog.setRequestMethod(request.getMethod()); operlog.setOperLocation(IPUtil.getIpBelongAddress(request)); operlog.setOperTime(new Date()); // 创建时间 operlog.setAccount(loginUserInfoVO.getAccount()); Long communityId = loginUserInfoVO.getCommunityId(); operlog.setCommunityId(null==communityId?0:communityId); userService.addOperLog(operlog); } catch (Exception e) { e.printStackTrace(); } } // /** // * 异常返回通知，用于拦截异常日志信息 连接点抛出异常后执行 // * // * @param joinPoint 切入点 // * @param e 异常信息 // */ // @AfterThrowing(pointcut = "operExceptionLogPoinCut()", throwing = "e") // public void saveExceptionLog(JoinPoint joinPoint, Throwable e) { // // 获取RequestAttributes // RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes(); // // 从获取RequestAttributes中获取HttpServletRequest的信息 // HttpServletRequest request = (HttpServletRequest) requestAttributes // .resolveReference(RequestAttributes.REFERENCE_REQUEST); // // ExceptionLog excepLog = new ExceptionLog(); // try { // // 从切面织入点处通过反射机制获取织入点处的方法 // MethodSignature signature = (MethodSignature) joinPoint.getSignature(); // // 获取切入点所在的方法 // Method method = signature.getMethod(); // excepLog.setExcId(UuidUtil.get32UUID()); // // 获取请求的类名 // String className = joinPoint.getTarget().getClass().getName(); // // 获取请求的方法名 // String methodName = method.getName(); // methodName = className + "." + methodName; // // 请求的参数 // Map<String, String> rtnMap = converMap(request.getParameterMap()); // // 将参数所在的数组转换成json // String params = JSON.toJSONString(rtnMap); // excepLog.setExcRequParam(params); // 请求参数 // excepLog.setOperMethod(methodName); // 请求方法名 // excepLog.setExcName(e.getClass().getName()); // 异常名称 // excepLog.setExcMessage(stackTraceToString(e.getClass().getName(), e.getMessage(), e.getStackTrace())); // 异常信息 // excepLog.setOperUserId(UserShiroUtil.getCurrentUserLoginName()); // 操作员ID // excepLog.setOperUserName(UserShiroUtil.getCurrentUserName()); // 操作员名称 // excepLog.setOperUri(request.getRequestURI()); // 操作URI // excepLog.setOperIp(IPUtil.getRemortIP(request)); // 操作员IP // excepLog.setOperVer(operVer); // 操作版本号 // excepLog.setOperCreateTime(new Date()); // 发生异常时间 // // exceptionLogService.insert(excepLog); // // } catch (Exception e2) { // e2.printStackTrace(); // } // // } /** * 转换request 请求参数 * * @param paramMap request获取的参数数组 */ public Map<String, String> converMap(Map<String, String[]> paramMap) { Map<String, String> rtnMap = new HashMap<String, String>(); for (String key : paramMap.keySet()) { rtnMap.put(key, paramMap.get(key)[0]); } return rtnMap; } private String getPostData(HttpServletRequest request) { StringBuffer data = new StringBuffer(); String line = null; BufferedReader reader = null; try { reader = request.getReader(); while (null != (line = reader.readLine())) data.append(line); } catch (IOException e) { } finally { } return data.toString(); } /** * 转换异常信息为字符串 * * @param exceptionName 异常名称 * @param exceptionMessage 异常信息 * @param elements 堆栈信息 */ public String stackTraceToString(String exceptionName, String exceptionMessage, StackTraceElement[] elements) { StringBuffer strbuff = new StringBuffer(); for (StackTraceElement stet : elements) { strbuff.append(stet + "\n"); } String message = exceptionName + ":" + exceptionMessage + "\n\t" + strbuff.toString(); return message; } } springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/SystemManagementApi.java
New file @@ -0,0 +1,167 @@ package com.panzhihua.community_backstage.api; import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.interfaces.OperLog; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.SystemmanagementConfigVO; import com.panzhihua.common.model.vos.community.ComMngStructBuildTypeVO; import com.panzhihua.common.model.vos.user.*; import com.panzhihua.common.service.HanyuPinyinHelper; 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.ApiOperation; import org.springframework.util.ObjectUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.List; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 系统管理 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2020-12-24 09:19 **/ @Api(tags = {"系统管理"}) @RestController @RequestMapping("/systemmanagement/") public class SystemManagementApi extends BaseController { @Resource private UserService userService; @Resource private CommunityService communityService; @ApiOperation(value = "新增社区后台账户") @PostMapping("user") @OperLog(operModul = "用户管理",operType = 1) public R addUser(@RequestBody @Validated(AddGroup.class) AdministratorsUserVO administratorsUserVO){ administratorsUserVO.setType(3); administratorsUserVO.setAreaId(null); administratorsUserVO.setCommunityId(this.getCommunityId()); return userService.addUserBackstage(administratorsUserVO); } @ApiOperation(value = "编辑运营后台账户") @PutMapping("user") @OperLog(operModul = "用户管理",operType = 2) public R putUserBackstage(@RequestBody AdministratorsUserVO administratorsUserVO){ Long userId = administratorsUserVO.getUserId(); if (null==userId||0==userId) { return R.fail("用户主键不能为空"); } administratorsUserVO.setType(3); administratorsUserVO.setAreaId(null); administratorsUserVO.setCommunityId(this.getCommunityId()); Integer status = administratorsUserVO.getStatus(); if (null!=status&&status.intValue()==0) { administratorsUserVO.setStatus(null); } return userService.putUserBackstage(administratorsUserVO); } @ApiOperation(value = "删除后台用户") @DeleteMapping("user") @OperLog(operModul = "用户管理",operType = 3) public R deleteUserBackstage(@RequestBody AdministratorsUserVO administratorsUserVO){ Long userId = administratorsUserVO.getUserId(); if (null==userId||0==userId) { return R.fail("用户主键不能为空"); } return userService.deleteUserBackstage(administratorsUserVO); } @ApiOperation(value = "角色下拉列表",response = RoleVO.class) @GetMapping("listrolebackstage") public R listRoleBackstage(){ Long communityId=this.getCommunityId(); return userService.listRoleBackstage(communityId); } @ApiOperation(value = "分页查询后台用户",response = AdministratorsUserVO.class) @PostMapping("pageuser") public R pageUserBackstage(@RequestBody AdministratorsUserVO administratorsUserVO){ administratorsUserVO.setCommunityId(this.getCommunityId()); return userService.pageUserBackstage(administratorsUserVO); } @ApiOperation(value = "新增角色") @PostMapping("role") @OperLog(operModul = "角色管理",operType = 1) public R addRoleBackstage(@RequestBody RoleVO roleVO){ String roleName = roleVO.getRoleName(); if (ObjectUtils.isEmpty(roleName)) { return R.fail("角色名字不能为空"); } roleVO.setCommunityId(this.getCommunityId()); Long userId = this.getUserId(); roleVO.setCreateBy(userId); roleVO.setStatus(0); HanyuPinyinHelper hanyuPinyinHelper = new HanyuPinyinHelper() ; roleVO.setRoleKey(hanyuPinyinHelper.toHanyuPinyin(roleName)); return userService.addRoleBackstage(roleVO); } @ApiOperation(value = "删除角色") @DeleteMapping("role") @OperLog(operModul = "角色管理",operType = 3) public R deleteRoleBackstage(@RequestBody RoleVO roleVO){ Long roleId = roleVO.getRoleId(); if (null==roleId||0==roleId) { return R.fail("角色主键不能为空"); } return userService.deleteRoleBackstage(roleVO); } @ApiOperation(value = "运营平台权限配置列表",response = SysMenuVO.class) @GetMapping("listmenu") public R listMenuBackstage(){ int type=1; return userService.listMenuBackstage(type); } @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") public R pageOperLog(@RequestBody SysOperLogVO sysOperLogVO){ sysOperLogVO.setCommunityId(this.getCommunityId()); return userService.pageOperLog(sysOperLogVO); } @ApiOperation(value = "系统配置",response = SystemmanagementConfigVO.class) @PostMapping("config") public R config(){ Long communityId = this.getCommunityId(); R r=userService.listComMngUserTag(communityId); R r1=communityService.listComMngStructBuildType(communityId); SystemmanagementConfigVO systemmanagementConfigVO=new SystemmanagementConfigVO(); if (R.isOk(r)) { systemmanagementConfigVO.setComMngUserTagVOList((List<ComMngUserTagVO>)r.getData()); } if(R.isOk(r1)){ systemmanagementConfigVO.setComMngStructBuildTypeVOList((List<ComMngStructBuildTypeVO>)r1.getData()); } return R.ok(systemmanagementConfigVO); } @ApiOperation(value = "新增、删除系统配置") @PutMapping("config") public R putconfig(@RequestBody SystemmanagementConfigVO systemmanagementConfigVO){ Long communityId = this.getCommunityId(); systemmanagementConfigVO.setCommunityId(communityId); R r=userService.putComMngUserTag(systemmanagementConfigVO); R r1=communityService.putComMngStructBuildType(systemmanagementConfigVO); return R.ok(); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
@@ -848,4 +848,14 @@ return comActMicroWishService.putMicroWishConfirm(comActMicroWishVO); } /** * 建筑类型 * @param communityId 社区id * @return 建筑集合 */ @PostMapping("listcommngstructbuildtype") public R listComMngStructBuildType(@RequestParam("communityId") Long communityId){ return comMngStructOtherBuildService.listComMngStructBuildType(communityId); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngStructBuildTypeDO.java
@@ -28,4 +28,8 @@ * 建筑类型名称 */ private String name; /** * 社区id */ private Long communityId; } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActMicroWishService.java
@@ -43,4 +43,5 @@ * @return 确认结果 */ R putMicroWishConfirm(ComActMicroWishVO comActMicroWishVO); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngStructOtherBuildService.java
@@ -28,4 +28,10 @@ * @return 查询结果 */ R pageOtherBuild(ComMngStructOtherBuildVO comMngStructOtherBuildVO); /** * 建筑类型 * @param communityId 社区id * @return 建筑集合 */ R listComMngStructBuildType(Long communityId); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java
@@ -219,4 +219,6 @@ } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructOtherBuildServiceImpl.java
@@ -1,5 +1,6 @@ package com.panzhihua.service_community.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.panzhihua.common.model.vos.R; @@ -89,4 +90,25 @@ IPage<ComMngStructOtherBuildVO> iPage = comMngStructOtherBuildDAO.pageOtherBuild(page, comMngStructOtherBuildVO); return R.ok(iPage); } /** * 建筑类型 * * @param communityId 社区id * @return 建筑集合 */ @Override public R listComMngStructBuildType(Long communityId) { List<ComMngStructBuildTypeDO> comMngStructBuildTypeDOS = comMngStructBuildTypeDAO.selectList(new QueryWrapper<ComMngStructBuildTypeDO>().lambda().eq(ComMngStructBuildTypeDO::getCommunityId, communityId)); if (ObjectUtils.isEmpty(comMngStructBuildTypeDOS)) { return R.fail(); } List<ComMngStructBuildTypeVO> comMngStructBuildTypeVOList=new ArrayList<>(); comMngStructBuildTypeDOS.forEach(comMngStructBuildTypeDO -> { ComMngStructBuildTypeVO comMngStructBuildTypeVO=new ComMngStructBuildTypeVO(); BeanUtils.copyProperties(comMngStructBuildTypeDO,comMngStructBuildTypeVO); comMngStructBuildTypeVOList.add(comMngStructBuildTypeVO); }); return R.ok(comMngStructBuildTypeVOList); } } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
@@ -319,4 +319,14 @@ public R putAgreement(@RequestBody SysUserAgreementVO sysUserAgreementVO){ return userService.putAgreement(sysUserAgreementVO); } /** * 用户标签 * @param communityId 社区id * @return 标签集合 */ @PostMapping("listcommngusertag") public R listComMngUserTag(@RequestParam("communityId")Long communityId){ return userService.listComMngUserTag(communityId); } } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
@@ -113,6 +113,9 @@ "<if test='administratorsUserVO.name != null and administratorsUserVO.name.trim() != ""'>" + "AND u.name = #{administratorsUserVO.name} \n" + " </if> " + "<if test='administratorsUserVO.phone != null and administratorsUserVO.phone.trim() != ""'>" + "AND u.phone = #{administratorsUserVO.phone}" + " </if> " + "<if test='administratorsUserVO.account != null and administratorsUserVO.account.trim() != ""'>" + "AND u.account = #{administratorsUserVO.account}" + " </if> " + springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/ComMngUserTagDO.java
@@ -29,4 +29,9 @@ * 标签名称 */ private String tagName; /** * 社区id */ private Long communityId; } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysMenuDO.java
@@ -107,4 +107,8 @@ * 备注 */ private String remark; /** * 平台 1 运营后台 2 社区平台 */ private Integer type; } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
@@ -197,4 +197,10 @@ * @return 编辑结果 */ R putAgreement(SysUserAgreementVO sysUserAgreementVO); /** * 用户标签 * @param communityId 社区id * @return 标签集合 */ R listComMngUserTag(Long communityId); } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/RoleServiceImpl.java
@@ -165,7 +165,7 @@ @Override public R listMenuBackstage(int type) { List<SysMenuVO> sysMenuVOS=new ArrayList<>(); List<SysMenuDO> sysMenuDOS = sysMenuDAO.selectList(new QueryWrapper<SysMenuDO>().lambda().eq(SysMenuDO::getParentId, 0).orderByAsc(SysMenuDO::getOrderNum)); List<SysMenuDO> sysMenuDOS = sysMenuDAO.selectList(new QueryWrapper<SysMenuDO>().lambda().eq(SysMenuDO::getParentId, 0).eq(SysMenuDO::getType,type).orderByAsc(SysMenuDO::getOrderNum)); if (!ObjectUtils.isEmpty(sysMenuDOS)) { sysMenuDOS.forEach(sysMenuDO -> { SysMenuVO sysMenuVO=new SysMenuVO(); springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -822,6 +822,27 @@ return R.ok(); } /** * 用户标签 * * @param communityId 社区id * @return 标签集合 */ @Override public R listComMngUserTag(Long communityId) { List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO.selectList(new QueryWrapper<ComMngUserTagDO>().lambda().eq(ComMngUserTagDO::getCommunityId, communityId)); if (ObjectUtils.isEmpty(comMngUserTagDOS)) { return R.fail(); } List<ComMngUserTagVO> comMngUserTagVOList=new ArrayList<>(); comMngUserTagDOS.forEach(comMngUserTagDO -> { ComMngUserTagVO comMngUserTagVO=new ComMngUserTagVO(); BeanUtils.copyProperties(comMngUserTagDO,comMngUserTagVO); comMngUserTagVOList.add(comMngUserTagVO); }); return R.ok(comMngUserTagVOList); } public static void main(String[] args) { String encode = new BCryptPasswordEncoder().encode("123456"); System.out.println(encode);
