Merge branch 'dev_plugins' into dev_temp

epmet-module/gov-access/gov-access-client/pom.xml

@@ -17,5 +17,11 @@
             <artifactId>epmet-commons-tools</artifactId>
             <version>2.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>1.5.20</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 </project>

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
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+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;
+
+}

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
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+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<GovMenuDTO> 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<MenuResourceDTO> resourceList;
+
+	/**
+	 * 上级菜单名称
+	 */
+	private String parentName;
+
+	/**
+	 * 是否显示，1：显示 0不显示
+	 */
+	private Integer showFlag;
+}

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
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+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;
+
+}

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
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+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<String> menuIdList;
+
+}

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
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+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;
+
+}

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
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+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;
+
+}

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;
+
+}

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;
+    }
+}

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;
+    }
+}

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.
+ * <p>
+ * https://www.renren.io
+ * <p>
+ * 版权所有，侵权必究！
+ */
+
+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;
+    }
+}

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.
+ * <p>
+ * https://www.renren.io
+ * <p>
+ * 版权所有，侵权必究！
+ */
+
+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;
+    }
+}

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;
+    }
+}

epmet-module/gov-access/gov-access-server/pom.xml

@@ -72,12 +72,6 @@
             <artifactId>feign-httpclient</artifactId>
             <version>10.3.0</version>
         </dependency>
-        <dependency>
-            <groupId>com.epmet</groupId>
-            <artifactId>oper-access-client</artifactId>
-            <version>2.0.0</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 
     <build>

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/OperLanguageController.java → 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.dto.GovLanguageDTO;
-import com.epmet.service.OperLanguageService;
+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<PageData<OperLanguageDTO>> page(@RequestParam Map<String, Object> params){
+    public Result<PageData<GovLanguageDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<OperLanguageDTO> page = operLanguageService.page(params);
+        PageData<GovLanguageDTO> page = govLanguageService.page(params);
-        return new Result<PageData<OperLanguageDTO>>().ok(page);
+        return new Result<PageData<GovLanguageDTO>>().ok(page);
     }
 
     @GetMapping("{id}")
-    public Result<OperLanguageDTO> get(@PathVariable("id") String id){
+    public Result<GovLanguageDTO> get(@PathVariable("id") String id){
-        OperLanguageDTO data = operLanguageService.get(id);
+        GovLanguageDTO data = govLanguageService.get(id);
-        return new Result<OperLanguageDTO>().ok(data);
+        return new Result<GovLanguageDTO>().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();
     }
 

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/OperMenuController.java → 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.GovMenuService;
-import com.epmet.service.OperResourceService;
+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<PageData<OperMenuDTO>> page(@RequestParam Map<String, Object> params){
+	public Result<PageData<GovMenuDTO>> page(@RequestParam Map<String, Object> params){
-		PageData<OperMenuDTO> page = operMenuService.page(params);
+		PageData<GovMenuDTO> page = govMenuService.page(params);
-		return new Result<PageData<OperMenuDTO>>().ok(page);
+		return new Result<PageData<GovMenuDTO>>().ok(page);
 	}
 
 	@GetMapping("{id}")
-	public Result<OperMenuDTO> get(@PathVariable("id") String id){
+	public Result<GovMenuDTO> get(@PathVariable("id") String id){
-		OperMenuDTO data = operMenuService.get(id);
+		GovMenuDTO data = govMenuService.get(id);
 
 		//菜单资源列表
-		List<MenuResourceDTO> resourceList = operResourceService.getMenuResourceList(id);
+		List<MenuResourceDTO> resourceList = govResourceService.getMenuResourceList(id);
 
-		return new Result<OperMenuDTO>().ok(data);
+		return new Result<GovMenuDTO>().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<OperMenuDTO> list = operMenuService.getListPid(id);
+		List<GovMenuDTO> 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<List<OperMenuDTO>>
+	 * @return Result<List<GovMenuDTO>>
 	 */
 	@GetMapping("list")
-	public Result<List<OperMenuDTO>> list(Integer type){
+	public Result<List<GovMenuDTO>> list(Integer type){
-		List<OperMenuDTO> list = operMenuService.getMenuList(type);
+		List<GovMenuDTO> list = govMenuService.getMenuList(type);
 
-		return new Result<List<OperMenuDTO>>().ok(list);
+		return new Result<List<GovMenuDTO>>().ok(list);
 	}
 
 	/**
 	 * 导航
 	 * @param tokenDto token
-	 * @return List<OperMenuDTO>
+	 * @return List<GovMenuDTO>
 	 */
 	@GetMapping("nav")
-	public Result<List<OperMenuDTO>> nav(@LoginUser TokenDto tokenDto){
+	public Result<List<GovMenuDTO>> nav(@LoginUser TokenDto tokenDto){
-		List<OperMenuDTO> list = operMenuService.getUserMenuNavList(tokenDto);
+		List<GovMenuDTO> list = govMenuService.getUserMenuNavList(tokenDto);
-		return new Result<List<OperMenuDTO>>().ok(list);
+		return new Result<List<GovMenuDTO>>().ok(list);
 	}
 
 	/**
@@ -125,7 +125,7 @@ public class OperMenuController {
 	 */
 	@GetMapping("permissions")
 	public Result<Set<String>> permissions(@LoginUser TokenDto tokenDto){
-		Set<String> set = operMenuService.getUserPermissions(tokenDto);
+		Set<String> set = govMenuService.getUserPermissions(tokenDto);
 		return new Result<Set<String>>().ok(set);
 	}
 
@@ -135,10 +135,10 @@ public class OperMenuController {
 	 * @return
 	 */
 	@GetMapping("select")
-	public Result<List<OperMenuDTO>> select(@LoginUser TokenDto tokenDto){
+	public Result<List<GovMenuDTO>> select(@LoginUser TokenDto tokenDto){
-		List<OperMenuDTO> list = operMenuService.getUserMenuList(tokenDto, null);
+		List<GovMenuDTO> list = govMenuService.getUserMenuList(tokenDto, null);
 
-		return new Result<List<OperMenuDTO>>().ok(list);
+		return new Result<List<GovMenuDTO>>().ok(list);
 	}
 
 	/**
@@ -148,9 +148,9 @@ public class OperMenuController {
 	 * @Description 运营端用户退出系统，清空菜单和操作权限
 	 * @Date 2020/5/21 18:07
 	 **/
-	@GetMapping("clearoperuseraccess")
+	@GetMapping("cleargovuseraccess")
-	public Result clearOperUserAccess(@LoginUser TokenDto tokenDto) {
+	public Result clearGovUserAccess(@LoginUser TokenDto tokenDto) {
-		operMenuService.clearOperUserAccess(tokenDto.getApp(), tokenDto.getClient(), tokenDto.getUserId());
+		govMenuService.clearOperUserAccess(tokenDto.getApp(), tokenDto.getClient(), tokenDto.getUserId());
 		return new Result();
 	}
 }

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/OperResourceController.java → 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.dto.GovResourceDTO;
-import com.epmet.service.OperResourceService;
+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")
+@RequestMapping("govresource")
-public class OperResourceController {
+public class GovResourceController {
     
     @Autowired
-    private OperResourceService operResourceService;
+    private GovResourceService govResourceService;
 
     @GetMapping("page")
-    public Result<PageData<OperResourceDTO>> page(@RequestParam Map<String, Object> params){
+    public Result<PageData<GovResourceDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<OperResourceDTO> page = operResourceService.page(params);
+        PageData<GovResourceDTO> page = govResourceService.page(params);
-        return new Result<PageData<OperResourceDTO>>().ok(page);
+        return new Result<PageData<GovResourceDTO>>().ok(page);
     }
 
     @GetMapping("{id}")
-    public Result<OperResourceDTO> get(@PathVariable("id") String id){
+    public Result<GovResourceDTO> get(@PathVariable("id") String id){
-        OperResourceDTO data = operResourceService.get(id);
+        GovResourceDTO data = govResourceService.get(id);
-        return new Result<OperResourceDTO>().ok(data);
+        return new Result<GovResourceDTO>().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();
     }
 

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/OperRoleController.java → 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.dto.GovRoleDTO;
-import com.epmet.service.OperRoleMenuService;
+import com.epmet.service.GovRoleMenuService;
-import com.epmet.service.OperRoleService;
+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")
+@RequestMapping("govrole")
-public class OperRoleController {
+public class GovRoleController {
     
     @Autowired
-    private OperRoleService operRoleService;
+    private GovRoleService govRoleService;
     @Autowired
-    private OperRoleMenuService operRoleMenuService;
+    private GovRoleMenuService govRoleMenuService;
 
     @GetMapping("page")
-    public Result<PageData<OperRoleDTO>> page(@RequestParam Map<String, Object> params){
+    public Result<PageData<GovRoleDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<OperRoleDTO> page = operRoleService.page(params);
+        PageData<GovRoleDTO> page = govRoleService.page(params);
-        return new Result<PageData<OperRoleDTO>>().ok(page);
+        return new Result<PageData<GovRoleDTO>>().ok(page);
     }
 
     @GetMapping("{id}")
-    public Result<OperRoleDTO> get(@PathVariable("id") String id){
+    public Result<GovRoleDTO> get(@PathVariable("id") String id){
-        OperRoleDTO data = operRoleService.get(id);
+        GovRoleDTO data = govRoleService.get(id);
 
         //查询角色对应的菜单
-        List<String> menuIdList = operRoleMenuService.getMenuIdList(id);
+        List<String> menuIdList = govRoleMenuService.getMenuIdList(id);
         data.setMenuIdList(menuIdList);
 
-        return new Result<OperRoleDTO>().ok(data);
+        return new Result<GovRoleDTO>().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<OperRoleDTO>> list(){
+    public Result<List<GovRoleDTO>> list(){
-        List<OperRoleDTO> data = operRoleService.list(new HashMap<>(1));
+        List<GovRoleDTO> data = govRoleService.list(new HashMap<>(1));
 
-        return new Result<List<OperRoleDTO>>().ok(data);
+        return new Result<List<GovRoleDTO>>().ok(data);
     }
 
 }

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/OperRoleMenuController.java → 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.dto.GovRoleMenuDTO;
-import com.epmet.service.OperRoleMenuService;
+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")
+@RequestMapping("govrolemenu")
-public class OperRoleMenuController {
+public class GovRoleMenuController {
     
     @Autowired
-    private OperRoleMenuService operRoleMenuService;
+    private GovRoleMenuService govRoleMenuService;
 
     @GetMapping("page")
-    public Result<PageData<OperRoleMenuDTO>> page(@RequestParam Map<String, Object> params){
+    public Result<PageData<GovRoleMenuDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<OperRoleMenuDTO> page = operRoleMenuService.page(params);
+        PageData<GovRoleMenuDTO> page = govRoleMenuService.page(params);
-        return new Result<PageData<OperRoleMenuDTO>>().ok(page);
+        return new Result<PageData<GovRoleMenuDTO>>().ok(page);
     }
 
     @GetMapping("{id}")
-    public Result<OperRoleMenuDTO> get(@PathVariable("id") String id){
+    public Result<GovRoleMenuDTO> get(@PathVariable("id") String id){
-        OperRoleMenuDTO data = operRoleMenuService.get(id);
+        GovRoleMenuDTO data = govRoleMenuService.get(id);
-        return new Result<OperRoleMenuDTO>().ok(data);
+        return new Result<GovRoleMenuDTO>().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();
     }
 

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/OperRoleUserController.java → 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.dto.GovRoleUserDTO;
-import com.epmet.service.OperRoleUserService;
+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")
+@RequestMapping("govroleuser")
-public class OperRoleUserController {
+public class GovRoleUserController {
     
     @Autowired
-    private OperRoleUserService operRoleUserService;
+    private GovRoleUserService govRoleUserService;
 
     @GetMapping("page")
-    public Result<PageData<OperRoleUserDTO>> page(@RequestParam Map<String, Object> params){
+    public Result<PageData<GovRoleUserDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<OperRoleUserDTO> page = operRoleUserService.page(params);
+        PageData<GovRoleUserDTO> page = govRoleUserService.page(params);
-        return new Result<PageData<OperRoleUserDTO>>().ok(page);
+        return new Result<PageData<GovRoleUserDTO>>().ok(page);
     }
 
     @GetMapping("{id}")
-    public Result<OperRoleUserDTO> get(@PathVariable("id") String id){
+    public Result<GovRoleUserDTO> get(@PathVariable("id") String id){
-        OperRoleUserDTO data = operRoleUserService.get(id);
+        GovRoleUserDTO data = govRoleUserService.get(id);
-        return new Result<OperRoleUserDTO>().ok(data);
+        return new Result<GovRoleUserDTO>().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<List<String>>getRoleIdList(@PathVariable("id") String id) {
-         List<String> list = operRoleUserService.getRoleIdList(id);
+         List<String> list = govRoleUserService.getRoleIdList(id);
         return new Result<List<String>>().ok(list);
     }
 
@@ -103,7 +103,7 @@ public class OperRoleUserController {
      */
     @PostMapping("saveOrUpdateRole")
     public Result saveOrUpdate(@RequestParam("userId") String userId, @RequestBody List<String> 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();
     }
 

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/OperLanguageDao.java → 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<OperLanguageEntity> {
+public interface GovLanguageDao extends BaseDao<GovLanguageEntity> {
 
-    OperLanguageEntity getLanguage(OperLanguageEntity entity);
+    GovLanguageEntity getLanguage(GovLanguageEntity entity);
 
-    void updateLanguage(OperLanguageEntity entity);
+    void updateLanguage(GovLanguageEntity entity);
 
-    void insertOperLanguageEntity(OperLanguageEntity entity);
+    void insertOperLanguageEntity(GovLanguageEntity entity);
 }

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/OperMenuDao.java → 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<OperMenuEntity> {
+public interface GovMenuDao extends BaseDao<GovMenuEntity> {
 
-    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<OperMenuEntity> {
      * @param type 菜单类型
      * @param language 语言
      */
-    List<OperMenuEntity> getMenuList(@Param("type") Integer type, @Param("language") String language);
+    List<GovMenuEntity> getMenuList(@Param("type") Integer type, @Param("language") String language);
 
     /**
      * 查询用户菜单列表
@@ -41,12 +41,12 @@ public interface OperMenuDao extends BaseDao<OperMenuEntity> {
      * @param type 菜单类型
      * @param language 语言
      */
-    List<OperMenuEntity> getUserMenuList(@Param("userId") String userId, @Param("type") Integer type, @Param("language") String language);
+    List<GovMenuEntity> getUserMenuList(@Param("userId") String userId, @Param("type") Integer type, @Param("language") String language);
 
 
     /**
      * 根据父菜单，查询子菜单
      * @param pid  父菜单ID
      */
-    List<OperMenuEntity> getListPid(String pid);
+    List<GovMenuEntity> getListPid(String pid);
 }

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/OperResourceDao.java → 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<OperResourceEntity> {
+public interface GovResourceDao extends BaseDao<GovResourceEntity> {
     /**
      * 根据资源编码，删除对应的资源
      * @param code 资源编码
@@ -33,16 +33,16 @@ public interface OperResourceDao extends BaseDao<OperResourceEntity> {
      * 获取资源列表
      * @param menuId  菜单ID
      */
-    List<OperResourceEntity> getMenuResourceList(String menuId);
+    List<GovResourceEntity> getMenuResourceList(String menuId);
 
     /**
      * 获取所有资源列表
      */
-    List<OperResourceEntity> getResourceList();
+    List<GovResourceEntity> getResourceList();
 
     /**
      * 获取用户资源列表
      * @param userId 用户ID
      */
-    List<OperResourceEntity> getUserResourceList(@Param("userId") String userId);
+    List<GovResourceEntity> getUserResourceList(@Param("userId") String userId);
 }

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/OperRoleDao.java → 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<OperRoleEntity> {
+public interface GovRoleDao extends BaseDao<GovRoleEntity> {
 
 }

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/OperRoleMenuDao.java → 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<OperRoleMenuEntity> {
+public interface GovRoleMenuDao extends BaseDao<GovRoleMenuEntity> {
 
     /**
      * 根据角色ID，获取菜单ID列表

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/OperRoleUserDao.java → 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<OperRoleUserEntity> {
+public interface GovRoleUserDao extends BaseDao<GovRoleUserEntity> {
 
     /**
      * 根据角色ids，删除角色用户关系

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/OperLanguageEntity.java → 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")
+@TableName("gov_language")
-public class OperLanguageEntity implements Serializable {
+public class GovLanguageEntity implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	/**

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/OperMenuEntity.java → 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")
+@TableName("gov_menu")
-public class OperMenuEntity extends BaseEpmetEntity {
+public class GovMenuEntity extends BaseEpmetEntity {
 	private static final long serialVersionUID = 1L;
 
 	/**

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/OperResourceEntity.java → 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")
+@TableName("gov_resource")
-public class OperResourceEntity extends BaseEpmetEntity {
+public class GovResourceEntity extends BaseEpmetEntity {
 	private static final long serialVersionUID = 1L;
 
 	/**

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/OperRoleEntity.java → 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")
+@TableName("gov_role")
-public class OperRoleEntity extends BaseEpmetEntity {
+public class GovRoleEntity extends BaseEpmetEntity {
 	private static final long serialVersionUID = 1L;
 
 	/**

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/OperRoleMenuEntity.java → 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")
+@TableName("gov_role_menu")
-public class OperRoleMenuEntity extends BaseEpmetEntity {
+public class GovRoleMenuEntity extends BaseEpmetEntity {
 	private static final long serialVersionUID = 1L;
 	/**
 	 * 角色ID

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/OperRoleUserEntity.java → 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")
+@TableName("gov_role_user")
-public class OperRoleUserEntity extends BaseEpmetEntity {
+public class GovRoleUserEntity extends BaseEpmetEntity {
 	private static final long serialVersionUID = 1L;
 
 	/**

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/OperLanguageRedis.java → 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;
 

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/OperMenuRedis.java → 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<OperMenuDTO> menuList){
+    public void setUserMenuNavList(String userId, String app, String client, List<GovMenuDTO> menuList){
         String key = RedisKeys.getUserMenuNavKey(userId, app, client, HttpContextUtils.getLanguage());
         redisUtils.set(key, menuList);
     }
 
-    public List<OperMenuDTO> getUserMenuNavList(String userId, String app, String client){
+    public List<GovMenuDTO> getUserMenuNavList(String userId, String app, String client){
         String key = RedisKeys.getUserMenuNavKey(userId, app, client, HttpContextUtils.getLanguage());
-        return (List<OperMenuDTO>)redisUtils.get(key);
+        return (List<GovMenuDTO>)redisUtils.get(key);
     }
 
     public void setUserPermissions(String userId, String app, String client, Set<String> permsSet){

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/OperResourceRedis.java → 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;
 

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/OperRoleMenuRedis.java → 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;
 

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/OperRoleRedis.java → 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;
 

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/OperRoleUserRedis.java → 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;
 

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/OperLanguageService.java → 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.dto.GovLanguageDTO;
-import com.epmet.entity.OperLanguageEntity;
+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<OperLanguageEntity> {
+public interface GovLanguageService extends BaseService<GovLanguageEntity> {
 
     /**
      * 默认分页
      *
      * @param params
-     * @return PageData<OperLanguageDTO>
+     * @return PageData<GovLanguageDTO>
      * @author generator
      * @date 2020-03-18
      */
-    PageData<OperLanguageDTO> page(Map<String, Object> params);
+    PageData<GovLanguageDTO> page(Map<String, Object> params);
 
     /**
      * 默认查询
      *
      * @param params
-     * @return java.util.List<OperLanguageDTO>
+     * @return java.util.List<GovLanguageDTO>
      * @author generator
      * @date 2020-03-18
      */
-    List<OperLanguageDTO> list(Map<String, Object> params);
+    List<GovLanguageDTO> list(Map<String, Object> 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<OperLanguageEntity> {
      * @author generator
      * @date 2020-03-18
      */
-    void save(OperLanguageDTO dto);
+    void save(GovLanguageDTO dto);
 
     /**
      * 默认更新
@@ -81,7 +81,7 @@ public interface OperLanguageService extends BaseService<OperLanguageEntity> {
      * @author generator
      * @date 2020-03-18
      */
-    void update(OperLanguageDTO dto);
+    void update(GovLanguageDTO dto);
 
     /**
      * 批量删除

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/OperMenuService.java → 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.dto.GovMenuDTO;
-import com.epmet.entity.OperMenuEntity;
+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<OperMenuEntity> {
+public interface GovMenuService extends BaseService<GovMenuEntity> {
 
     /**
      * 默认分页
      *
      * @param params
-     * @return PageData<OperMenuDTO>
+     * @return PageData<GovMenuDTO>
      * @author generator
      * @date 2020-03-18
      */
-    PageData<OperMenuDTO> page(Map<String, Object> params);
+    PageData<GovMenuDTO> page(Map<String, Object> params);
 
     /**
      * 默认查询
      *
      * @param params
-     * @return java.util.List<OperMenuDTO>
+     * @return java.util.List<GovMenuDTO>
      * @author generator
      * @date 2020-03-18
      */
-    List<OperMenuDTO> list(Map<String, Object> params);
+    List<GovMenuDTO> list(Map<String, Object> 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<OperMenuEntity> {
      * @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<OperMenuEntity> {
      * @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<OperMenuEntity> {
      *
      * @param tokenDto 用户信息
      * @param type 菜单类型
-     * @return java.util.List<OperMenuDTO>
+     * @return java.util.List<GovMenuDTO>
      */
-    List<OperMenuDTO> getUserMenuList(TokenDto tokenDto, Integer type);
+    List<GovMenuDTO> getUserMenuList(TokenDto tokenDto, Integer type);
 
     /**
      * 菜单列表
      *
      * @param type 菜单类型
      */
-    List<OperMenuDTO> getMenuList(Integer type);
+    List<GovMenuDTO> getMenuList(Integer type);
 
     /**
      * 用户菜单导航
      * @param tokenDto 用户信息
-     * @return java.util.List<OperMenuDTO>
+     * @return java.util.List<GovMenuDTO>
      */
-    List<OperMenuDTO> getUserMenuNavList(TokenDto tokenDto);
+    List<GovMenuDTO> getUserMenuNavList(TokenDto tokenDto);
 
     /**
      * 获取用户权限标识
      * @param tokenDto 用户信息
-     * @return java.util.Set<OperMenuDTO>
+     * @return java.util.Set<GovMenuDTO>
      */
     Set<String> getUserPermissions(TokenDto tokenDto);
 
@@ -138,7 +138,7 @@ public interface OperMenuService extends BaseService<OperMenuEntity> {
      * 根据父菜单，查询子菜单
      * @param pid  父菜单ID
      */
-    List<OperMenuDTO> getListPid(String pid);
+    List<GovMenuDTO> getListPid(String pid);
 
     void clearOperUserAccess(String app, String client, String userId);
 }

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/OperResourceService.java → 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<OperResourceEntity> {
+public interface GovResourceService extends BaseService<GovResourceEntity> {
 
     /**
      * 默认分页
      *
      * @param params
-     * @return PageData<OperResourceDTO>
+     * @return PageData<GovResourceDTO>
      * @author generator
      * @date 2020-03-18
      */
-    PageData<OperResourceDTO> page(Map<String, Object> params);
+    PageData<GovResourceDTO> page(Map<String, Object> params);
 
     /**
      * 默认查询
      *
      * @param params
-     * @return java.util.List<OperResourceDTO>
+     * @return java.util.List<GovResourceDTO>
      * @author generator
      * @date 2020-03-18
      */
-    List<OperResourceDTO> list(Map<String, Object> params);
+    List<GovResourceDTO> list(Map<String, Object> 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<OperResourceEntity> {
      * @author generator
      * @date 2020-03-18
      */
-    void save(OperResourceDTO dto);
+    void save(GovResourceDTO dto);
 
     /**
      * 默认更新
@@ -82,7 +82,7 @@ public interface OperResourceService extends BaseService<OperResourceEntity> {
      * @author generator
      * @date 2020-03-18
      */
-    void update(OperResourceDTO dto);
+    void update(GovResourceDTO dto);
 
     /**
      * 批量删除

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/OperRoleMenuService.java → 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.dto.GovRoleMenuDTO;
-import com.epmet.entity.OperRoleMenuEntity;
+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<OperRoleMenuEntity> {
+public interface GovRoleMenuService extends BaseService<GovRoleMenuEntity> {
 
     /**
      * 默认分页
      *
      * @param params
-     * @return PageData<OperRoleMenuDTO>
+     * @return PageData<GovRoleMenuDTO>
      * @author generator
      * @date 2020-03-18
      */
-    PageData<OperRoleMenuDTO> page(Map<String, Object> params);
+    PageData<GovRoleMenuDTO> page(Map<String, Object> params);
 
     /**
      * 默认查询
      *
      * @param params
-     * @return java.util.List<OperRoleMenuDTO>
+     * @return java.util.List<GovRoleMenuDTO>
      * @author generator
      * @date 2020-03-18
      */
-    List<OperRoleMenuDTO> list(Map<String, Object> params);
+    List<GovRoleMenuDTO> list(Map<String, Object> 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<OperRoleMenuEntity> {
      * @author generator
      * @date 2020-03-18
      */
-    void save(OperRoleMenuDTO dto);
+    void save(GovRoleMenuDTO dto);
 
     /**
      * 默认更新
@@ -81,7 +81,7 @@ public interface OperRoleMenuService extends BaseService<OperRoleMenuEntity> {
      * @author generator
      * @date 2020-03-18
      */
-    void update(OperRoleMenuDTO dto);
+    void update(GovRoleMenuDTO dto);
 
     /**
      * 批量删除

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/OperRoleService.java → 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.dto.GovRoleDTO;
-import com.epmet.entity.OperRoleEntity;
+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<OperRoleEntity> {
+public interface GovRoleService extends BaseService<GovRoleEntity> {
 
     /**
      * 默认分页
      *
      * @param params
-     * @return PageData<OperRoleDTO>
+     * @return PageData<GovRoleDTO>
      * @author generator
      * @date 2020-03-18
      */
-    PageData<OperRoleDTO> page(Map<String, Object> params);
+    PageData<GovRoleDTO> page(Map<String, Object> params);
 
     /**
      * 默认查询
      *
      * @param params
-     * @return java.util.List<OperRoleDTO>
+     * @return java.util.List<GovRoleDTO>
      * @author generator
      * @date 2020-03-18
      */
-    List<OperRoleDTO> list(Map<String, Object> params);
+    List<GovRoleDTO> list(Map<String, Object> 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<OperRoleEntity> {
      * @author generator
      * @date 2020-03-18
      */
-    void save(OperRoleDTO dto);
+    void save(GovRoleDTO dto);
 
     /**
      * 默认更新
@@ -81,7 +81,7 @@ public interface OperRoleService extends BaseService<OperRoleEntity> {
      * @author generator
      * @date 2020-03-18
      */
-    void update(OperRoleDTO dto);
+    void update(GovRoleDTO dto);
 
     /**
      * 批量删除

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/OperRoleUserService.java → 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.dto.GovRoleUserDTO;
-import com.epmet.entity.OperRoleUserEntity;
+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<OperRoleUserEntity> {
+public interface GovRoleUserService extends BaseService<GovRoleUserEntity> {
 
     /**
      * 默认分页
      *
      * @param params
-     * @return PageData<OperRoleUserDTO>
+     * @return PageData<GovRoleUserDTO>
      * @author generator
      * @date 2020-03-18
      */
-    PageData<OperRoleUserDTO> page(Map<String, Object> params);
+    PageData<GovRoleUserDTO> page(Map<String, Object> params);
 
     /**
      * 默认查询
      *
      * @param params
-     * @return java.util.List<OperRoleUserDTO>
+     * @return java.util.List<GovRoleUserDTO>
      * @author generator
      * @date 2020-03-18
      */
-    List<OperRoleUserDTO> list(Map<String, Object> params);
+    List<GovRoleUserDTO> list(Map<String, Object> 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<OperRoleUserEntity> {
      * @author generator
      * @date 2020-03-18
      */
-    void save(OperRoleUserDTO dto);
+    void save(GovRoleUserDTO dto);
 
     /**
      * 默认更新
@@ -81,7 +81,7 @@ public interface OperRoleUserService extends BaseService<OperRoleUserEntity> {
      * @author generator
      * @date 2020-03-18
      */
-    void update(OperRoleUserDTO dto);
+    void update(GovRoleUserDTO dto);
 
     /**
      * 批量删除

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/OperLanguageServiceImpl.java → 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.dao.GovLanguageDao;
-import com.epmet.dto.OperLanguageDTO;
+import com.epmet.dto.GovLanguageDTO;
-import com.epmet.entity.OperLanguageEntity;
+import com.epmet.entity.GovLanguageEntity;
-import com.epmet.redis.OperLanguageRedis;
+import com.epmet.redis.GovLanguageRedis;
-import com.epmet.service.OperLanguageService;
+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<OperLanguageDao, OperLanguageEntity> implements OperLanguageService {
+public class GovLanguageServiceImpl extends BaseServiceImpl<GovLanguageDao, GovLanguageEntity> implements GovLanguageService {
 
     @Autowired
-    private OperLanguageRedis operLanguageRedis;
+    private GovLanguageRedis govLanguageRedis;
 
     @Override
-    public PageData<OperLanguageDTO> page(Map<String, Object> params) {
+    public PageData<GovLanguageDTO> page(Map<String, Object> params) {
-        IPage<OperLanguageEntity> page = baseDao.selectPage(
+        IPage<GovLanguageEntity> page = baseDao.selectPage(
                 getPage(params, FieldConstant.CREATED_TIME, false),
                 getWrapper(params)
         );
-        return getPageData(page, OperLanguageDTO.class);
+        return getPageData(page, GovLanguageDTO.class);
     }
 
     @Override
-    public List<OperLanguageDTO> list(Map<String, Object> params) {
+    public List<GovLanguageDTO> list(Map<String, Object> params) {
-        List<OperLanguageEntity> entityList = baseDao.selectList(getWrapper(params));
+        List<GovLanguageEntity> entityList = baseDao.selectList(getWrapper(params));
 
-        return ConvertUtils.sourceToTarget(entityList, OperLanguageDTO.class);
+        return ConvertUtils.sourceToTarget(entityList, GovLanguageDTO.class);
     }
 
-    private QueryWrapper<OperLanguageEntity> getWrapper(Map<String, Object> params){
+    private QueryWrapper<GovLanguageEntity> getWrapper(Map<String, Object> params){
         String id = (String)params.get(FieldConstant.ID_HUMP);
 
-        QueryWrapper<OperLanguageEntity> wrapper = new QueryWrapper<>();
+        QueryWrapper<GovLanguageEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
 
         return wrapper;
     }
 
     @Override
-    public OperLanguageDTO get(String id) {
+    public GovLanguageDTO get(String id) {
-        OperLanguageEntity entity = baseDao.selectById(id);
+        GovLanguageEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, OperLanguageDTO.class);
+        return ConvertUtils.sourceToTarget(entity, GovLanguageDTO.class);
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void save(OperLanguageDTO dto) {
+    public void save(GovLanguageDTO dto) {
-        OperLanguageEntity entity = ConvertUtils.sourceToTarget(dto, OperLanguageEntity.class);
+        GovLanguageEntity entity = ConvertUtils.sourceToTarget(dto, GovLanguageEntity.class);
         insert(entity);
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void update(OperLanguageDTO dto) {
+    public void update(GovLanguageDTO dto) {
-        OperLanguageEntity entity = ConvertUtils.sourceToTarget(dto, OperLanguageEntity.class);
+        GovLanguageEntity entity = ConvertUtils.sourceToTarget(dto, GovLanguageEntity.class);
         updateById(entity);
     }
 
@@ -103,7 +103,7 @@ public class OperLanguageServiceImpl extends BaseServiceImpl<OperLanguageDao, Op
 
     @Override
     public void saveOrUpdate(String tableName, String tableId, String fieldName, String fieldValue, String language) {
-        OperLanguageEntity entity = new OperLanguageEntity();
+        GovLanguageEntity entity = new GovLanguageEntity();
         entity.setTableName(tableName);
         entity.setTableId(tableId);
         entity.setFieldName(fieldName);

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/OperMenuServiceImpl.java → epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java

@@ -22,26 +22,23 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.Constant;
 import com.epmet.commons.tools.constant.FieldConstant;
-import com.epmet.commons.tools.enums.SuperAdminEnum;
 import com.epmet.commons.tools.exception.ErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.HttpContextUtils;
-import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.utils.TreeUtils;
-import com.epmet.dao.OperMenuDao;
+import com.epmet.dao.GovMenuDao;
-import com.epmet.dto.OperMenuDTO;
+import com.epmet.dto.GovMenuDTO;
-import com.epmet.dto.OperUserDTO;
+import com.epmet.entity.GovMenuEntity;
-import com.epmet.entity.OperMenuEntity;
 import com.epmet.enums.MenuTypeEnum;
 import com.epmet.feign.EpmetUserFeignClient;
-import com.epmet.redis.OperMenuRedis;
+import com.epmet.redis.GovMenuRedis;
-import com.epmet.service.OperLanguageService;
+import com.epmet.service.GovLanguageService;
-import com.epmet.service.OperMenuService;
+import com.epmet.service.GovMenuService;
-import com.epmet.service.OperResourceService;
+import com.epmet.service.GovResourceService;
-import com.epmet.service.OperRoleMenuService;
+import com.epmet.service.GovRoleMenuService;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -58,71 +55,71 @@ import java.util.*;
  * @since v1.0.0 2020-03-18
  */
 @Service
-public class OperMenuServiceImpl extends BaseServiceImpl<OperMenuDao, OperMenuEntity> implements OperMenuService {
+public class GovMenuServiceImpl extends BaseServiceImpl<GovMenuDao, GovMenuEntity> 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<OperMenuDTO> page(Map<String, Object> params) {
+    public PageData<GovMenuDTO> page(Map<String, Object> params) {
-        IPage<OperMenuEntity> page = baseDao.selectPage(
+        IPage<GovMenuEntity> page = baseDao.selectPage(
                 getPage(params, FieldConstant.CREATED_TIME, false),
                 getWrapper(params)
         );
-        return getPageData(page, OperMenuDTO.class);
+        return getPageData(page, GovMenuDTO.class);
     }
 
     @Override
-    public List<OperMenuDTO> list(Map<String, Object> params) {
+    public List<GovMenuDTO> list(Map<String, Object> params) {
-        List<OperMenuEntity> entityList = baseDao.selectList(getWrapper(params));
+        List<GovMenuEntity> entityList = baseDao.selectList(getWrapper(params));
 
-        return ConvertUtils.sourceToTarget(entityList, OperMenuDTO.class);
+        return ConvertUtils.sourceToTarget(entityList, GovMenuDTO.class);
     }
 
-    private QueryWrapper<OperMenuEntity> getWrapper(Map<String, Object> params){
+    private QueryWrapper<GovMenuEntity> getWrapper(Map<String, Object> params){
         String id = (String)params.get(FieldConstant.ID_HUMP);
 
-        QueryWrapper<OperMenuEntity> wrapper = new QueryWrapper<>();
+        QueryWrapper<GovMenuEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
 
         return wrapper;
     }
 
     @Override
-    public OperMenuDTO get(String id) {
+    public GovMenuDTO get(String id) {
-        OperMenuEntity entity = baseDao.getById(id, HttpContextUtils.getLanguage());
+        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) {
+    public void save(GovMenuDTO dto, TokenDto tokenDto) {
-        OperMenuEntity entity = ConvertUtils.sourceToTarget(dto, OperMenuEntity.class);
+        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) {
+    public void update(GovMenuDTO dto, TokenDto tokenDto) {
-        OperMenuEntity entity = ConvertUtils.sourceToTarget(dto, OperMenuEntity.class);
+        GovMenuEntity entity = ConvertUtils.sourceToTarget(dto, GovMenuEntity.class);
 
         //上级菜单不能为自身
         if(entity.getId().equals(entity.getPid())){
@@ -134,10 +131,10 @@ public class OperMenuServiceImpl extends BaseServiceImpl<OperMenuDao, OperMenuEn
         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
@@ -153,46 +150,46 @@ public class OperMenuServiceImpl extends BaseServiceImpl<OperMenuDao, OperMenuEn
         //逻辑删除
         baseDao.deleteBatchIds(Collections.singletonList(id));
         //删除角色菜单关系
-        operRoleMenuService.deleteByMenuId(id);
+        govRoleMenuService.deleteByMenuId(id);
 
         //清空当前用户，菜单导航、权限标识
-        operMenuRedis.delete(tokenDto.getUserId(), tokenDto.getApp(), tokenDto.getClient());
+        govMenuRedis.delete(tokenDto.getUserId(), tokenDto.getApp(), tokenDto.getClient());
     }
 
     @Override
-    public List<OperMenuDTO> getUserMenuList(TokenDto tokenDto, Integer type) {
+    public List<GovMenuDTO> getUserMenuList(TokenDto tokenDto, Integer type) {
-        List<OperMenuEntity> menuList;
+        List<GovMenuEntity> menuList;
 
-//        Result<OperUserDTO> operUserDTOResult = epmetUserFeignClient.info(tokenDto.getUserId());
+//        Result<GovUserDTO> 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<OperMenuDTO> dtoList = ConvertUtils.sourceToTarget(menuList, OperMenuDTO.class);
+        List<GovMenuDTO> dtoList = ConvertUtils.sourceToTarget(menuList, GovMenuDTO.class);
 
         return TreeUtils.buildTree(dtoList);
     }
 
     @Override
-    public List<OperMenuDTO> getMenuList(Integer type) {
+    public List<GovMenuDTO> getMenuList(Integer type) {
-        List<OperMenuEntity> menuList = baseDao.getMenuList(type, HttpContextUtils.getLanguage());
+        List<GovMenuEntity> menuList = baseDao.getMenuList(type, HttpContextUtils.getLanguage());
 
-        List<OperMenuDTO> dtoList = ConvertUtils.sourceToTarget(menuList, OperMenuDTO.class);
+        List<GovMenuDTO> dtoList = ConvertUtils.sourceToTarget(menuList, GovMenuDTO.class);
 
         return TreeUtils.buildTree(dtoList, Constant.OPER_MENU_ROOT);
     }
 
     @Override
-    public List<OperMenuDTO> getUserMenuNavList(TokenDto tokenDto) {
+    public List<GovMenuDTO> getUserMenuNavList(TokenDto tokenDto) {
-        List<OperMenuDTO> menuList = operMenuRedis.getUserMenuNavList(tokenDto.getUserId(), tokenDto.getApp(), tokenDto.getClient());
+        List<GovMenuDTO> 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<OperMenuDao, OperMenuEn
     @Override
     public Set<String> getUserPermissions(TokenDto tokenDto) {
         //用户权限列表
-        Set<String> permsSet = operMenuRedis.getUserPermissions(tokenDto.getUserId(), tokenDto.getApp(), tokenDto.getClient());
+        Set<String> permsSet = govMenuRedis.getUserPermissions(tokenDto.getUserId(), tokenDto.getApp(), tokenDto.getClient());
         if(permsSet != null){
             return permsSet;
         }
 
-//        Result<OperUserDTO> operUserDTOResult = epmetUserFeignClient.info(tokenDto.getUserId());
+//        Result<GovUserDTO> govUserDTOResult = epmetUserFeignClient.info(tokenDto.getUserId());
 
         //超级管理员，拥有最高权限
-        List<OperMenuEntity> menuList;
+        List<GovMenuEntity> menuList;
-//        if(operUserDTOResult.getData().getSuperAdmin() == SuperAdminEnum.YES.value()){
+//        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<OperMenuDTO> getListPid(String pid) {
+    public List<GovMenuDTO> getListPid(String pid) {
-        List<OperMenuEntity> menuList = baseDao.getListPid(pid);
+        List<GovMenuEntity> 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());
     }
 
 }

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/OperResourceServiceImpl.java → 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.dao.GovResourceDao;
-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 com.epmet.enums.MenuFlagEnum;
-import com.epmet.redis.OperResourceRedis;
+import com.epmet.redis.GovResourceRedis;
-import com.epmet.service.OperResourceService;
+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<OperResourceDao, OperResourceEntity> implements OperResourceService {
+public class GovResourceServiceImpl extends BaseServiceImpl<GovResourceDao, GovResourceEntity> implements GovResourceService {
 
     @Autowired
-    private OperResourceRedis operResourceRedis;
+    private GovResourceRedis govResourceRedis;
 
     @Override
-    public PageData<OperResourceDTO> page(Map<String, Object> params) {
+    public PageData<GovResourceDTO> page(Map<String, Object> params) {
-        IPage<OperResourceEntity> page = baseDao.selectPage(
+        IPage<GovResourceEntity> page = baseDao.selectPage(
                 getPage(params, FieldConstant.CREATED_TIME, false),
                 getWrapper(params)
         );
-        return getPageData(page, OperResourceDTO.class);
+        return getPageData(page, GovResourceDTO.class);
     }
 
     @Override
-    public List<OperResourceDTO> list(Map<String, Object> params) {
+    public List<GovResourceDTO> list(Map<String, Object> params) {
-        List<OperResourceEntity> entityList = baseDao.selectList(getWrapper(params));
+        List<GovResourceEntity> entityList = baseDao.selectList(getWrapper(params));
 
-        return ConvertUtils.sourceToTarget(entityList, OperResourceDTO.class);
+        return ConvertUtils.sourceToTarget(entityList, GovResourceDTO.class);
     }
 
-    private QueryWrapper<OperResourceEntity> getWrapper(Map<String, Object> params){
+    private QueryWrapper<GovResourceEntity> getWrapper(Map<String, Object> params){
         String id = (String)params.get(FieldConstant.ID_HUMP);
 
-        QueryWrapper<OperResourceEntity> wrapper = new QueryWrapper<>();
+        QueryWrapper<GovResourceEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
 
         return wrapper;
     }
 
     @Override
-    public OperResourceDTO get(String id) {
+    public GovResourceDTO get(String id) {
-        OperResourceEntity entity = baseDao.selectById(id);
+        GovResourceEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, OperResourceDTO.class);
+        return ConvertUtils.sourceToTarget(entity, GovResourceDTO.class);
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void save(OperResourceDTO dto) {
+    public void save(GovResourceDTO dto) {
-        OperResourceEntity entity = ConvertUtils.sourceToTarget(dto, OperResourceEntity.class);
+        GovResourceEntity entity = ConvertUtils.sourceToTarget(dto, GovResourceEntity.class);
         insert(entity);
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void update(OperResourceDTO dto) {
+    public void update(GovResourceDTO dto) {
-        OperResourceEntity entity = ConvertUtils.sourceToTarget(dto, OperResourceEntity.class);
+        GovResourceEntity entity = ConvertUtils.sourceToTarget(dto, GovResourceEntity.class);
         updateById(entity);
     }
 
@@ -111,7 +111,7 @@ public class OperResourceServiceImpl extends BaseServiceImpl<OperResourceDao, Op
         baseDao.deleteByCode(menuId+"");
 
         //删除缓存
-        operResourceRedis.delete();
+        govResourceRedis.delete();
 
         //菜单没有一个资源的情况
         if(CollUtil.isEmpty(resourceList)){
@@ -120,7 +120,7 @@ public class OperResourceServiceImpl extends BaseServiceImpl<OperResourceDao, Op
 
         //保存菜单资源关系
         for(MenuResourceDTO dto : resourceList){
-            OperResourceEntity entity = new OperResourceEntity();
+            GovResourceEntity entity = new GovResourceEntity();
             entity.setResourceCode(menuId+"");
             entity.setResourceName(menuName);
             entity.setResourceUrl(dto.getResourceUrl());
@@ -135,7 +135,7 @@ public class OperResourceServiceImpl extends BaseServiceImpl<OperResourceDao, Op
 
     @Override
     public List<MenuResourceDTO> getMenuResourceList(String menuId) {
-        List<OperResourceEntity> entityList = baseDao.getMenuResourceList(menuId+"");
+        List<GovResourceEntity> entityList = baseDao.getMenuResourceList(menuId+"");
 
         return ConvertUtils.sourceToTarget(entityList, MenuResourceDTO.class);
     }

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/OperRoleMenuServiceImpl.java → 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.dao.GovRoleMenuDao;
-import com.epmet.dto.OperRoleMenuDTO;
+import com.epmet.dto.GovRoleMenuDTO;
-import com.epmet.entity.OperRoleMenuEntity;
+import com.epmet.entity.GovRoleMenuEntity;
-import com.epmet.redis.OperRoleMenuRedis;
+import com.epmet.redis.GovRoleMenuRedis;
-import com.epmet.service.OperRoleMenuService;
+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<OperRoleMenuDao, OperRoleMenuEntity> implements OperRoleMenuService {
+public class GovRoleMenuServiceImpl extends BaseServiceImpl<GovRoleMenuDao, GovRoleMenuEntity> implements GovRoleMenuService {
 
     @Autowired
-    private OperRoleMenuRedis operRoleMenuRedis;
+    private GovRoleMenuRedis govRoleMenuRedis;
     @Autowired
-    private OperRoleMenuDao operRoleMenuDao;
+    private GovRoleMenuDao govRoleMenuDao;
 
     @Override
-    public PageData<OperRoleMenuDTO> page(Map<String, Object> params) {
+    public PageData<GovRoleMenuDTO> page(Map<String, Object> params) {
-        IPage<OperRoleMenuEntity> page = baseDao.selectPage(
+        IPage<GovRoleMenuEntity> page = baseDao.selectPage(
                 getPage(params, FieldConstant.CREATED_TIME, false),
                 getWrapper(params)
         );
-        return getPageData(page, OperRoleMenuDTO.class);
+        return getPageData(page, GovRoleMenuDTO.class);
     }
 
     @Override
-    public List<OperRoleMenuDTO> list(Map<String, Object> params) {
+    public List<GovRoleMenuDTO> list(Map<String, Object> params) {
-        List<OperRoleMenuEntity> entityList = baseDao.selectList(getWrapper(params));
+        List<GovRoleMenuEntity> entityList = baseDao.selectList(getWrapper(params));
 
-        return ConvertUtils.sourceToTarget(entityList, OperRoleMenuDTO.class);
+        return ConvertUtils.sourceToTarget(entityList, GovRoleMenuDTO.class);
     }
 
-    private QueryWrapper<OperRoleMenuEntity> getWrapper(Map<String, Object> params){
+    private QueryWrapper<GovRoleMenuEntity> getWrapper(Map<String, Object> params){
         String id = (String)params.get(FieldConstant.ID_HUMP);
 
-        QueryWrapper<OperRoleMenuEntity> wrapper = new QueryWrapper<>();
+        QueryWrapper<GovRoleMenuEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
 
         return wrapper;
     }
 
     @Override
-    public OperRoleMenuDTO get(String id) {
+    public GovRoleMenuDTO get(String id) {
-        OperRoleMenuEntity entity = baseDao.selectById(id);
+        GovRoleMenuEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, OperRoleMenuDTO.class);
+        return ConvertUtils.sourceToTarget(entity, GovRoleMenuDTO.class);
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void save(OperRoleMenuDTO dto) {
+    public void save(GovRoleMenuDTO dto) {
-        OperRoleMenuEntity entity = ConvertUtils.sourceToTarget(dto, OperRoleMenuEntity.class);
+        GovRoleMenuEntity entity = ConvertUtils.sourceToTarget(dto, GovRoleMenuEntity.class);
         insert(entity);
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void update(OperRoleMenuDTO dto) {
+    public void update(GovRoleMenuDTO dto) {
-        OperRoleMenuEntity entity = ConvertUtils.sourceToTarget(dto, OperRoleMenuEntity.class);
+        GovRoleMenuEntity entity = ConvertUtils.sourceToTarget(dto, GovRoleMenuEntity.class);
         updateById(entity);
     }
 
@@ -122,12 +122,12 @@ public class OperRoleMenuServiceImpl extends BaseServiceImpl<OperRoleMenuDao, Op
 
         //保存角色菜单关系
         for(String menuId : menuIdList){
-            OperRoleMenuEntity operRoleMenuEntity = new OperRoleMenuEntity();
+            GovRoleMenuEntity govRoleMenuEntity = new GovRoleMenuEntity();
-            operRoleMenuEntity.setMenuId(menuId);
+            govRoleMenuEntity.setMenuId(menuId);
-            operRoleMenuEntity.setRoleId(roleId);
+            govRoleMenuEntity.setRoleId(roleId);
 
             //保存
-            insert(operRoleMenuEntity);
+            insert(govRoleMenuEntity);
         }
     }
 
@@ -140,7 +140,7 @@ public class OperRoleMenuServiceImpl extends BaseServiceImpl<OperRoleMenuDao, Op
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void deleteByRoleIds(String[] roleIds) {
-        operRoleMenuDao.deleteByRoleIds(roleIds);
+        govRoleMenuDao.deleteByRoleIds(roleIds);
     }
 
     @Override

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/OperRoleServiceImpl.java → epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleServiceImpl.java

@@ -23,13 +23,13 @@ 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.OperRoleDao;
+import com.epmet.dao.GovRoleDao;
-import com.epmet.dto.OperRoleDTO;
+import com.epmet.dto.GovRoleDTO;
-import com.epmet.entity.OperRoleEntity;
+import com.epmet.entity.GovRoleEntity;
-import com.epmet.redis.OperRoleRedis;
+import com.epmet.redis.GovRoleRedis;
-import com.epmet.service.OperRoleMenuService;
+import com.epmet.service.GovRoleMenuService;
-import com.epmet.service.OperRoleService;
+import com.epmet.service.GovRoleService;
-import com.epmet.service.OperRoleUserService;
+import com.epmet.service.GovRoleUserService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -46,62 +46,62 @@ import java.util.Map;
  * @since v1.0.0 2020-03-18
  */
 @Service
-public class OperRoleServiceImpl extends BaseServiceImpl<OperRoleDao, OperRoleEntity> implements OperRoleService {
+public class GovRoleServiceImpl extends BaseServiceImpl<GovRoleDao, GovRoleEntity> 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<OperRoleDTO> page(Map<String, Object> params) {
+    public PageData<GovRoleDTO> page(Map<String, Object> params) {
-        IPage<OperRoleEntity> page = baseDao.selectPage(
+        IPage<GovRoleEntity> page = baseDao.selectPage(
                 getPage(params, FieldConstant.CREATED_TIME, false),
                 getWrapper(params)
         );
-        return getPageData(page, OperRoleDTO.class);
+        return getPageData(page, GovRoleDTO.class);
     }
 
     @Override
-    public List<OperRoleDTO> list(Map<String, Object> params) {
+    public List<GovRoleDTO> list(Map<String, Object> params) {
-        List<OperRoleEntity> entityList = baseDao.selectList(getWrapper(params));
+        List<GovRoleEntity> entityList = baseDao.selectList(getWrapper(params));
 
-        return ConvertUtils.sourceToTarget(entityList, OperRoleDTO.class);
+        return ConvertUtils.sourceToTarget(entityList, GovRoleDTO.class);
     }
 
-    private QueryWrapper<OperRoleEntity> getWrapper(Map<String, Object> params){
+    private QueryWrapper<GovRoleEntity> getWrapper(Map<String, Object> params){
         String id = (String)params.get(FieldConstant.ID_HUMP);
         String name = (String)params.get(FieldConstant.NAME_HUMP);
-        QueryWrapper<OperRoleEntity> wrapper = new QueryWrapper<>();
+        QueryWrapper<GovRoleEntity> 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) {
+    public GovRoleDTO get(String id) {
-        OperRoleEntity entity = baseDao.selectById(id);
+        GovRoleEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, OperRoleDTO.class);
+        return ConvertUtils.sourceToTarget(entity, GovRoleDTO.class);
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void save(OperRoleDTO dto) {
+    public void save(GovRoleDTO dto) {
-        OperRoleEntity entity = ConvertUtils.sourceToTarget(dto, OperRoleEntity.class);
+        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) {
+    public void update(GovRoleDTO dto) {
-        OperRoleEntity entity = ConvertUtils.sourceToTarget(dto, OperRoleEntity.class);
+        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<OperRoleDao, OperRoleEn
         // 逻辑删除（@TableLogic 注解）
         baseDao.deleteBatchIds(Arrays.asList(ids));
 
-        OperRoleMenuService.deleteByRoleIds(ids);
+        govRoleMenuService.deleteByRoleIds(ids);
 
-        operRoleUserService.deleteByRoleIds(ids);
+        govRoleUserService.deleteByRoleIds(ids);
     }
 
 }

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/OperRoleUserServiceImpl.java → epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleUserServiceImpl.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.OperRoleUserDao;
+import com.epmet.dao.GovRoleUserDao;
-import com.epmet.dto.OperRoleUserDTO;
+import com.epmet.dto.GovRoleUserDTO;
-import com.epmet.entity.OperRoleUserEntity;
+import com.epmet.entity.GovRoleUserEntity;
-import com.epmet.redis.OperRoleUserRedis;
+import com.epmet.redis.GovRoleUserRedis;
-import com.epmet.service.OperRoleUserService;
+import com.epmet.service.GovRoleUserService;
 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 OperRoleUserServiceImpl extends BaseServiceImpl<OperRoleUserDao, OperRoleUserEntity> implements OperRoleUserService {
+public class GovRoleUserServiceImpl extends BaseServiceImpl<GovRoleUserDao, GovRoleUserEntity> implements GovRoleUserService {
 
     @Autowired
-    private OperRoleUserRedis operRoleUserRedis;
+    private GovRoleUserRedis govRoleUserRedis;
     @Autowired
-    private OperRoleUserDao operRoleUserDao;
+    private GovRoleUserDao govRoleUserDao;
 
     @Override
-    public PageData<OperRoleUserDTO> page(Map<String, Object> params) {
+    public PageData<GovRoleUserDTO> page(Map<String, Object> params) {
-        IPage<OperRoleUserEntity> page = baseDao.selectPage(
+        IPage<GovRoleUserEntity> page = baseDao.selectPage(
                 getPage(params, FieldConstant.CREATED_TIME, false),
                 getWrapper(params)
         );
-        return getPageData(page, OperRoleUserDTO.class);
+        return getPageData(page, GovRoleUserDTO.class);
     }
 
     @Override
-    public List<OperRoleUserDTO> list(Map<String, Object> params) {
+    public List<GovRoleUserDTO> list(Map<String, Object> params) {
-        List<OperRoleUserEntity> entityList = baseDao.selectList(getWrapper(params));
+        List<GovRoleUserEntity> entityList = baseDao.selectList(getWrapper(params));
 
-        return ConvertUtils.sourceToTarget(entityList, OperRoleUserDTO.class);
+        return ConvertUtils.sourceToTarget(entityList, GovRoleUserDTO.class);
     }
 
-    private QueryWrapper<OperRoleUserEntity> getWrapper(Map<String, Object> params){
+    private QueryWrapper<GovRoleUserEntity> getWrapper(Map<String, Object> params){
         String id = (String)params.get(FieldConstant.ID_HUMP);
 
-        QueryWrapper<OperRoleUserEntity> wrapper = new QueryWrapper<>();
+        QueryWrapper<GovRoleUserEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
 
         return wrapper;
     }
 
     @Override
-    public OperRoleUserDTO get(String id) {
+    public GovRoleUserDTO get(String id) {
-        OperRoleUserEntity entity = baseDao.selectById(id);
+        GovRoleUserEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, OperRoleUserDTO.class);
+        return ConvertUtils.sourceToTarget(entity, GovRoleUserDTO.class);
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void save(OperRoleUserDTO dto) {
+    public void save(GovRoleUserDTO dto) {
-        OperRoleUserEntity entity = ConvertUtils.sourceToTarget(dto, OperRoleUserEntity.class);
+        GovRoleUserEntity entity = ConvertUtils.sourceToTarget(dto, GovRoleUserEntity.class);
         insert(entity);
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void update(OperRoleUserDTO dto) {
+    public void update(GovRoleUserDTO dto) {
-        OperRoleUserEntity entity = ConvertUtils.sourceToTarget(dto, OperRoleUserEntity.class);
+        GovRoleUserEntity entity = ConvertUtils.sourceToTarget(dto, GovRoleUserEntity.class);
         updateById(entity);
     }
 
@@ -117,23 +117,23 @@ public class OperRoleUserServiceImpl extends BaseServiceImpl<OperRoleUserDao, Op
 
         //保存角色用户关系
         for(String roleId : roleIdList){
-            OperRoleUserEntity operRoleUserEntity = new OperRoleUserEntity();
+            GovRoleUserEntity govRoleUserEntity = new GovRoleUserEntity();
-            operRoleUserEntity.setUserId(userId);
+            govRoleUserEntity.setUserId(userId);
-            operRoleUserEntity.setRoleId(roleId);
+            govRoleUserEntity.setRoleId(roleId);
 
             //保存
-            insert(operRoleUserEntity);
+            insert(govRoleUserEntity);
         }
     }
 
     @Override
     public void deleteByRoleId(String roleId) {
-        operRoleUserDao.deleteByRoleId(roleId);
+        govRoleUserDao.deleteByRoleId(roleId);
     }
 
     @Override
     public void deleteByUserId(String userId) {
-        operRoleUserDao.deleteByUserId(userId);
+        govRoleUserDao.deleteByUserId(userId);
     }
 
     @Override
@@ -145,12 +145,12 @@ public class OperRoleUserServiceImpl extends BaseServiceImpl<OperRoleUserDao, Op
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void deleteByRoleIds(String[] roleIds) {
-        operRoleUserDao.deleteByRoleIds(roleIds);
+        govRoleUserDao.deleteByRoleIds(roleIds);
     }
 
     @Override
     public void deleteByUserIds(String[] userIds) {
-        operRoleUserDao.deleteByUserIds(userIds);
+        govRoleUserDao.deleteByUserIds(userIds);
     }
 
 }

epmet-module/gov-access/gov-access-server/src/main/resources/db/migration/V0.0.2__add.sql

@@ -0,0 +1,91 @@
+CREATE TABLE `gov_language` (
+    `table_name` varchar(32) NOT NULL COMMENT '表名',
+    `table_id` varchar(64) NOT NULL COMMENT '表主键',
+    `field_name` varchar(32) NOT NULL COMMENT '字段名',
+    `field_value` varchar(200) NOT NULL COMMENT '字段值',
+    `language` varchar(10) NOT NULL COMMENT '语言',
+    PRIMARY KEY (`table_name`,`table_id`,`field_name`,`language`) USING BTREE,
+    KEY `idx_table_id` (`table_id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='国际化';
+CREATE TABLE `gov_menu` (
+    `id` varchar(64) NOT NULL COMMENT 'id',
+    `pid` varchar(64) DEFAULT NULL COMMENT '上级ID，一级菜单为0',
+    `url` varchar(200) DEFAULT NULL COMMENT '菜单URL',
+    `type` tinyint(3) unsigned DEFAULT NULL COMMENT '类型   0：菜单   1：按钮',
+    `icon` varchar(50) DEFAULT NULL COMMENT '菜单图标',
+    `permissions` varchar(32) DEFAULT NULL COMMENT '权限标识，如：sys:menu:save',
+    `sort` int(11) DEFAULT NULL COMMENT '排序',
+    `REVISION` int(11) DEFAULT NULL COMMENT '乐观锁',
+    `DEL_FLAG` int(11) unsigned DEFAULT NULL COMMENT '删除标识  0：未删除    1：删除',
+    `CREATED_BY` varchar(32) DEFAULT NULL COMMENT '创建者',
+    `CREATED_TIME` datetime DEFAULT NULL COMMENT '创建时间',
+    `UPDATED_BY` varchar(32) DEFAULT NULL COMMENT '更新者',
+    `UPDATED_TIME` datetime DEFAULT NULL COMMENT '更新时间',
+    `SHOW_FLAG` int(11) NOT NULL DEFAULT '1' COMMENT '是否显示，1：显示 0不显示',
+    PRIMARY KEY (`id`) USING BTREE,
+    KEY `idx_pid` (`pid`) USING BTREE,
+    KEY `idx_del_flag` (`DEL_FLAG`) USING BTREE,
+    KEY `idx_create_date` (`CREATED_TIME`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='菜单管理';
+CREATE TABLE `gov_resource` (
+    `id` varchar(64) NOT NULL COMMENT 'id',
+    `resource_code` varchar(32) DEFAULT NULL COMMENT '资源编码，如菜单ID',
+    `resource_name` varchar(32) DEFAULT NULL COMMENT '资源名称',
+    `resource_url` varchar(100) DEFAULT NULL COMMENT '资源URL',
+    `resource_method` varchar(8) DEFAULT NULL COMMENT '请求方式（如：GET、POST、PUT、DELETE）',
+    `menu_flag` tinyint(3) unsigned DEFAULT NULL COMMENT '菜单标识  0：非菜单资源   1：菜单资源',
+    `auth_level` tinyint(3) unsigned DEFAULT NULL COMMENT '认证等级   0：权限认证   1：登录认证    2：无需认证',
+    `REVISION` int(11) DEFAULT NULL COMMENT '乐观锁',
+    `DEL_FLAG` int(11) DEFAULT NULL COMMENT '删除标识  0：未删除    1：删除',
+    `CREATED_BY` varchar(32) DEFAULT NULL COMMENT '创建者',
+    `CREATED_TIME` datetime DEFAULT NULL COMMENT '创建时间',
+    `UPDATED_BY` varchar(32) DEFAULT NULL COMMENT '更新者',
+    `UPDATED_TIME` datetime DEFAULT NULL COMMENT '更新时间',
+    PRIMARY KEY (`id`) USING BTREE,
+    KEY `idx_resource_code` (`resource_code`) USING BTREE,
+    KEY `idx_create_date` (`CREATED_TIME`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='资源管理';
+CREATE TABLE `gov_role` (
+    `id` varchar(64) NOT NULL COMMENT 'id',
+    `name` varchar(32) DEFAULT NULL COMMENT '角色名称',
+    `remark` varchar(100) DEFAULT NULL COMMENT '备注',
+    `REVISION` int(11) DEFAULT NULL COMMENT '乐观锁',
+    `DEL_FLAG` int(11) unsigned DEFAULT NULL COMMENT '删除标识  0：未删除    1：删除',
+    `dept_id` bigint(20) DEFAULT NULL COMMENT '部门ID',
+    `CREATED_BY` varchar(32) DEFAULT NULL COMMENT '创建者',
+    `CREATED_TIME` datetime DEFAULT NULL COMMENT '创建时间',
+    `UPDATED_BY` varchar(32) DEFAULT NULL COMMENT '更新者',
+    `UPDATED_TIME` datetime DEFAULT NULL COMMENT '更新时间',
+    PRIMARY KEY (`id`) USING BTREE,
+    KEY `idx_dept_id` (`dept_id`) USING BTREE,
+    KEY `idx_del_flag` (`DEL_FLAG`) USING BTREE,
+    KEY `idx_create_date` (`CREATED_TIME`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='角色管理';
+CREATE TABLE `gov_role_menu` (
+     `id` varchar(64) NOT NULL COMMENT 'id',
+     `role_id` varchar(64) DEFAULT NULL COMMENT '角色ID',
+     `menu_id` varchar(64) DEFAULT NULL COMMENT '菜单ID',
+     `REVISION` int(11) DEFAULT NULL COMMENT '乐观锁',
+     `DEL_FLAG` int(11) DEFAULT NULL COMMENT '删除标识  0：未删除    1：删除',
+     `CREATED_BY` varchar(32) DEFAULT NULL COMMENT '创建者',
+     `CREATED_TIME` datetime DEFAULT NULL COMMENT '创建时间',
+     `UPDATED_BY` varchar(32) DEFAULT NULL COMMENT '更新者',
+     `UPDATED_TIME` datetime DEFAULT NULL COMMENT '更新时间',
+     PRIMARY KEY (`id`) USING BTREE,
+     KEY `idx_role_id` (`role_id`) USING BTREE,
+     KEY `idx_menu_id` (`menu_id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='角色菜单关系';
+CREATE TABLE `gov_role_user` (
+     `id` varchar(64) NOT NULL COMMENT 'id',
+     `role_id` varchar(64) DEFAULT NULL COMMENT '角色ID',
+     `user_id` varchar(64) DEFAULT NULL COMMENT '用户ID',
+     `REVISION` int(11) DEFAULT NULL COMMENT '乐观锁',
+     `DEL_FLAG` int(11) DEFAULT NULL COMMENT '删除标识  0：未删除    1：删除',
+     `CREATED_BY` varchar(32) DEFAULT NULL COMMENT '创建者',
+     `CREATED_TIME` datetime DEFAULT NULL COMMENT '创建时间',
+     `UPDATED_BY` varchar(32) DEFAULT NULL COMMENT '更新者',
+     `UPDATED_TIME` datetime DEFAULT NULL COMMENT '更新时间',
+     PRIMARY KEY (`id`) USING BTREE,
+     KEY `idx_role_id` (`role_id`) USING BTREE,
+     KEY `idx_user_id` (`user_id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='角色用户关系';

epmet-module/gov-access/gov-access-server/src/main/resources/mapper/OperLanguageDao.xml → epmet-module/gov-access/gov-access-server/src/main/resources/mapper/GovLanguageDao.xml

@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.dao.OperLanguageDao">
+<mapper namespace="com.epmet.dao.GovLanguageDao">
 
-    <select id="getLanguage" resultType="com.epmet.entity.OperLanguageEntity">
+    <select id="getLanguage" resultType="com.epmet.entity.GovLanguageEntity">
-        select * from oper_language
+        select * from gov_language
           where table_name=#{tableName} and table_id=#{tableId} and field_name=#{fieldName} and language=#{language}
     </select>
 
     <select id="updateLanguage">
-        update oper_language set field_value=#{fieldValue}
+        update gov_language set field_value=#{fieldValue}
           where table_name=#{tableName} and table_id=#{tableId} and field_name=#{fieldName} and language=#{language}
     </select>
 
-    <insert id="insertOperLanguageEntity" parameterType="com.epmet.entity.OperLanguageEntity">
+    <insert id="insertOperLanguageEntity" parameterType="com.epmet.entity.GovLanguageEntity">
-        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} )
     </insert>

epmet-module/gov-access/gov-access-server/src/main/resources/mapper/GovMenuDao.xml

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.GovMenuDao">
+
+    <select id="getById" resultType="com.epmet.entity.GovMenuEntity">
+        select t1.*,
+        (select lang.field_value from gov_language lang where lang.table_name='gov_menu' and lang.field_name='name'
+        and lang.table_id=t1.pid and lang.language=#{language}) as parentName,
+        (select lang.field_value from gov_language lang where lang.table_name='gov_menu' and lang.field_name='name'
+        and lang.table_id=t1.id and lang.language=#{language}) as name
+        from gov_menu t1
+          where t1.id = #{id} and t1.del_flag = 0
+    </select>
+
+    <select id="getMenuList" resultType="com.epmet.entity.GovMenuEntity">
+        select t1.*, (select lang.field_value from gov_language lang where lang.table_name='gov_menu' and lang.field_name='name'
+        and lang.table_id=t1.id and lang.language=#{language}) as name
+        from gov_menu t1 where t1.del_flag = 0
+        <if test="type != null">
+            and t1.type = #{type}
+        </if>
+        order by t1.sort asc
+    </select>
+
+    <select id="getUserMenuList" resultType="com.epmet.entity.GovMenuEntity">
+        select t3.*, (select lang.field_value from gov_language lang where lang.table_name='gov_menu' and lang.field_name='name'
+        and lang.table_id=t3.id and lang.language=#{language}) as name from gov_role_user t1
+        left join gov_role_menu t2 on t1.role_id = t2.role_id
+        left join gov_menu t3 on t2.menu_id = t3.id
+        where t1.user_id = #{userId} and t3.del_flag = 0
+        <if test="type != null">
+            and t3.type = #{type}
+        </if>
+        order by t3.sort asc
+    </select>
+
+    <select id="getListPid" resultType="com.epmet.entity.GovMenuEntity">
+        select * from gov_menu where del_flag = 0 and pid = #{value}
+    </select>
+
+</mapper>

epmet-module/gov-access/gov-access-server/src/main/resources/mapper/GovResourceDao.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.GovResourceDao">
+
+    <delete id="deleteByCode">
+        delete from gov_resource where resource_code = #{value}
+    </delete>
+
+    <select id="getMenuResourceList" resultType="com.epmet.entity.GovResourceEntity">
+        select resource_url, resource_method from gov_resource where resource_code = #{value} order by created_time asc
+    </select>
+
+    <select id="getResourceList" resultType="com.epmet.entity.GovResourceEntity">
+        select resource_url, resource_method, auth_level from gov_resource order by auth_level desc
+    </select>
+
+    <select id="getUserResourceList" resultType="com.epmet.entity.GovResourceEntity">
+        select t3.resource_url, t3.resource_method from gov_role_user t1
+            left join gov_role_menu t2 on t1.role_id = t2.role_id
+            inner join gov_resource t3 on t2.menu_id = t3.resource_code
+        where t1.user_id = #{userId}
+    </select>
+
+</mapper>

epmet-module/gov-access/gov-access-server/src/main/resources/mapper/OperRoleDao.xml → epmet-module/gov-access/gov-access-server/src/main/resources/mapper/GovRoleDao.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.dao.OperRoleDao">
+<mapper namespace="com.epmet.dao.GovRoleDao">
 
 </mapper>

epmet-module/gov-access/gov-access-server/src/main/resources/mapper/OperRoleMenuDao.xml → epmet-module/gov-access/gov-access-server/src/main/resources/mapper/GovRoleMenuDao.xml

@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.dao.OperRoleMenuDao">
+<mapper namespace="com.epmet.dao.GovRoleMenuDao">
 
     <select id="getMenuIdList" resultType="java.lang.String">
-        select menu_id from oper_role_menu where role_id = #{value}
+        select menu_id from gov_role_menu where role_id = #{value}
     </select>
 
     <update id="deleteByRoleIds">
-        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
         <foreach item="roleId" collection="array" open="(" separator="," close=")">
             #{roleId}
         </foreach>
     </update>
 
     <update id="deleteByRoleId">
-        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>
 
     <update id="deleteByMenuId">
-        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
     </update>
 
 </mapper>

epmet-module/gov-access/gov-access-server/src/main/resources/mapper/OperRoleUserDao.xml → epmet-module/gov-access/gov-access-server/src/main/resources/mapper/GovRoleUserDao.xml

@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.dao.OperRoleUserDao">
+<mapper namespace="com.epmet.dao.GovRoleUserDao">
 
     <update id="deleteByRoleIds">
-        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
         <foreach item="roleId" collection="array" open="(" separator="," close=")">
             #{roleId}
         </foreach>
     </update>
 
     <update id="deleteByUserIds">
-        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
         <foreach item="userId" collection="array" open="(" separator="," close=")">
             #{userId}
         </foreach>
     </update>
 
     <update id="deleteByRoleId">
-        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>
 
     <update id="deleteByUserId">
-        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
     </update>
 
     <select id="getRoleIdList" resultType="java.lang.String">
-        select role_id from oper_role_user where user_id = #{value} and del_flag = 0
+        select role_id from gov_role_user where user_id = #{value} and del_flag = 0
     </select>
 
 </mapper>

epmet-module/gov-access/gov-access-server/src/main/resources/mapper/OperMenuDao.xml

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<mapper namespace="com.epmet.dao.OperMenuDao">
-
-    <select id="getById" resultType="com.epmet.entity.OperMenuEntity">
-        select t1.*,
-        (select lang.field_value from oper_language lang where lang.table_name='oper_menu' and lang.field_name='name'
-        and lang.table_id=t1.pid and lang.language=#{language}) as parentName,
-        (select lang.field_value from oper_language lang where lang.table_name='oper_menu' and lang.field_name='name'
-        and lang.table_id=t1.id and lang.language=#{language}) as name
-        from oper_menu t1
-          where t1.id = #{id} and t1.del_flag = 0
-    </select>
-
-    <select id="getMenuList" resultType="com.epmet.entity.OperMenuEntity">
-        select t1.*, (select lang.field_value from oper_language lang where lang.table_name='oper_menu' and lang.field_name='name'
-        and lang.table_id=t1.id and lang.language=#{language}) as name
-        from oper_menu t1 where t1.del_flag = 0
-        <if test="type != null">
-            and t1.type = #{type}
-        </if>
-        order by t1.sort asc
-    </select>
-
-    <select id="getUserMenuList" resultType="com.epmet.entity.OperMenuEntity">
-        select t3.*, (select lang.field_value from oper_language lang where lang.table_name='oper_menu' and lang.field_name='name'
-        and lang.table_id=t3.id and lang.language=#{language}) as name from oper_role_user t1
-        left join oper_role_menu t2 on t1.role_id = t2.role_id
-        left join oper_menu t3 on t2.menu_id = t3.id
-        where t1.user_id = #{userId} and t3.del_flag = 0
-        <if test="type != null">
-            and t3.type = #{type}
-        </if>
-        order by t3.sort asc
-    </select>
-
-    <select id="getListPid" resultType="com.epmet.entity.OperMenuEntity">
-        select * from oper_menu where del_flag = 0 and pid = #{value}
-    </select>
-
-</mapper>

epmet-module/gov-access/gov-access-server/src/main/resources/mapper/OperResourceDao.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<mapper namespace="com.epmet.dao.OperResourceDao">
-
-    <delete id="deleteByCode">
-        delete from oper_resource where resource_code = #{value}
-    </delete>
-
-    <select id="getMenuResourceList" resultType="com.epmet.entity.OperResourceEntity">
-        select resource_url, resource_method from oper_resource where resource_code = #{value} order by created_time asc
-    </select>
-
-    <select id="getResourceList" resultType="com.epmet.entity.OperResourceEntity">
-        select resource_url, resource_method, auth_level from oper_resource order by auth_level desc
-    </select>
-
-    <select id="getUserResourceList" resultType="com.epmet.entity.OperResourceEntity">
-        select t3.resource_url, t3.resource_method from oper_role_user t1
-            left join oper_role_menu t2 on t1.role_id = t2.role_id
-            inner join oper_resource t3 on t2.menu_id = t3.resource_code
-        where t1.user_id = #{userId}
-    </select>
-
-</mapper>