diff --git a/epmet-module/gov-access/gov-access-client/pom.xml b/epmet-module/gov-access/gov-access-client/pom.xml index b20a28582a..a0cf511f5f 100644 --- a/epmet-module/gov-access/gov-access-client/pom.xml +++ b/epmet-module/gov-access/gov-access-client/pom.xml @@ -17,5 +17,11 @@ epmet-commons-tools 2.0.0 + + io.swagger + swagger-annotations + 1.5.20 + compile + \ No newline at end of file diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/GovLanguageDTO.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/GovLanguageDTO.java new file mode 100644 index 0000000000..ed7f5924db --- /dev/null +++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/GovLanguageDTO.java @@ -0,0 +1,61 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dto; + +import lombok.Data; + +import java.io.Serializable; + + +/** + * 国际化 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-03-18 + */ +@Data +public class GovLanguageDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 表名 + */ + private String tableName; + + /** + * 表主键 + */ + private String tableId; + + /** + * 字段名 + */ + private String fieldName; + + /** + * 字段值 + */ + private String fieldValue; + + /** + * 语言 + */ + private String language; + +} \ No newline at end of file diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/GovMenuDTO.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/GovMenuDTO.java new file mode 100644 index 0000000000..fb130e9c65 --- /dev/null +++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/GovMenuDTO.java @@ -0,0 +1,124 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dto; + +import com.epmet.commons.tools.utils.TreeStringNode; +import com.epmet.dto.result.MenuResourceDTO; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + + +/** + * 菜单管理 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-03-18 + */ +@Data +public class GovMenuDTO extends TreeStringNode implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * id + */ + private String id; + + /** + * 上级ID，一级菜单为0 + */ + private String pid; + + /** + * 菜单名称 + */ + private String name; + + /** + * 菜单URL + */ + private String url; + + /** + * 类型 0：菜单 1：按钮 + */ + private Integer type; + + /** + * 菜单图标 + */ + private String icon; + + /** + * 权限标识，如：sys:menu:save + */ + private String permissions; + + /** + * 排序 + */ + private Integer sort; + + /** + * 删除标识：0.未删除 1.已删除 + */ + private Integer delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + + /** + * 菜单资源 + */ + private List resourceList; + + /** + * 上级菜单名称 + */ + private String parentName; + + /** + * 是否显示，1：显示 0不显示 + */ + private Integer showFlag; +} \ No newline at end of file diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/GovResourceDTO.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/GovResourceDTO.java new file mode 100644 index 0000000000..59a9576598 --- /dev/null +++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/GovResourceDTO.java @@ -0,0 +1,102 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 资源管理 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-03-18 + */ +@Data +public class GovResourceDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * id + */ + private String id; + + /** + * 资源编码，如菜单ID + */ + private String resourceCode; + + /** + * 资源名称 + */ + private String resourceName; + + /** + * 资源URL + */ + private String resourceUrl; + + /** + * 请求方式（如：GET、POST、PUT、DELETE） + */ + private String resourceMethod; + + /** + * 菜单标识 0：非菜单资源 1：菜单资源 + */ + private Integer menuFlag; + + /** + * 认证等级 0：权限认证 1：登录认证 2：无需认证 + */ + private Integer authLevel; + + /** + * 删除标识：0.未删除 1.已删除 + */ + private Integer delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/GovRoleDTO.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/GovRoleDTO.java new file mode 100644 index 0000000000..efe6643df6 --- /dev/null +++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/GovRoleDTO.java @@ -0,0 +1,93 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + + +/** + * 角色管理 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-03-18 + */ +@Data +public class GovRoleDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * id + */ + private String id; + + /** + * 角色名称 + */ + private String name; + + /** + * 备注 + */ + private String remark; + + /** + * 部门ID + */ + private Long deptId; + + /** + * 删除标识：0.未删除 1.已删除 + */ + private Integer delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + + /** + * 菜单ID列表 + */ + private List menuIdList; + +} \ No newline at end of file diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/GovRoleMenuDTO.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/GovRoleMenuDTO.java new file mode 100644 index 0000000000..eacde30cf3 --- /dev/null +++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/GovRoleMenuDTO.java @@ -0,0 +1,82 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 角色菜单关系 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-03-18 + */ +@Data +public class GovRoleMenuDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * id + */ + private String id; + + /** + * 角色ID + */ + private String roleId; + + /** + * 菜单ID + */ + private String menuId; + + /** + * 删除标识：0.未删除 1.已删除 + */ + private Integer delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/GovRoleUserDTO.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/GovRoleUserDTO.java new file mode 100644 index 0000000000..d3881edeb2 --- /dev/null +++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/GovRoleUserDTO.java @@ -0,0 +1,82 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 角色用户关系 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-03-18 + */ +@Data +public class GovRoleUserDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * id + */ + private String id; + + /** + * 角色ID + */ + private String roleId; + + /** + * 用户ID + */ + private String userId; + + /** + * 删除标识：0.未删除 1.已删除 + */ + private Integer delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/result/MenuResourceDTO.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/result/MenuResourceDTO.java new file mode 100644 index 0000000000..86df7d55ca --- /dev/null +++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/result/MenuResourceDTO.java @@ -0,0 +1,29 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有，侵权必究！ + */ + +package com.epmet.dto.result; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 菜单资源 + * + * @author Mark sunlightcs@gmail.com + * @since 1.0.0 + */ +@Data +@ApiModel(value = "菜单资源") +public class MenuResourceDTO { + @ApiModelProperty(value = "资源URL") + private String resourceUrl; + @ApiModelProperty(value = "请求方式（如：GET、POST、PUT、DELETE）") + private String resourceMethod; + +} diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/enums/MenuFlagEnum.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/enums/MenuFlagEnum.java new file mode 100644 index 0000000000..2a880a728a --- /dev/null +++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/enums/MenuFlagEnum.java @@ -0,0 +1,36 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有，侵权必究！ + */ + +package com.epmet.enums; + +/** + * 菜单资源标识 + * + * @author Mark sunlightcs@gmail.com + * @since 1.0.0 + */ +public enum MenuFlagEnum { + /** + * 菜单资源 + */ + YES(1), + /** + * 非菜单资源 + */ + NO(0); + + private int value; + + MenuFlagEnum(int value) { + this.value = value; + } + + public int value() { + return this.value; + } +} diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/enums/MenuTypeEnum.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/enums/MenuTypeEnum.java new file mode 100644 index 0000000000..7132fa2ce3 --- /dev/null +++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/enums/MenuTypeEnum.java @@ -0,0 +1,36 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有，侵权必究！ + */ + +package com.epmet.enums; + +/** + * 菜单类型枚举 + * + * @author Mark sunlightcs@gmail.com + * @since 1.0.0 + */ +public enum MenuTypeEnum { + /** + * 菜单 + */ + MENU(0), + /** + * 按钮 + */ + BUTTON(1); + + private int value; + + MenuTypeEnum(int value) { + this.value = value; + } + + public int value() { + return this.value; + } +} diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/enums/RegionLeafEnum.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/enums/RegionLeafEnum.java new file mode 100644 index 0000000000..36300e201f --- /dev/null +++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/enums/RegionLeafEnum.java @@ -0,0 +1,29 @@ +/** + * Copyright (c) 2019 人人开源 All rights reserved. + *

+ * https://www.renren.io + *

+ * 版权所有，侵权必究！ + */ + +package com.epmet.enums; + +/** + * 叶子节点枚举 + * + * @author Mark sunlightcs@gmail.com + */ +public enum RegionLeafEnum { + YES(1), + NO(0); + + private int value; + + RegionLeafEnum(int value) { + this.value = value; + } + + public int value() { + return this.value; + } +} diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/enums/RegionLevelEnum.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/enums/RegionLevelEnum.java new file mode 100644 index 0000000000..b29c456897 --- /dev/null +++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/enums/RegionLevelEnum.java @@ -0,0 +1,30 @@ +/** + * Copyright (c) 2019 人人开源 All rights reserved. + *

+ * https://www.renren.io + *

+ * 版权所有，侵权必究！ + */ + +package com.epmet.enums; + +/** + * 行政区域 级别枚举 + * + * @author Mark sunlightcs@gmail.com + */ +public enum RegionLevelEnum { + ONE(1), + TWO(2), + THREE(3); + + private int value; + + RegionLevelEnum(int value) { + this.value = value; + } + + public int value() { + return this.value; + } +} diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/enums/UserStatusEnum.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/enums/UserStatusEnum.java new file mode 100644 index 0000000000..dbc043f529 --- /dev/null +++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/enums/UserStatusEnum.java @@ -0,0 +1,30 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有，侵权必究！ + */ + +package com.epmet.enums; + +/** + * 用户状态 + * + * @author Mark sunlightcs@gmail.com + * @since 1.0.0 + */ +public enum UserStatusEnum { + DISABLE(0), + ENABLED(1); + + private int value; + + UserStatusEnum(int value) { + this.value = value; + } + + public int value() { + return this.value; + } +} diff --git a/epmet-module/gov-access/gov-access-server/pom.xml b/epmet-module/gov-access/gov-access-server/pom.xml index b7bc8e27bc..f8d9426042 100644 --- a/epmet-module/gov-access/gov-access-server/pom.xml +++ b/epmet-module/gov-access/gov-access-server/pom.xml @@ -72,12 +72,6 @@ feign-httpclient 10.3.0 - - com.epmet - oper-access-client - 2.0.0 - compile - diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/OperLanguageController.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovLanguageController.java similarity index 70% rename from epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/OperLanguageController.java rename to epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovLanguageController.java index e14545c317..85e8bce73d 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/OperLanguageController.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovLanguageController.java @@ -24,8 +24,8 @@ import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; -import com.epmet.dto.OperLanguageDTO; -import com.epmet.service.OperLanguageService; +import com.epmet.dto.GovLanguageDTO; +import com.epmet.service.GovLanguageService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -40,36 +40,36 @@ import java.util.Map; */ @RestController @RequestMapping("operlanguage") -public class OperLanguageController { +public class GovLanguageController { @Autowired - private OperLanguageService operLanguageService; + private GovLanguageService govLanguageService; @GetMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = operLanguageService.page(params); - return new Result>().ok(page); + public Result> page(@RequestParam Map params){ + PageData page = govLanguageService.page(params); + return new Result>().ok(page); } @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ - OperLanguageDTO data = operLanguageService.get(id); - return new Result().ok(data); + public Result get(@PathVariable("id") String id){ + GovLanguageDTO data = govLanguageService.get(id); + return new Result().ok(data); } @PostMapping - public Result save(@RequestBody OperLanguageDTO dto){ + public Result save(@RequestBody GovLanguageDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - operLanguageService.save(dto); + govLanguageService.save(dto); return new Result(); } @PutMapping - public Result update(@RequestBody OperLanguageDTO dto){ + public Result update(@RequestBody GovLanguageDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - operLanguageService.update(dto); + govLanguageService.update(dto); return new Result(); } @@ -77,7 +77,7 @@ public class OperLanguageController { public Result delete(@RequestBody String[] ids){ //效验数据 AssertUtils.isArrayEmpty(ids, "id"); - operLanguageService.delete(ids); + govLanguageService.delete(ids); return new Result(); } diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/OperMenuController.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovMenuController.java similarity index 55% rename from epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/OperMenuController.java rename to epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovMenuController.java index b1f96c1692..d3a67c889f 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/OperMenuController.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovMenuController.java @@ -10,10 +10,10 @@ import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; -import com.epmet.dto.OperMenuDTO; +import com.epmet.dto.GovMenuDTO; import com.epmet.dto.result.MenuResourceDTO; -import com.epmet.service.OperMenuService; -import com.epmet.service.OperResourceService; +import com.epmet.service.GovMenuService; +import com.epmet.service.GovResourceService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -30,43 +30,43 @@ import java.util.Set; */ @RestController @RequestMapping("menu") -public class OperMenuController { +public class GovMenuController { @Autowired - private OperMenuService operMenuService; + private GovMenuService govMenuService; @Autowired - private OperResourceService operResourceService; + private GovResourceService govResourceService; @GetMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = operMenuService.page(params); - return new Result>().ok(page); + public Result> page(@RequestParam Map params){ + PageData page = govMenuService.page(params); + return new Result>().ok(page); } @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ - OperMenuDTO data = operMenuService.get(id); + public Result get(@PathVariable("id") String id){ + GovMenuDTO data = govMenuService.get(id); //菜单资源列表 - List resourceList = operResourceService.getMenuResourceList(id); + List resourceList = govResourceService.getMenuResourceList(id); - return new Result().ok(data); + return new Result().ok(data); } @PostMapping - public Result save(@RequestBody OperMenuDTO dto, @LoginUser TokenDto tokenDto){ + public Result save(@RequestBody GovMenuDTO dto, @LoginUser TokenDto tokenDto){ //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - operMenuService.save(dto,tokenDto); + govMenuService.save(dto,tokenDto); return new Result(); } @PutMapping - public Result update(@RequestBody OperMenuDTO dto, @LoginUser TokenDto tokenDto){ + public Result update(@RequestBody GovMenuDTO dto, @LoginUser TokenDto tokenDto){ //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - operMenuService.update(dto,tokenDto); + govMenuService.update(dto,tokenDto); return new Result(); } @@ -74,7 +74,7 @@ public class OperMenuController { public Result delete(@RequestBody String[] ids){ //效验数据 AssertUtils.isArrayEmpty(ids, "id"); - operMenuService.delete(ids); + govMenuService.delete(ids); return new Result(); } @@ -84,12 +84,12 @@ public class OperMenuController { AssertUtils.isNull(id, "id"); //判断是否有子菜单或按钮 - List list = operMenuService.getListPid(id); + List list = govMenuService.getListPid(id); if(list.size() > 0){ return new Result().error(ErrorCode.SUB_MENU_EXIST); } - operMenuService.delete(id, tokenDto); + govMenuService.delete(id, tokenDto); return new Result(); } @@ -98,24 +98,24 @@ public class OperMenuController { /** * 获取菜单列表 * @param type 类型 - * @return Result> + * @return Result> */ @GetMapping("list") - public Result> list(Integer type){ - List list = operMenuService.getMenuList(type); + public Result> list(Integer type){ + List list = govMenuService.getMenuList(type); - return new Result>().ok(list); + return new Result>().ok(list); } /** * 导航 * @param tokenDto token - * @return List + * @return List */ @GetMapping("nav") - public Result> nav(@LoginUser TokenDto tokenDto){ - List list = operMenuService.getUserMenuNavList(tokenDto); - return new Result>().ok(list); + public Result> nav(@LoginUser TokenDto tokenDto){ + List list = govMenuService.getUserMenuNavList(tokenDto); + return new Result>().ok(list); } /** @@ -125,7 +125,7 @@ public class OperMenuController { */ @GetMapping("permissions") public Result> permissions(@LoginUser TokenDto tokenDto){ - Set set = operMenuService.getUserPermissions(tokenDto); + Set set = govMenuService.getUserPermissions(tokenDto); return new Result>().ok(set); } @@ -135,10 +135,10 @@ public class OperMenuController { * @return */ @GetMapping("select") - public Result> select(@LoginUser TokenDto tokenDto){ - List list = operMenuService.getUserMenuList(tokenDto, null); + public Result> select(@LoginUser TokenDto tokenDto){ + List list = govMenuService.getUserMenuList(tokenDto, null); - return new Result>().ok(list); + return new Result>().ok(list); } /** @@ -148,9 +148,9 @@ public class OperMenuController { * @Description 运营端用户退出系统，清空菜单和操作权限 * @Date 2020/5/21 18:07 **/ - @GetMapping("clearoperuseraccess") - public Result clearOperUserAccess(@LoginUser TokenDto tokenDto) { - operMenuService.clearOperUserAccess(tokenDto.getApp(), tokenDto.getClient(), tokenDto.getUserId()); + @GetMapping("cleargovuseraccess") + public Result clearGovUserAccess(@LoginUser TokenDto tokenDto) { + govMenuService.clearOperUserAccess(tokenDto.getApp(), tokenDto.getClient(), tokenDto.getUserId()); return new Result(); } } diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/OperResourceController.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovResourceController.java similarity index 69% rename from epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/OperResourceController.java rename to epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovResourceController.java index 8bda911e28..72193db454 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/OperResourceController.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovResourceController.java @@ -24,8 +24,8 @@ import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; -import com.epmet.dto.OperResourceDTO; -import com.epmet.service.OperResourceService; +import com.epmet.dto.GovResourceDTO; +import com.epmet.service.GovResourceService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -39,37 +39,37 @@ import java.util.Map; * @since v1.0.0 2020-03-18 */ @RestController -@RequestMapping("operresource") -public class OperResourceController { +@RequestMapping("govresource") +public class GovResourceController { @Autowired - private OperResourceService operResourceService; + private GovResourceService govResourceService; @GetMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = operResourceService.page(params); - return new Result>().ok(page); + public Result> page(@RequestParam Map params){ + PageData page = govResourceService.page(params); + return new Result>().ok(page); } @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ - OperResourceDTO data = operResourceService.get(id); - return new Result().ok(data); + public Result get(@PathVariable("id") String id){ + GovResourceDTO data = govResourceService.get(id); + return new Result().ok(data); } @PostMapping - public Result save(@RequestBody OperResourceDTO dto){ + public Result save(@RequestBody GovResourceDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - operResourceService.save(dto); + govResourceService.save(dto); return new Result(); } @PutMapping - public Result update(@RequestBody OperResourceDTO dto){ + public Result update(@RequestBody GovResourceDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - operResourceService.update(dto); + govResourceService.update(dto); return new Result(); } @@ -77,7 +77,7 @@ public class OperResourceController { public Result delete(@RequestBody String[] ids){ //效验数据 AssertUtils.isArrayEmpty(ids, "id"); - operResourceService.delete(ids); + govResourceService.delete(ids); return new Result(); } diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/OperRoleController.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovRoleController.java similarity index 66% rename from epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/OperRoleController.java rename to epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovRoleController.java index 33659c8c03..7a1ded893c 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/OperRoleController.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovRoleController.java @@ -24,9 +24,9 @@ import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; -import com.epmet.dto.OperRoleDTO; -import com.epmet.service.OperRoleMenuService; -import com.epmet.service.OperRoleService; +import com.epmet.dto.GovRoleDTO; +import com.epmet.service.GovRoleMenuService; +import com.epmet.service.GovRoleService; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -43,44 +43,44 @@ import java.util.Map; * @since v1.0.0 2020-03-18 */ @RestController -@RequestMapping("operrole") -public class OperRoleController { +@RequestMapping("govrole") +public class GovRoleController { @Autowired - private OperRoleService operRoleService; + private GovRoleService govRoleService; @Autowired - private OperRoleMenuService operRoleMenuService; + private GovRoleMenuService govRoleMenuService; @GetMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = operRoleService.page(params); - return new Result>().ok(page); + public Result> page(@RequestParam Map params){ + PageData page = govRoleService.page(params); + return new Result>().ok(page); } @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ - OperRoleDTO data = operRoleService.get(id); + public Result get(@PathVariable("id") String id){ + GovRoleDTO data = govRoleService.get(id); //查询角色对应的菜单 - List menuIdList = operRoleMenuService.getMenuIdList(id); + List menuIdList = govRoleMenuService.getMenuIdList(id); data.setMenuIdList(menuIdList); - return new Result().ok(data); + return new Result().ok(data); } @PostMapping - public Result save(@RequestBody OperRoleDTO dto){ + public Result save(@RequestBody GovRoleDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - operRoleService.save(dto); + govRoleService.save(dto); return new Result(); } @PutMapping - public Result update(@RequestBody OperRoleDTO dto){ + public Result update(@RequestBody GovRoleDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - operRoleService.update(dto); + govRoleService.update(dto); return new Result(); } @@ -88,17 +88,17 @@ public class OperRoleController { public Result delete(@RequestBody String[] ids){ //效验数据 AssertUtils.isArrayEmpty(ids, "id"); - operRoleService.delete(ids); + govRoleService.delete(ids); return new Result(); } @GetMapping("list") @ApiOperation("列表") - public Result> list(){ - List data = operRoleService.list(new HashMap<>(1)); + public Result> list(){ + List data = govRoleService.list(new HashMap<>(1)); - return new Result>().ok(data); + return new Result>().ok(data); } } \ No newline at end of file diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/OperRoleMenuController.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovRoleMenuController.java similarity index 69% rename from epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/OperRoleMenuController.java rename to epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovRoleMenuController.java index 6520623e16..8b8a7d8aed 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/OperRoleMenuController.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovRoleMenuController.java @@ -24,8 +24,8 @@ import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; -import com.epmet.dto.OperRoleMenuDTO; -import com.epmet.service.OperRoleMenuService; +import com.epmet.dto.GovRoleMenuDTO; +import com.epmet.service.GovRoleMenuService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -39,37 +39,37 @@ import java.util.Map; * @since v1.0.0 2020-03-18 */ @RestController -@RequestMapping("operrolemenu") -public class OperRoleMenuController { +@RequestMapping("govrolemenu") +public class GovRoleMenuController { @Autowired - private OperRoleMenuService operRoleMenuService; + private GovRoleMenuService govRoleMenuService; @GetMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = operRoleMenuService.page(params); - return new Result>().ok(page); + public Result> page(@RequestParam Map params){ + PageData page = govRoleMenuService.page(params); + return new Result>().ok(page); } @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ - OperRoleMenuDTO data = operRoleMenuService.get(id); - return new Result().ok(data); + public Result get(@PathVariable("id") String id){ + GovRoleMenuDTO data = govRoleMenuService.get(id); + return new Result().ok(data); } @PostMapping - public Result save(@RequestBody OperRoleMenuDTO dto){ + public Result save(@RequestBody GovRoleMenuDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - operRoleMenuService.save(dto); + govRoleMenuService.save(dto); return new Result(); } @PutMapping - public Result update(@RequestBody OperRoleMenuDTO dto){ + public Result update(@RequestBody GovRoleMenuDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - operRoleMenuService.update(dto); + govRoleMenuService.update(dto); return new Result(); } @@ -77,7 +77,7 @@ public class OperRoleMenuController { public Result delete(@RequestBody String[] ids){ //效验数据 AssertUtils.isArrayEmpty(ids, "id"); - operRoleMenuService.delete(ids); + govRoleMenuService.delete(ids); return new Result(); } diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/OperRoleUserController.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovRoleUserController.java similarity index 73% rename from epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/OperRoleUserController.java rename to epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovRoleUserController.java index b58bfd322b..fcd5733a4d 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/OperRoleUserController.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovRoleUserController.java @@ -24,8 +24,8 @@ import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; -import com.epmet.dto.OperRoleUserDTO; -import com.epmet.service.OperRoleUserService; +import com.epmet.dto.GovRoleUserDTO; +import com.epmet.service.GovRoleUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -40,37 +40,37 @@ import java.util.Map; * @since v1.0.0 2020-03-18 */ @RestController -@RequestMapping("operroleuser") -public class OperRoleUserController { +@RequestMapping("govroleuser") +public class GovRoleUserController { @Autowired - private OperRoleUserService operRoleUserService; + private GovRoleUserService govRoleUserService; @GetMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = operRoleUserService.page(params); - return new Result>().ok(page); + public Result> page(@RequestParam Map params){ + PageData page = govRoleUserService.page(params); + return new Result>().ok(page); } @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ - OperRoleUserDTO data = operRoleUserService.get(id); - return new Result().ok(data); + public Result get(@PathVariable("id") String id){ + GovRoleUserDTO data = govRoleUserService.get(id); + return new Result().ok(data); } @PostMapping - public Result save(@RequestBody OperRoleUserDTO dto){ + public Result save(@RequestBody GovRoleUserDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - operRoleUserService.save(dto); + govRoleUserService.save(dto); return new Result(); } @PutMapping - public Result update(@RequestBody OperRoleUserDTO dto){ + public Result update(@RequestBody GovRoleUserDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - operRoleUserService.update(dto); + govRoleUserService.update(dto); return new Result(); } @@ -78,7 +78,7 @@ public class OperRoleUserController { public Result delete(@RequestBody String[] ids){ //效验数据 AssertUtils.isArrayEmpty(ids, "id"); - operRoleUserService.delete(ids); + govRoleUserService.delete(ids); return new Result(); } @@ -91,7 +91,7 @@ public class OperRoleUserController { */ @GetMapping("getRoleIdList/{id}") public Result>getRoleIdList(@PathVariable("id") String id) { - List list = operRoleUserService.getRoleIdList(id); + List list = govRoleUserService.getRoleIdList(id); return new Result>().ok(list); } @@ -103,7 +103,7 @@ public class OperRoleUserController { */ @PostMapping("saveOrUpdateRole") public Result saveOrUpdate(@RequestParam("userId") String userId, @RequestBody List roleIdList) { - operRoleUserService.saveOrUpdate(userId, roleIdList); + govRoleUserService.saveOrUpdate(userId, roleIdList); return new Result(); } @@ -114,7 +114,7 @@ public class OperRoleUserController { */ @PostMapping("deleteByUserId") public Result deleteByUserId(String id) { - operRoleUserService.deleteByUserId(id); + govRoleUserService.deleteByUserId(id); return new Result(); } @@ -125,7 +125,7 @@ public class OperRoleUserController { */ @PostMapping("deleteByUserIds") public Result deleteByUserIds(@RequestBody String[] ids) { - operRoleUserService.deleteByUserIds(ids); + govRoleUserService.deleteByUserIds(ids); return new Result(); } diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/OperLanguageDao.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/GovLanguageDao.java similarity index 52% rename from epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/OperLanguageDao.java rename to epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/GovLanguageDao.java index dfca54a9ab..acd505c019 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/OperLanguageDao.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/GovLanguageDao.java @@ -9,7 +9,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.entity.OperLanguageEntity; +import com.epmet.entity.GovLanguageEntity; import org.apache.ibatis.annotations.Mapper; /** @@ -18,11 +18,11 @@ import org.apache.ibatis.annotations.Mapper; * @author Mark sunlightcs@gmail.com */ @Mapper -public interface OperLanguageDao extends BaseDao { +public interface GovLanguageDao extends BaseDao { - OperLanguageEntity getLanguage(OperLanguageEntity entity); + GovLanguageEntity getLanguage(GovLanguageEntity entity); - void updateLanguage(OperLanguageEntity entity); + void updateLanguage(GovLanguageEntity entity); - void insertOperLanguageEntity(OperLanguageEntity entity); + void insertOperLanguageEntity(GovLanguageEntity entity); } diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/OperMenuDao.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/GovMenuDao.java similarity index 61% rename from epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/OperMenuDao.java rename to epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/GovMenuDao.java index 2858a76f24..1e36bff758 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/OperMenuDao.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/GovMenuDao.java @@ -9,7 +9,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.entity.OperMenuEntity; +import com.epmet.entity.GovMenuEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -22,9 +22,9 @@ import java.util.List; * @since 1.0.0 */ @Mapper -public interface OperMenuDao extends BaseDao { +public interface GovMenuDao extends BaseDao { - OperMenuEntity getById(@Param("id") String id, @Param("language") String language); + GovMenuEntity getById(@Param("id") String id, @Param("language") String language); /** * 查询所有菜单列表 @@ -32,7 +32,7 @@ public interface OperMenuDao extends BaseDao { * @param type 菜单类型 * @param language 语言 */ - List getMenuList(@Param("type") Integer type, @Param("language") String language); + List getMenuList(@Param("type") Integer type, @Param("language") String language); /** * 查询用户菜单列表 @@ -41,12 +41,12 @@ public interface OperMenuDao extends BaseDao { * @param type 菜单类型 * @param language 语言 */ - List getUserMenuList(@Param("userId") String userId, @Param("type") Integer type, @Param("language") String language); + List getUserMenuList(@Param("userId") String userId, @Param("type") Integer type, @Param("language") String language); /** * 根据父菜单，查询子菜单 * @param pid 父菜单ID */ - List getListPid(String pid); + List getListPid(String pid); } diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/OperResourceDao.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/GovResourceDao.java similarity index 70% rename from epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/OperResourceDao.java rename to epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/GovResourceDao.java index b92caee0d7..4970d56e9c 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/OperResourceDao.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/GovResourceDao.java @@ -9,7 +9,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.entity.OperResourceEntity; +import com.epmet.entity.GovResourceEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -22,7 +22,7 @@ import java.util.List; * @since 1.0.0 */ @Mapper -public interface OperResourceDao extends BaseDao { +public interface GovResourceDao extends BaseDao { /** * 根据资源编码，删除对应的资源 * @param code 资源编码 @@ -33,16 +33,16 @@ public interface OperResourceDao extends BaseDao { * 获取资源列表 * @param menuId 菜单ID */ - List getMenuResourceList(String menuId); + List getMenuResourceList(String menuId); /** * 获取所有资源列表 */ - List getResourceList(); + List getResourceList(); /** * 获取用户资源列表 * @param userId 用户ID */ - List getUserResourceList(@Param("userId") String userId); + List getUserResourceList(@Param("userId") String userId); } diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/OperRoleDao.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/GovRoleDao.java similarity index 76% rename from epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/OperRoleDao.java rename to epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/GovRoleDao.java index 408a5275f5..768fc42792 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/OperRoleDao.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/GovRoleDao.java @@ -9,7 +9,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.entity.OperRoleEntity; +import com.epmet.entity.GovRoleEntity; import org.apache.ibatis.annotations.Mapper; /** @@ -19,6 +19,6 @@ import org.apache.ibatis.annotations.Mapper; * @since 1.0.0 */ @Mapper -public interface OperRoleDao extends BaseDao { +public interface GovRoleDao extends BaseDao { } diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/OperRoleMenuDao.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/GovRoleMenuDao.java similarity index 88% rename from epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/OperRoleMenuDao.java rename to epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/GovRoleMenuDao.java index 005f9e44ac..dc0559acb3 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/OperRoleMenuDao.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/GovRoleMenuDao.java @@ -9,7 +9,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.entity.OperRoleMenuEntity; +import com.epmet.entity.GovRoleMenuEntity; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -21,7 +21,7 @@ import java.util.List; * @since 1.0.0 */ @Mapper -public interface OperRoleMenuDao extends BaseDao { +public interface GovRoleMenuDao extends BaseDao { /** * 根据角色ID，获取菜单ID列表 diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/OperRoleUserDao.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/GovRoleUserDao.java similarity index 90% rename from epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/OperRoleUserDao.java rename to epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/GovRoleUserDao.java index f33c5a241a..bf400e0584 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/OperRoleUserDao.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/GovRoleUserDao.java @@ -9,7 +9,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.entity.OperRoleUserEntity; +import com.epmet.entity.GovRoleUserEntity; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -21,7 +21,7 @@ import java.util.List; * @since 1.0.0 */ @Mapper -public interface OperRoleUserDao extends BaseDao { +public interface GovRoleUserDao extends BaseDao { /** * 根据角色ids，删除角色用户关系 diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/OperLanguageEntity.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/GovLanguageEntity.java similarity index 89% rename from epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/OperLanguageEntity.java rename to epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/GovLanguageEntity.java index 3e822d5665..ee84f846d9 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/OperLanguageEntity.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/GovLanguageEntity.java @@ -21,8 +21,8 @@ import java.io.Serializable; */ @Data @EqualsAndHashCode(callSuper=false) -@TableName("oper_language") -public class OperLanguageEntity implements Serializable { +@TableName("gov_language") +public class GovLanguageEntity implements Serializable { private static final long serialVersionUID = 1L; /** diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/OperMenuEntity.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/GovMenuEntity.java similarity index 93% rename from epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/OperMenuEntity.java rename to epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/GovMenuEntity.java index ba621edcc0..cfeef721b8 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/OperMenuEntity.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/GovMenuEntity.java @@ -22,8 +22,8 @@ import lombok.EqualsAndHashCode; */ @Data @EqualsAndHashCode(callSuper=false) -@TableName("oper_menu") -public class OperMenuEntity extends BaseEpmetEntity { +@TableName("gov_menu") +public class GovMenuEntity extends BaseEpmetEntity { private static final long serialVersionUID = 1L; /** diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/OperResourceEntity.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/GovResourceEntity.java similarity index 91% rename from epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/OperResourceEntity.java rename to epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/GovResourceEntity.java index 7afd722bd2..1d5d716c22 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/OperResourceEntity.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/GovResourceEntity.java @@ -21,8 +21,8 @@ import lombok.EqualsAndHashCode; */ @Data @EqualsAndHashCode(callSuper=false) -@TableName("oper_resource") -public class OperResourceEntity extends BaseEpmetEntity { +@TableName("gov_resource") +public class GovResourceEntity extends BaseEpmetEntity { private static final long serialVersionUID = 1L; /** diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/OperRoleEntity.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/GovRoleEntity.java similarity index 90% rename from epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/OperRoleEntity.java rename to epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/GovRoleEntity.java index 7fd5393e7e..4bc4575836 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/OperRoleEntity.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/GovRoleEntity.java @@ -23,8 +23,8 @@ import lombok.EqualsAndHashCode; */ @Data @EqualsAndHashCode(callSuper=false) -@TableName("oper_role") -public class OperRoleEntity extends BaseEpmetEntity { +@TableName("gov_role") +public class GovRoleEntity extends BaseEpmetEntity { private static final long serialVersionUID = 1L; /** diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/OperRoleMenuEntity.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/GovRoleMenuEntity.java similarity index 87% rename from epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/OperRoleMenuEntity.java rename to epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/GovRoleMenuEntity.java index 650619ffa9..6ea4d1f2a5 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/OperRoleMenuEntity.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/GovRoleMenuEntity.java @@ -21,8 +21,8 @@ import lombok.EqualsAndHashCode; */ @Data @EqualsAndHashCode(callSuper=false) -@TableName("oper_role_menu") -public class OperRoleMenuEntity extends BaseEpmetEntity { +@TableName("gov_role_menu") +public class GovRoleMenuEntity extends BaseEpmetEntity { private static final long serialVersionUID = 1L; /** * 角色ID diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/OperRoleUserEntity.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/GovRoleUserEntity.java similarity index 87% rename from epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/OperRoleUserEntity.java rename to epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/GovRoleUserEntity.java index 8eb9612417..599ca7f3e2 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/OperRoleUserEntity.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/GovRoleUserEntity.java @@ -21,8 +21,8 @@ import lombok.EqualsAndHashCode; */ @Data @EqualsAndHashCode(callSuper=false) -@TableName("oper_role_user") -public class OperRoleUserEntity extends BaseEpmetEntity { +@TableName("gov_role_user") +public class GovRoleUserEntity extends BaseEpmetEntity { private static final long serialVersionUID = 1L; /** diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/OperLanguageRedis.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/GovLanguageRedis.java similarity index 97% rename from epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/OperLanguageRedis.java rename to epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/GovLanguageRedis.java index fa479f92ca..8f9595582b 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/OperLanguageRedis.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/GovLanguageRedis.java @@ -28,7 +28,7 @@ import org.springframework.stereotype.Component; * @since v1.0.0 2020-03-18 */ @Component -public class OperLanguageRedis { +public class GovLanguageRedis { @Autowired private RedisUtils redisUtils; diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/OperMenuRedis.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/GovMenuRedis.java similarity index 90% rename from epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/OperMenuRedis.java rename to epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/GovMenuRedis.java index f1b568f33a..361d6c3014 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/OperMenuRedis.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/GovMenuRedis.java @@ -20,7 +20,7 @@ package com.epmet.redis; import com.epmet.commons.tools.redis.RedisKeys; import com.epmet.commons.tools.redis.RedisUtils; import com.epmet.commons.tools.utils.HttpContextUtils; -import com.epmet.dto.OperMenuDTO; +import com.epmet.dto.GovMenuDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -34,7 +34,7 @@ import java.util.Set; * @since v1.0.0 2020-03-18 */ @Component -public class OperMenuRedis { +public class GovMenuRedis { @Autowired private RedisUtils redisUtils; @@ -51,14 +51,14 @@ public class OperMenuRedis { return null; } - public void setUserMenuNavList(String userId, String app, String client, List menuList){ + public void setUserMenuNavList(String userId, String app, String client, List menuList){ String key = RedisKeys.getUserMenuNavKey(userId, app, client, HttpContextUtils.getLanguage()); redisUtils.set(key, menuList); } - public List getUserMenuNavList(String userId, String app, String client){ + public List getUserMenuNavList(String userId, String app, String client){ String key = RedisKeys.getUserMenuNavKey(userId, app, client, HttpContextUtils.getLanguage()); - return (List)redisUtils.get(key); + return (List)redisUtils.get(key); } public void setUserPermissions(String userId, String app, String client, Set permsSet){ diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/OperResourceRedis.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/GovResourceRedis.java similarity index 97% rename from epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/OperResourceRedis.java rename to epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/GovResourceRedis.java index 68ea39a15e..e21bd5095c 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/OperResourceRedis.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/GovResourceRedis.java @@ -29,7 +29,7 @@ import org.springframework.stereotype.Component; * @since v1.0.0 2020-03-18 */ @Component -public class OperResourceRedis { +public class GovResourceRedis { @Autowired private RedisUtils redisUtils; diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/OperRoleMenuRedis.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/GovRoleMenuRedis.java similarity index 97% rename from epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/OperRoleMenuRedis.java rename to epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/GovRoleMenuRedis.java index 28f98c5615..c778d22c7d 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/OperRoleMenuRedis.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/GovRoleMenuRedis.java @@ -28,7 +28,7 @@ import org.springframework.stereotype.Component; * @since v1.0.0 2020-03-18 */ @Component -public class OperRoleMenuRedis { +public class GovRoleMenuRedis { @Autowired private RedisUtils redisUtils; diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/OperRoleRedis.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/GovRoleRedis.java similarity index 97% rename from epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/OperRoleRedis.java rename to epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/GovRoleRedis.java index 15e6682155..3e87e447dd 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/OperRoleRedis.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/GovRoleRedis.java @@ -28,7 +28,7 @@ import org.springframework.stereotype.Component; * @since v1.0.0 2020-03-18 */ @Component -public class OperRoleRedis { +public class GovRoleRedis { @Autowired private RedisUtils redisUtils; diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/OperRoleUserRedis.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/GovRoleUserRedis.java similarity index 97% rename from epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/OperRoleUserRedis.java rename to epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/GovRoleUserRedis.java index 7f6df90fa3..7a7aad6c8c 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/OperRoleUserRedis.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/GovRoleUserRedis.java @@ -28,7 +28,7 @@ import org.springframework.stereotype.Component; * @since v1.0.0 2020-03-18 */ @Component -public class OperRoleUserRedis { +public class GovRoleUserRedis { @Autowired private RedisUtils redisUtils; diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/OperLanguageService.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/GovLanguageService.java similarity index 80% rename from epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/OperLanguageService.java rename to epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/GovLanguageService.java index 0f0ad555bc..1f4a5e65e3 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/OperLanguageService.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/GovLanguageService.java @@ -19,8 +19,8 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; -import com.epmet.dto.OperLanguageDTO; -import com.epmet.entity.OperLanguageEntity; +import com.epmet.dto.GovLanguageDTO; +import com.epmet.entity.GovLanguageEntity; import java.util.List; import java.util.Map; @@ -31,37 +31,37 @@ import java.util.Map; * @author generator generator@elink-cn.com * @since v1.0.0 2020-03-18 */ -public interface OperLanguageService extends BaseService { +public interface GovLanguageService extends BaseService { /** * 默认分页 * * @param params - * @return PageData + * @return PageData * @author generator * @date 2020-03-18 */ - PageData page(Map params); + PageData page(Map params); /** * 默认查询 * * @param params - * @return java.util.List + * @return java.util.List * @author generator * @date 2020-03-18 */ - List list(Map params); + List list(Map params); /** * 单条查询 * * @param id - * @return OperLanguageDTO + * @return GovLanguageDTO * @author generator * @date 2020-03-18 */ - OperLanguageDTO get(String id); + GovLanguageDTO get(String id); /** * 默认保存 @@ -71,7 +71,7 @@ public interface OperLanguageService extends BaseService { * @author generator * @date 2020-03-18 */ - void save(OperLanguageDTO dto); + void save(GovLanguageDTO dto); /** * 默认更新 @@ -81,7 +81,7 @@ public interface OperLanguageService extends BaseService { * @author generator * @date 2020-03-18 */ - void update(OperLanguageDTO dto); + void update(GovLanguageDTO dto); /** * 批量删除 diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/OperMenuService.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/GovMenuService.java similarity index 74% rename from epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/OperMenuService.java rename to epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/GovMenuService.java index 70794bc18b..b5c0cf12a3 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/OperMenuService.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/GovMenuService.java @@ -20,8 +20,8 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; -import com.epmet.dto.OperMenuDTO; -import com.epmet.entity.OperMenuEntity; +import com.epmet.dto.GovMenuDTO; +import com.epmet.entity.GovMenuEntity; import java.util.List; import java.util.Map; @@ -33,37 +33,37 @@ import java.util.Set; * @author generator generator@elink-cn.com * @since v1.0.0 2020-03-18 */ -public interface OperMenuService extends BaseService { +public interface GovMenuService extends BaseService { /** * 默认分页 * * @param params - * @return PageData + * @return PageData * @author generator * @date 2020-03-18 */ - PageData page(Map params); + PageData page(Map params); /** * 默认查询 * * @param params - * @return java.util.List + * @return java.util.List * @author generator * @date 2020-03-18 */ - List list(Map params); + List list(Map params); /** * 单条查询 * * @param id - * @return OperMenuDTO + * @return GovMenuDTO * @author generator * @date 2020-03-18 */ - OperMenuDTO get(String id); + GovMenuDTO get(String id); /** * 默认保存 @@ -73,7 +73,7 @@ public interface OperMenuService extends BaseService { * @author generator * @date 2020-03-18 */ - void save(OperMenuDTO dto, TokenDto tokenDto); + void save(GovMenuDTO dto, TokenDto tokenDto); /** * 默认更新 @@ -83,7 +83,7 @@ public interface OperMenuService extends BaseService { * @author generator * @date 2020-03-18 */ - void update(OperMenuDTO dto, TokenDto tokenDto); + void update(GovMenuDTO dto, TokenDto tokenDto); /** * 批量删除 @@ -109,28 +109,28 @@ public interface OperMenuService extends BaseService { * * @param tokenDto 用户信息 * @param type 菜单类型 - * @return java.util.List + * @return java.util.List */ - List getUserMenuList(TokenDto tokenDto, Integer type); + List getUserMenuList(TokenDto tokenDto, Integer type); /** * 菜单列表 * * @param type 菜单类型 */ - List getMenuList(Integer type); + List getMenuList(Integer type); /** * 用户菜单导航 * @param tokenDto 用户信息 - * @return java.util.List + * @return java.util.List */ - List getUserMenuNavList(TokenDto tokenDto); + List getUserMenuNavList(TokenDto tokenDto); /** * 获取用户权限标识 * @param tokenDto 用户信息 - * @return java.util.Set + * @return java.util.Set */ Set getUserPermissions(TokenDto tokenDto); @@ -138,7 +138,7 @@ public interface OperMenuService extends BaseService { * 根据父菜单，查询子菜单 * @param pid 父菜单ID */ - List getListPid(String pid); + List getListPid(String pid); void clearOperUserAccess(String app, String client, String userId); } \ No newline at end of file diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/OperResourceService.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/GovResourceService.java similarity index 81% rename from epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/OperResourceService.java rename to epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/GovResourceService.java index 560e097c0b..8b6b8f5e6d 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/OperResourceService.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/GovResourceService.java @@ -19,9 +19,9 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; -import com.epmet.dto.OperResourceDTO; +import com.epmet.dto.GovResourceDTO; import com.epmet.dto.result.MenuResourceDTO; -import com.epmet.entity.OperResourceEntity; +import com.epmet.entity.GovResourceEntity; import java.util.List; import java.util.Map; @@ -32,37 +32,37 @@ import java.util.Map; * @author generator generator@elink-cn.com * @since v1.0.0 2020-03-18 */ -public interface OperResourceService extends BaseService { +public interface GovResourceService extends BaseService { /** * 默认分页 * * @param params - * @return PageData + * @return PageData * @author generator * @date 2020-03-18 */ - PageData page(Map params); + PageData page(Map params); /** * 默认查询 * * @param params - * @return java.util.List + * @return java.util.List * @author generator * @date 2020-03-18 */ - List list(Map params); + List list(Map params); /** * 单条查询 * * @param id - * @return OperResourceDTO + * @return GovResourceDTO * @author generator * @date 2020-03-18 */ - OperResourceDTO get(String id); + GovResourceDTO get(String id); /** * 默认保存 @@ -72,7 +72,7 @@ public interface OperResourceService extends BaseService { * @author generator * @date 2020-03-18 */ - void save(OperResourceDTO dto); + void save(GovResourceDTO dto); /** * 默认更新 @@ -82,7 +82,7 @@ public interface OperResourceService extends BaseService { * @author generator * @date 2020-03-18 */ - void update(OperResourceDTO dto); + void update(GovResourceDTO dto); /** * 批量删除 diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/OperRoleMenuService.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/GovRoleMenuService.java similarity index 82% rename from epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/OperRoleMenuService.java rename to epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/GovRoleMenuService.java index 84cfe6d996..7b0d2af34a 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/OperRoleMenuService.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/GovRoleMenuService.java @@ -19,8 +19,8 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; -import com.epmet.dto.OperRoleMenuDTO; -import com.epmet.entity.OperRoleMenuEntity; +import com.epmet.dto.GovRoleMenuDTO; +import com.epmet.entity.GovRoleMenuEntity; import java.util.List; import java.util.Map; @@ -31,37 +31,37 @@ import java.util.Map; * @author generator generator@elink-cn.com * @since v1.0.0 2020-03-18 */ -public interface OperRoleMenuService extends BaseService { +public interface GovRoleMenuService extends BaseService { /** * 默认分页 * * @param params - * @return PageData + * @return PageData * @author generator * @date 2020-03-18 */ - PageData page(Map params); + PageData page(Map params); /** * 默认查询 * * @param params - * @return java.util.List + * @return java.util.List * @author generator * @date 2020-03-18 */ - List list(Map params); + List list(Map params); /** * 单条查询 * * @param id - * @return OperRoleMenuDTO + * @return GovRoleMenuDTO * @author generator * @date 2020-03-18 */ - OperRoleMenuDTO get(String id); + GovRoleMenuDTO get(String id); /** * 默认保存 @@ -71,7 +71,7 @@ public interface OperRoleMenuService extends BaseService { * @author generator * @date 2020-03-18 */ - void save(OperRoleMenuDTO dto); + void save(GovRoleMenuDTO dto); /** * 默认更新 @@ -81,7 +81,7 @@ public interface OperRoleMenuService extends BaseService { * @author generator * @date 2020-03-18 */ - void update(OperRoleMenuDTO dto); + void update(GovRoleMenuDTO dto); /** * 批量删除 diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/OperRoleService.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/GovRoleService.java similarity index 79% rename from epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/OperRoleService.java rename to epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/GovRoleService.java index b4368ca747..4fbf7e0f58 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/OperRoleService.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/GovRoleService.java @@ -19,8 +19,8 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; -import com.epmet.dto.OperRoleDTO; -import com.epmet.entity.OperRoleEntity; +import com.epmet.dto.GovRoleDTO; +import com.epmet.entity.GovRoleEntity; import java.util.List; import java.util.Map; @@ -31,37 +31,37 @@ import java.util.Map; * @author generator generator@elink-cn.com * @since v1.0.0 2020-03-18 */ -public interface OperRoleService extends BaseService { +public interface GovRoleService extends BaseService { /** * 默认分页 * * @param params - * @return PageData + * @return PageData * @author generator * @date 2020-03-18 */ - PageData page(Map params); + PageData page(Map params); /** * 默认查询 * * @param params - * @return java.util.List + * @return java.util.List * @author generator * @date 2020-03-18 */ - List list(Map params); + List list(Map params); /** * 单条查询 * * @param id - * @return OperRoleDTO + * @return GovRoleDTO * @author generator * @date 2020-03-18 */ - OperRoleDTO get(String id); + GovRoleDTO get(String id); /** * 默认保存 @@ -71,7 +71,7 @@ public interface OperRoleService extends BaseService { * @author generator * @date 2020-03-18 */ - void save(OperRoleDTO dto); + void save(GovRoleDTO dto); /** * 默认更新 @@ -81,7 +81,7 @@ public interface OperRoleService extends BaseService { * @author generator * @date 2020-03-18 */ - void update(OperRoleDTO dto); + void update(GovRoleDTO dto); /** * 批量删除 diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/OperRoleUserService.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/GovRoleUserService.java similarity index 83% rename from epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/OperRoleUserService.java rename to epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/GovRoleUserService.java index c2e323528c..ff67c7d239 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/OperRoleUserService.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/GovRoleUserService.java @@ -19,8 +19,8 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; -import com.epmet.dto.OperRoleUserDTO; -import com.epmet.entity.OperRoleUserEntity; +import com.epmet.dto.GovRoleUserDTO; +import com.epmet.entity.GovRoleUserEntity; import java.util.List; import java.util.Map; @@ -31,37 +31,37 @@ import java.util.Map; * @author generator generator@elink-cn.com * @since v1.0.0 2020-03-18 */ -public interface OperRoleUserService extends BaseService { +public interface GovRoleUserService extends BaseService { /** * 默认分页 * * @param params - * @return PageData + * @return PageData * @author generator * @date 2020-03-18 */ - PageData page(Map params); + PageData page(Map params); /** * 默认查询 * * @param params - * @return java.util.List + * @return java.util.List * @author generator * @date 2020-03-18 */ - List list(Map params); + List list(Map params); /** * 单条查询 * * @param id - * @return OperRoleUserDTO + * @return GovRoleUserDTO * @author generator * @date 2020-03-18 */ - OperRoleUserDTO get(String id); + GovRoleUserDTO get(String id); /** * 默认保存 @@ -71,7 +71,7 @@ public interface OperRoleUserService extends BaseService { * @author generator * @date 2020-03-18 */ - void save(OperRoleUserDTO dto); + void save(GovRoleUserDTO dto); /** * 默认更新 @@ -81,7 +81,7 @@ public interface OperRoleUserService extends BaseService { * @author generator * @date 2020-03-18 */ - void update(OperRoleUserDTO dto); + void update(GovRoleUserDTO dto); /** * 批量删除 diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/OperLanguageServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovLanguageServiceImpl.java similarity index 65% rename from epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/OperLanguageServiceImpl.java rename to epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovLanguageServiceImpl.java index bc07525c87..43e21684ef 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/OperLanguageServiceImpl.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovLanguageServiceImpl.java @@ -23,11 +23,11 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.dao.OperLanguageDao; -import com.epmet.dto.OperLanguageDTO; -import com.epmet.entity.OperLanguageEntity; -import com.epmet.redis.OperLanguageRedis; -import com.epmet.service.OperLanguageService; +import com.epmet.dao.GovLanguageDao; +import com.epmet.dto.GovLanguageDTO; +import com.epmet.entity.GovLanguageEntity; +import com.epmet.redis.GovLanguageRedis; +import com.epmet.service.GovLanguageService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -44,53 +44,53 @@ import java.util.Map; * @since v1.0.0 2020-03-18 */ @Service -public class OperLanguageServiceImpl extends BaseServiceImpl implements OperLanguageService { +public class GovLanguageServiceImpl extends BaseServiceImpl implements GovLanguageService { @Autowired - private OperLanguageRedis operLanguageRedis; + private GovLanguageRedis govLanguageRedis; @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( + public PageData page(Map params) { + IPage page = baseDao.selectPage( getPage(params, FieldConstant.CREATED_TIME, false), getWrapper(params) ); - return getPageData(page, OperLanguageDTO.class); + return getPageData(page, GovLanguageDTO.class); } @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); - return ConvertUtils.sourceToTarget(entityList, OperLanguageDTO.class); + return ConvertUtils.sourceToTarget(entityList, GovLanguageDTO.class); } - private QueryWrapper getWrapper(Map params){ + private QueryWrapper getWrapper(Map params){ String id = (String)params.get(FieldConstant.ID_HUMP); - QueryWrapper wrapper = new QueryWrapper<>(); + QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); return wrapper; } @Override - public OperLanguageDTO get(String id) { - OperLanguageEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, OperLanguageDTO.class); + public GovLanguageDTO get(String id) { + GovLanguageEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, GovLanguageDTO.class); } @Override @Transactional(rollbackFor = Exception.class) - public void save(OperLanguageDTO dto) { - OperLanguageEntity entity = ConvertUtils.sourceToTarget(dto, OperLanguageEntity.class); + public void save(GovLanguageDTO dto) { + GovLanguageEntity entity = ConvertUtils.sourceToTarget(dto, GovLanguageEntity.class); insert(entity); } @Override @Transactional(rollbackFor = Exception.class) - public void update(OperLanguageDTO dto) { - OperLanguageEntity entity = ConvertUtils.sourceToTarget(dto, OperLanguageEntity.class); + public void update(GovLanguageDTO dto) { + GovLanguageEntity entity = ConvertUtils.sourceToTarget(dto, GovLanguageEntity.class); updateById(entity); } @@ -103,7 +103,7 @@ public class OperLanguageServiceImpl extends BaseServiceImpl implements OperMenuService { +public class GovMenuServiceImpl extends BaseServiceImpl implements GovMenuService { protected Logger logger = LoggerFactory.getLogger(getClass()); @Autowired - private OperMenuRedis operMenuRedis; + private GovMenuRedis govMenuRedis; @Autowired private EpmetUserFeignClient epmetUserFeignClient; @Autowired - private OperRoleMenuService operRoleMenuService; + private GovRoleMenuService govRoleMenuService; @Autowired - private OperResourceService operResourceService; + private GovResourceService govResourceService; @Autowired - private OperLanguageService operLanguageService; + private GovLanguageService govLanguageService; @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( + public PageData page(Map params) { + IPage page = baseDao.selectPage( getPage(params, FieldConstant.CREATED_TIME, false), getWrapper(params) ); - return getPageData(page, OperMenuDTO.class); + return getPageData(page, GovMenuDTO.class); } @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); - return ConvertUtils.sourceToTarget(entityList, OperMenuDTO.class); + return ConvertUtils.sourceToTarget(entityList, GovMenuDTO.class); } - private QueryWrapper getWrapper(Map params){ + private QueryWrapper getWrapper(Map params){ String id = (String)params.get(FieldConstant.ID_HUMP); - QueryWrapper wrapper = new QueryWrapper<>(); + QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); return wrapper; } @Override - public OperMenuDTO get(String id) { - OperMenuEntity entity = baseDao.getById(id, HttpContextUtils.getLanguage()); + public GovMenuDTO get(String id) { + GovMenuEntity entity = baseDao.getById(id, HttpContextUtils.getLanguage()); - return ConvertUtils.sourceToTarget(entity, OperMenuDTO.class); + return ConvertUtils.sourceToTarget(entity, GovMenuDTO.class); } @Override @Transactional(rollbackFor = Exception.class) - public void save(OperMenuDTO dto, TokenDto tokenDto) { - OperMenuEntity entity = ConvertUtils.sourceToTarget(dto, OperMenuEntity.class); + public void save(GovMenuDTO dto, TokenDto tokenDto) { + GovMenuEntity entity = ConvertUtils.sourceToTarget(dto, GovMenuEntity.class); //保存菜单 insert(entity); saveLanguage(entity.getId(), "name", entity.getName()); //保存菜单资源 - operResourceService.saveMenuResource(entity.getId(), entity.getName(), dto.getResourceList()); + govResourceService.saveMenuResource(entity.getId(), entity.getName(), dto.getResourceList()); //清空当前用户，菜单导航、权限标识 - operMenuRedis.delete(tokenDto.getUserId(), tokenDto.getApp(), tokenDto.getClient()); + govMenuRedis.delete(tokenDto.getUserId(), tokenDto.getApp(), tokenDto.getClient()); } @Override @Transactional(rollbackFor = Exception.class) - public void update(OperMenuDTO dto, TokenDto tokenDto) { - OperMenuEntity entity = ConvertUtils.sourceToTarget(dto, OperMenuEntity.class); + public void update(GovMenuDTO dto, TokenDto tokenDto) { + GovMenuEntity entity = ConvertUtils.sourceToTarget(dto, GovMenuEntity.class); //上级菜单不能为自身 if(entity.getId().equals(entity.getPid())){ @@ -134,10 +131,10 @@ public class OperMenuServiceImpl extends BaseServiceImpl getUserMenuList(TokenDto tokenDto, Integer type) { - List menuList; + public List getUserMenuList(TokenDto tokenDto, Integer type) { + List menuList; -// Result operUserDTOResult = epmetUserFeignClient.info(tokenDto.getUserId()); +// Result govUserDTOResult = epmetUserFeignClient.info(tokenDto.getUserId()); // //系统管理员，拥有最高权限 -// if(operUserDTOResult.getData().getSuperAdmin() == SuperAdminEnum.YES.value()){ +// if(govUserDTOResult.getData().getSuperAdmin() == SuperAdminEnum.YES.value()){ menuList = baseDao.getMenuList(type, HttpContextUtils.getLanguage()); // }else { // menuList = baseDao.getUserMenuList(tokenDto.getUserId(), type, HttpContextUtils.getLanguage()); // } - List dtoList = ConvertUtils.sourceToTarget(menuList, OperMenuDTO.class); + List dtoList = ConvertUtils.sourceToTarget(menuList, GovMenuDTO.class); return TreeUtils.buildTree(dtoList); } @Override - public List getMenuList(Integer type) { - List menuList = baseDao.getMenuList(type, HttpContextUtils.getLanguage()); + public List getMenuList(Integer type) { + List menuList = baseDao.getMenuList(type, HttpContextUtils.getLanguage()); - List dtoList = ConvertUtils.sourceToTarget(menuList, OperMenuDTO.class); + List dtoList = ConvertUtils.sourceToTarget(menuList, GovMenuDTO.class); return TreeUtils.buildTree(dtoList, Constant.OPER_MENU_ROOT); } @Override - public List getUserMenuNavList(TokenDto tokenDto) { - List menuList = operMenuRedis.getUserMenuNavList(tokenDto.getUserId(), tokenDto.getApp(), tokenDto.getClient()); + public List getUserMenuNavList(TokenDto tokenDto) { + List menuList = govMenuRedis.getUserMenuNavList(tokenDto.getUserId(), tokenDto.getApp(), tokenDto.getClient()); if(menuList == null){ menuList = getUserMenuList(tokenDto, MenuTypeEnum.MENU.value()); - operMenuRedis.setUserMenuNavList(tokenDto.getUserId(), tokenDto.getApp(), tokenDto.getClient(), menuList); + govMenuRedis.setUserMenuNavList(tokenDto.getUserId(), tokenDto.getApp(), tokenDto.getClient(), menuList); } return menuList; @@ -201,50 +198,50 @@ public class OperMenuServiceImpl extends BaseServiceImpl getUserPermissions(TokenDto tokenDto) { //用户权限列表 - Set permsSet = operMenuRedis.getUserPermissions(tokenDto.getUserId(), tokenDto.getApp(), tokenDto.getClient()); + Set permsSet = govMenuRedis.getUserPermissions(tokenDto.getUserId(), tokenDto.getApp(), tokenDto.getClient()); if(permsSet != null){ return permsSet; } -// Result operUserDTOResult = epmetUserFeignClient.info(tokenDto.getUserId()); +// Result govUserDTOResult = epmetUserFeignClient.info(tokenDto.getUserId()); //超级管理员，拥有最高权限 - List menuList; -// if(operUserDTOResult.getData().getSuperAdmin() == SuperAdminEnum.YES.value()){ + List menuList; +// if(govUserDTOResult.getData().getSuperAdmin() == SuperAdminEnum.YES.value()){ menuList = baseDao.getMenuList(MenuTypeEnum.BUTTON.value(), HttpContextUtils.getLanguage()); // }else{ // menuList = baseDao.getUserMenuList(tokenDto.getUserId(), MenuTypeEnum.BUTTON.value(), HttpContextUtils.getLanguage()); // } permsSet = new HashSet<>(); - for(OperMenuEntity menu : menuList){ + for(GovMenuEntity menu : menuList){ if(StringUtils.isNotBlank(menu.getPermissions())){ permsSet.add(menu.getPermissions()); } } //保存到缓存 - operMenuRedis.setUserPermissions(tokenDto.getUserId(), tokenDto.getApp(), tokenDto.getClient(), permsSet); + govMenuRedis.setUserPermissions(tokenDto.getUserId(), tokenDto.getApp(), tokenDto.getClient(), permsSet); return permsSet; } @Override - public List getListPid(String pid) { - List menuList = baseDao.getListPid(pid); + public List getListPid(String pid) { + List menuList = baseDao.getListPid(pid); - return ConvertUtils.sourceToTarget(menuList, OperMenuDTO.class); + return ConvertUtils.sourceToTarget(menuList, GovMenuDTO.class); } @Override public void clearOperUserAccess(String app, String client, String userId) { //清空当前用户，菜单导航、权限标识 - operMenuRedis.delete(userId, app, client); + govMenuRedis.delete(userId, app, client); logger.info(String.format("运营端用户退出系统%s,清空菜单、权限成功",userId)); } private void saveLanguage(String tableId, String fieldName, String fieldValue){ - operLanguageService.saveOrUpdate("oper_menu", tableId, fieldName, fieldValue, HttpContextUtils.getLanguage()); + govLanguageService.saveOrUpdate("gov_menu", tableId, fieldName, fieldValue, HttpContextUtils.getLanguage()); } } \ No newline at end of file diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/OperResourceServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovResourceServiceImpl.java similarity index 68% rename from epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/OperResourceServiceImpl.java rename to epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovResourceServiceImpl.java index c12d519b2c..2cb1da7087 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/OperResourceServiceImpl.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovResourceServiceImpl.java @@ -25,13 +25,13 @@ import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.enums.ResourceAuthEnum; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.dao.OperResourceDao; -import com.epmet.dto.OperResourceDTO; +import com.epmet.dao.GovResourceDao; +import com.epmet.dto.GovResourceDTO; import com.epmet.dto.result.MenuResourceDTO; -import com.epmet.entity.OperResourceEntity; +import com.epmet.entity.GovResourceEntity; import com.epmet.enums.MenuFlagEnum; -import com.epmet.redis.OperResourceRedis; -import com.epmet.service.OperResourceService; +import com.epmet.redis.GovResourceRedis; +import com.epmet.service.GovResourceService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -48,53 +48,53 @@ import java.util.Map; * @since v1.0.0 2020-03-18 */ @Service -public class OperResourceServiceImpl extends BaseServiceImpl implements OperResourceService { +public class GovResourceServiceImpl extends BaseServiceImpl implements GovResourceService { @Autowired - private OperResourceRedis operResourceRedis; + private GovResourceRedis govResourceRedis; @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( + public PageData page(Map params) { + IPage page = baseDao.selectPage( getPage(params, FieldConstant.CREATED_TIME, false), getWrapper(params) ); - return getPageData(page, OperResourceDTO.class); + return getPageData(page, GovResourceDTO.class); } @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); - return ConvertUtils.sourceToTarget(entityList, OperResourceDTO.class); + return ConvertUtils.sourceToTarget(entityList, GovResourceDTO.class); } - private QueryWrapper getWrapper(Map params){ + private QueryWrapper getWrapper(Map params){ String id = (String)params.get(FieldConstant.ID_HUMP); - QueryWrapper wrapper = new QueryWrapper<>(); + QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); return wrapper; } @Override - public OperResourceDTO get(String id) { - OperResourceEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, OperResourceDTO.class); + public GovResourceDTO get(String id) { + GovResourceEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, GovResourceDTO.class); } @Override @Transactional(rollbackFor = Exception.class) - public void save(OperResourceDTO dto) { - OperResourceEntity entity = ConvertUtils.sourceToTarget(dto, OperResourceEntity.class); + public void save(GovResourceDTO dto) { + GovResourceEntity entity = ConvertUtils.sourceToTarget(dto, GovResourceEntity.class); insert(entity); } @Override @Transactional(rollbackFor = Exception.class) - public void update(OperResourceDTO dto) { - OperResourceEntity entity = ConvertUtils.sourceToTarget(dto, OperResourceEntity.class); + public void update(GovResourceDTO dto) { + GovResourceEntity entity = ConvertUtils.sourceToTarget(dto, GovResourceEntity.class); updateById(entity); } @@ -111,7 +111,7 @@ public class OperResourceServiceImpl extends BaseServiceImpl getMenuResourceList(String menuId) { - List entityList = baseDao.getMenuResourceList(menuId+""); + List entityList = baseDao.getMenuResourceList(menuId+""); return ConvertUtils.sourceToTarget(entityList, MenuResourceDTO.class); } diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/OperRoleMenuServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleMenuServiceImpl.java similarity index 65% rename from epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/OperRoleMenuServiceImpl.java rename to epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleMenuServiceImpl.java index f4206928b9..ec31c69146 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/OperRoleMenuServiceImpl.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleMenuServiceImpl.java @@ -24,11 +24,11 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.dao.OperRoleMenuDao; -import com.epmet.dto.OperRoleMenuDTO; -import com.epmet.entity.OperRoleMenuEntity; -import com.epmet.redis.OperRoleMenuRedis; -import com.epmet.service.OperRoleMenuService; +import com.epmet.dao.GovRoleMenuDao; +import com.epmet.dto.GovRoleMenuDTO; +import com.epmet.entity.GovRoleMenuEntity; +import com.epmet.redis.GovRoleMenuRedis; +import com.epmet.service.GovRoleMenuService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -45,55 +45,55 @@ import java.util.Map; * @since v1.0.0 2020-03-18 */ @Service -public class OperRoleMenuServiceImpl extends BaseServiceImpl implements OperRoleMenuService { +public class GovRoleMenuServiceImpl extends BaseServiceImpl implements GovRoleMenuService { @Autowired - private OperRoleMenuRedis operRoleMenuRedis; + private GovRoleMenuRedis govRoleMenuRedis; @Autowired - private OperRoleMenuDao operRoleMenuDao; + private GovRoleMenuDao govRoleMenuDao; @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( + public PageData page(Map params) { + IPage page = baseDao.selectPage( getPage(params, FieldConstant.CREATED_TIME, false), getWrapper(params) ); - return getPageData(page, OperRoleMenuDTO.class); + return getPageData(page, GovRoleMenuDTO.class); } @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); - return ConvertUtils.sourceToTarget(entityList, OperRoleMenuDTO.class); + return ConvertUtils.sourceToTarget(entityList, GovRoleMenuDTO.class); } - private QueryWrapper getWrapper(Map params){ + private QueryWrapper getWrapper(Map params){ String id = (String)params.get(FieldConstant.ID_HUMP); - QueryWrapper wrapper = new QueryWrapper<>(); + QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); return wrapper; } @Override - public OperRoleMenuDTO get(String id) { - OperRoleMenuEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, OperRoleMenuDTO.class); + public GovRoleMenuDTO get(String id) { + GovRoleMenuEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, GovRoleMenuDTO.class); } @Override @Transactional(rollbackFor = Exception.class) - public void save(OperRoleMenuDTO dto) { - OperRoleMenuEntity entity = ConvertUtils.sourceToTarget(dto, OperRoleMenuEntity.class); + public void save(GovRoleMenuDTO dto) { + GovRoleMenuEntity entity = ConvertUtils.sourceToTarget(dto, GovRoleMenuEntity.class); insert(entity); } @Override @Transactional(rollbackFor = Exception.class) - public void update(OperRoleMenuDTO dto) { - OperRoleMenuEntity entity = ConvertUtils.sourceToTarget(dto, OperRoleMenuEntity.class); + public void update(GovRoleMenuDTO dto) { + GovRoleMenuEntity entity = ConvertUtils.sourceToTarget(dto, GovRoleMenuEntity.class); updateById(entity); } @@ -122,12 +122,12 @@ public class OperRoleMenuServiceImpl extends BaseServiceImpl implements OperRoleService { +public class GovRoleServiceImpl extends BaseServiceImpl implements GovRoleService { @Autowired - private OperRoleRedis operRoleRedis; + private GovRoleRedis govRoleRedis; @Autowired - private OperRoleMenuService OperRoleMenuService; + private GovRoleMenuService govRoleMenuService; @Autowired - private OperRoleUserService operRoleUserService; + private GovRoleUserService govRoleUserService; @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( + public PageData page(Map params) { + IPage page = baseDao.selectPage( getPage(params, FieldConstant.CREATED_TIME, false), getWrapper(params) ); - return getPageData(page, OperRoleDTO.class); + return getPageData(page, GovRoleDTO.class); } @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); - return ConvertUtils.sourceToTarget(entityList, OperRoleDTO.class); + return ConvertUtils.sourceToTarget(entityList, GovRoleDTO.class); } - private QueryWrapper getWrapper(Map params){ + private QueryWrapper getWrapper(Map params){ String id = (String)params.get(FieldConstant.ID_HUMP); String name = (String)params.get(FieldConstant.NAME_HUMP); - QueryWrapper wrapper = new QueryWrapper<>(); + QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id).like(StringUtils.isNotBlank(name), FieldConstant.NAME, name); return wrapper; } @Override - public OperRoleDTO get(String id) { - OperRoleEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, OperRoleDTO.class); + public GovRoleDTO get(String id) { + GovRoleEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, GovRoleDTO.class); } @Override @Transactional(rollbackFor = Exception.class) - public void save(OperRoleDTO dto) { - OperRoleEntity entity = ConvertUtils.sourceToTarget(dto, OperRoleEntity.class); + public void save(GovRoleDTO dto) { + GovRoleEntity entity = ConvertUtils.sourceToTarget(dto, GovRoleEntity.class); insert(entity); //保存角色菜单关系 - OperRoleMenuService.saveOrUpdate(entity.getId(), dto.getMenuIdList()); + govRoleMenuService.saveOrUpdate(entity.getId(), dto.getMenuIdList()); } @Override @Transactional(rollbackFor = Exception.class) - public void update(OperRoleDTO dto) { - OperRoleEntity entity = ConvertUtils.sourceToTarget(dto, OperRoleEntity.class); + public void update(GovRoleDTO dto) { + GovRoleEntity entity = ConvertUtils.sourceToTarget(dto, GovRoleEntity.class); updateById(entity); //保存角色菜单关系 - OperRoleMenuService.saveOrUpdate(entity.getId(), dto.getMenuIdList()); + govRoleMenuService.saveOrUpdate(entity.getId(), dto.getMenuIdList()); } @Override @@ -110,9 +110,9 @@ public class OperRoleServiceImpl extends BaseServiceImpl implements OperRoleUserService { +public class GovRoleUserServiceImpl extends BaseServiceImpl implements GovRoleUserService { @Autowired - private OperRoleUserRedis operRoleUserRedis; + private GovRoleUserRedis govRoleUserRedis; @Autowired - private OperRoleUserDao operRoleUserDao; + private GovRoleUserDao govRoleUserDao; @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( + public PageData page(Map params) { + IPage page = baseDao.selectPage( getPage(params, FieldConstant.CREATED_TIME, false), getWrapper(params) ); - return getPageData(page, OperRoleUserDTO.class); + return getPageData(page, GovRoleUserDTO.class); } @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); - return ConvertUtils.sourceToTarget(entityList, OperRoleUserDTO.class); + return ConvertUtils.sourceToTarget(entityList, GovRoleUserDTO.class); } - private QueryWrapper getWrapper(Map params){ + private QueryWrapper getWrapper(Map params){ String id = (String)params.get(FieldConstant.ID_HUMP); - QueryWrapper wrapper = new QueryWrapper<>(); + QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); return wrapper; } @Override - public OperRoleUserDTO get(String id) { - OperRoleUserEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, OperRoleUserDTO.class); + public GovRoleUserDTO get(String id) { + GovRoleUserEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, GovRoleUserDTO.class); } @Override @Transactional(rollbackFor = Exception.class) - public void save(OperRoleUserDTO dto) { - OperRoleUserEntity entity = ConvertUtils.sourceToTarget(dto, OperRoleUserEntity.class); + public void save(GovRoleUserDTO dto) { + GovRoleUserEntity entity = ConvertUtils.sourceToTarget(dto, GovRoleUserEntity.class); insert(entity); } @Override @Transactional(rollbackFor = Exception.class) - public void update(OperRoleUserDTO dto) { - OperRoleUserEntity entity = ConvertUtils.sourceToTarget(dto, OperRoleUserEntity.class); + public void update(GovRoleUserDTO dto) { + GovRoleUserEntity entity = ConvertUtils.sourceToTarget(dto, GovRoleUserEntity.class); updateById(entity); } @@ -117,23 +117,23 @@ public class OperRoleUserServiceImpl extends BaseServiceImpl - + - + select * from gov_language where table_name=#{tableName} and table_id=#{tableId} and field_name=#{fieldName} and language=#{language} - - INSERT INTO `oper_language` ( `table_name`, `table_id`, `field_name`, `field_value`, `language` ) + + INSERT INTO `gov_language` ( `table_name`, `table_id`, `field_name`, `field_value`, `language` ) VALUES ( #{tableName}, #{tableId}, #{fieldName}, #{fieldValue}, #{language} ) diff --git a/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/GovMenuDao.xml b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/GovMenuDao.xml new file mode 100644 index 0000000000..90d0b8ee92 --- /dev/null +++ b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/GovMenuDao.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + diff --git a/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/GovResourceDao.xml b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/GovResourceDao.xml new file mode 100644 index 0000000000..8296d14065 --- /dev/null +++ b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/GovResourceDao.xml @@ -0,0 +1,25 @@ + + + + + + + delete from gov_resource where resource_code = #{value} + + + + + + + + + diff --git a/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/OperRoleDao.xml b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/GovRoleDao.xml similarity index 77% rename from epmet-module/gov-access/gov-access-server/src/main/resources/mapper/OperRoleDao.xml rename to epmet-module/gov-access/gov-access-server/src/main/resources/mapper/GovRoleDao.xml index e1df3a1038..2de28e07bf 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/OperRoleDao.xml +++ b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/GovRoleDao.xml @@ -1,6 +1,6 @@ - + diff --git a/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/OperRoleMenuDao.xml b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/GovRoleMenuDao.xml similarity index 57% rename from epmet-module/gov-access/gov-access-server/src/main/resources/mapper/OperRoleMenuDao.xml rename to epmet-module/gov-access/gov-access-server/src/main/resources/mapper/GovRoleMenuDao.xml index b9075fceda..862679b5de 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/OperRoleMenuDao.xml +++ b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/GovRoleMenuDao.xml @@ -1,25 +1,25 @@ - + - update oper_role_menu set del_flag = 1 where del_flag = 0 and role_id in + update gov_role_menu set del_flag = 1 where del_flag = 0 and role_id in #{roleId} - update oper_role_menu set del_flag = 1 where role_id = #{value} and del_flag = 0 + update gov_role_menu set del_flag = 1 where role_id = #{value} and del_flag = 0 - update oper_role_menu set del_flag = 1 where menu_id = #{value} and del_flag = 0 + update gov_role_menu set del_flag = 1 where menu_id = #{value} and del_flag = 0 diff --git a/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/OperRoleUserDao.xml b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/GovRoleUserDao.xml similarity index 58% rename from epmet-module/gov-access/gov-access-server/src/main/resources/mapper/OperRoleUserDao.xml rename to epmet-module/gov-access/gov-access-server/src/main/resources/mapper/GovRoleUserDao.xml index 005ef2451c..b5cb172451 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/OperRoleUserDao.xml +++ b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/GovRoleUserDao.xml @@ -1,32 +1,32 @@ - + - update oper_role_user set del_flag = 1 where del_flag = 0 and role_id in + update gov_role_user set del_flag = 1 where del_flag = 0 and role_id in #{roleId} - update oper_role_user set del_flag = 1 where del_flag = 0 and user_id in + update gov_role_user set del_flag = 1 where del_flag = 0 and user_id in #{userId} - update oper_role_user set del_flag = 1 where role_id = #{value} and del_flag = 0 + update gov_role_user set del_flag = 1 where role_id = #{value} and del_flag = 0 - update oper_role_user set del_flag = 1 where user_id = #{value} and del_flag = 0 + update gov_role_user set del_flag = 1 where user_id = #{value} and del_flag = 0 diff --git a/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/OperMenuDao.xml b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/OperMenuDao.xml deleted file mode 100644 index e3a61dbd36..0000000000 --- a/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/OperMenuDao.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - diff --git a/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/OperResourceDao.xml b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/OperResourceDao.xml deleted file mode 100644 index 94c839c252..0000000000 --- a/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/OperResourceDao.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - delete from oper_resource where resource_code = #{value} - - - - - - - - -