Merge branches 'dev' and 'dev_issue_project' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_issue_project

epmet-admin/epmet-admin-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-admin-server:
     container_name: epmet-admin-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-admin-server:0.3.8
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-admin-server:0.3.9
     ports:
       - "8082:8082"
     network_mode: host # 使用现有网络

epmet-admin/epmet-admin-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.8</version>
+    <version>0.3.9</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-admin</artifactId>

epmet-auth/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-auth-server:
     container_name: epmet-auth-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.9
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.10
     ports:
       - "8081:8081"
     network_mode: host # 使用现有网络

epmet-auth/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.9</version>
+    <version>0.3.10</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-cloud</artifactId>

epmet-gateway/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-gateway-server:
     container_name: epmet-gateway-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-gateway:0.3.8
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-gateway:0.3.9
     ports:
       - "8080:8080"
     network_mode: host # 使用现有网络

epmet-gateway/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.8</version>
+    <version>0.3.9</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-cloud</artifactId>

epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   common-service-server:
     container_name: common-service-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/common-service-server:0.3.1
+    image: 192.168.1.130:10080/epmet-cloud-dev/common-service-server:0.3.2
     ports:
       - "8103:8103"
     network_mode: host # 使用现有网络

epmet-module/epmet-common-service/common-service-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.1</version>
+    <version>0.3.2</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-common-service</artifactId>

epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-job-server:
     container_name: epmet-job-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:0.3.1
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:0.3.2
     ports:
       - "8084:8084"
     network_mode: host # 使用现有网络

epmet-module/epmet-job/epmet-job-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.1</version>
+    <version>0.3.2</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-job</artifactId>

epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-message-server:
     container_name: epmet-message-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-message-server:0.3.7
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-message-server:0.3.8
     ports:
       - "8085:8085"
     network_mode: host # 使用现有网络

epmet-module/epmet-message/epmet-message-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.7</version>
+    <version>0.3.8</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-message</artifactId>

epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml

@@ -3,7 +3,7 @@ services:
   epmet-oss-server:
     container_name: epmet-oss-server-dev
 #    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-oss-server:0.3.2
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-oss-server:0.3.8
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-oss-server:0.3.9
     ports:
       - "8083:8083"
     network_mode: host # 使用现有网络

epmet-module/epmet-oss/epmet-oss-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.8</version>
+    <version>0.3.9</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-oss</artifactId>

epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/feign/GovAccessFeignClient.java

@@ -0,0 +1,23 @@
+package com.epmet.dto.feign;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.feign.fallback.GovAccessFeignClientFallBack;
+import com.epmet.dto.form.InitDefaultOperationsFormDTO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+//@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovAccessFeignClientFallBack.class)
+@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovAccessFeignClientFallBack.class, url = "localhost:8099")
+public interface GovAccessFeignClient {
+
+    /**
+     * 批量为角色ID初始化操作权限列表
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("/gov/access/role/initdefaultoperationsforroles")
+    Result initDefaultOperationsForRoles(@RequestBody InitDefaultOperationsFormDTO formDTO);
+
+}

epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/feign/fallback/GovAccessFeignClientFallBack.java

@@ -0,0 +1,22 @@
+package com.epmet.dto.feign.fallback;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.ModuleUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.feign.GovAccessFeignClient;
+import com.epmet.dto.form.InitDefaultOperationsFormDTO;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description
+ * @Author sun
+ */
+@Component
+public class GovAccessFeignClientFallBack implements GovAccessFeignClient {
+
+
+    @Override
+    public Result initDefaultOperationsForRoles(InitDefaultOperationsFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ACCESS_SERVER, "initDefaultOperationsForRoles", formDTO);
+    }
+}

epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/InitDefaultOperationsFormDTO.java

@@ -0,0 +1,20 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class InitDefaultOperationsFormDTO {
+
+    private List<InitDefaultOpesRoleDTO> roles;
+
+    @Data
+    public static class InitDefaultOpesRoleDTO {
+        public InitDefaultOpesRoleDTO() {
+        }
+
+        private String roleId;
+        private String roleKey;
+    }
+}

epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/result/RoleOperationDefaultDTO.java → epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/result/RoleOperationDefaultResultDTO.java

@@ -29,7 +29,7 @@ import lombok.Data;
  * @since v1.0.0 2020-05-21
  */
 @Data
-public class RoleOperationDefaultDTO implements Serializable {
+public class RoleOperationDefaultResultDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-access-server:
     container_name: gov-access-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/gov-access-server:0.3.12
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-access-server:0.3.13
     ports:
       - "8099:8099"
     network_mode: host # 使用现有网络

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

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <version>0.3.12</version>
+    <version>0.3.13</version>
     <parent>
         <artifactId>gov-access</artifactId>
         <groupId>com.epmet</groupId>

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/RoleController.java

@@ -1,14 +1,11 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.InitDefaultOperationsFormDTO;
 import com.epmet.dto.result.RoleOperationResultDTO;
 import com.epmet.service.RoleOperationService;
-import oracle.jdbc.proxy.annotation.Post;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -29,4 +26,16 @@ public class RoleController {
         List<RoleOperationResultDTO> roleOperationResultDTOS = roleOperationService.listOperationsByRoleId(roleId);
         return new Result<List<RoleOperationResultDTO>>().ok(roleOperationResultDTOS);
     }
+
+    /**
+     * 批量为角色ID初始化操作权限列表
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("initdefaultoperationsforroles")
+    public Result initDefaultOperationsForRoles(@RequestBody InitDefaultOperationsFormDTO formDTO) {
+        List<InitDefaultOperationsFormDTO.InitDefaultOpesRoleDTO> roles = formDTO.getRoles();
+        roleOperationService.initDefaultOperationsForRoles(roles);
+        return new Result();
+    }
 }

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/RoleOperationDefaultDao.java

@@ -18,8 +18,13 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.result.RoleOperationDefaultResultDTO;
 import com.epmet.entity.RoleOperationDefaultEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.HashMap;
+import java.util.List;
 
 /**
  * 角色默认的可操作功能列表
@@ -29,5 +34,17 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface RoleOperationDefaultDao extends BaseDao<RoleOperationDefaultEntity> {
-	
+
+    /**
+     * 查询可用
+     * @return
+     */
+     List<RoleOperationDefaultResultDTO> listAllValid();
+
+    /**
+     * 查询某个roleKey的所有默认操作权限
+     * @param roleKey
+     * @return
+     */
+     List<RoleOperationDefaultResultDTO> listByRoleKey(@Param("roleKey") String roleKey);
 }

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/RoleOperationService.java

@@ -20,6 +20,7 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.RoleOperationDTO;
+import com.epmet.dto.form.InitDefaultOperationsFormDTO;
 import com.epmet.dto.result.RoleOperationResultDTO;
 import com.epmet.entity.RoleOperationEntity;
 
@@ -100,4 +101,6 @@ public interface RoleOperationService extends BaseService<RoleOperationEntity> {
      * @return
      */
     List<RoleOperationResultDTO> listOperationsByRoleId(String roleId);
+
+    void initDefaultOperationsForRoles(List<InitDefaultOperationsFormDTO.InitDefaultOpesRoleDTO> roles);
 }

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/RoleOperationServiceImpl.java

@@ -24,7 +24,10 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.RoleOperationDao;
+import com.epmet.dao.RoleOperationDefaultDao;
 import com.epmet.dto.RoleOperationDTO;
+import com.epmet.dto.form.InitDefaultOperationsFormDTO;
+import com.epmet.dto.result.RoleOperationDefaultResultDTO;
 import com.epmet.dto.result.RoleOperationResultDTO;
 import com.epmet.entity.RoleOperationEntity;
 import com.epmet.service.RoleOperationService;
@@ -32,6 +35,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import java.util.Arrays;
 import java.util.List;
@@ -46,6 +50,12 @@ import java.util.Map;
 @Service
 public class RoleOperationServiceImpl extends BaseServiceImpl<RoleOperationDao, RoleOperationEntity> implements RoleOperationService {
 
+    @Autowired
+    private RoleOperationDefaultDao roleOperationDefaultDao;
+
+    @Autowired
+    private RoleOperationDao roleOperationDao;
+
     @Override
     public PageData<RoleOperationDTO> page(Map<String, Object> params) {
         IPage<RoleOperationEntity> page = baseDao.selectPage(
@@ -103,4 +113,33 @@ public class RoleOperationServiceImpl extends BaseServiceImpl<RoleOperationDao,
         return baseDao.listOperationsByRoleId(roleId);
     }
 
+    @Override
+    @Transactional
+    public void initDefaultOperationsForRoles(List<InitDefaultOperationsFormDTO.InitDefaultOpesRoleDTO> roles) {
+        //roleOperationDefaultDao.listAllValid();
+        for (InitDefaultOperationsFormDTO.InitDefaultOpesRoleDTO role : roles) {
+            String roleId = role.getRoleId();
+            String roleKey = role.getRoleKey();
+            List<RoleOperationDefaultResultDTO> defaultOperations = roleOperationDefaultDao.listByRoleKey(roleKey);
+            if (!CollectionUtils.isEmpty(defaultOperations)) {
+                // 有的角色并没有配置默认的操作权限，应该忽略
+                initDefaultOperationsForRole(roleId, defaultOperations);
+            }
+        }
+    }
+
+    /**
+     * 为某一个角色初始化默认操作权限
+     * @param roleId
+     * @param operations
+     */
+    public void initDefaultOperationsForRole(String roleId, List<RoleOperationDefaultResultDTO> operations) {
+        for (RoleOperationDefaultResultDTO operation : operations) {
+            RoleOperationEntity entity = new RoleOperationEntity();
+            entity.setOperationKey(operation.getOperationKey());
+            entity.setRoleId(roleId);
+            roleOperationDao.insert(entity);
+        }
+    }
+
 }

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

@@ -15,5 +15,23 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
+    <select id="listAllValid" resultType="com.epmet.dto.result.RoleOperationDefaultResultDTO">
+        SELECT o.ID, d.ROLE_KEY, o.OPERATION_KEY
+        FROM role_operation_default d
+                 INNER JOIN operation o ON (d.OPERATION_KEY = o.OPERATION_KEY OR d.OPERATION_KEY = '*')
+        WHERE
+          d.DEL_FLAG = 0
+          AND o.DEL_FLAG = 0
+    </select>
+
+    <select id="listByRoleKey" resultType="com.epmet.dto.result.RoleOperationDefaultResultDTO">
+        SELECT o.ID, d.ROLE_KEY, o.OPERATION_KEY
+        FROM role_operation_default d
+                 INNER JOIN operation o ON (d.OPERATION_KEY = o.OPERATION_KEY OR d.OPERATION_KEY = '*')
+        WHERE d.ROLE_KEY = #{roleKey}
+          AND d.DEL_FLAG = 0
+          AND o.DEL_FLAG = 0
+    </select>
+
 
 </mapper>

epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-grid-server:
     container_name: gov-grid-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/gov-grid-server:0.3.21
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-grid-server:0.3.22
     ports:
       - "8097:8097"
     network_mode: host # 使用现有网络

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

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.21</version>
+    <version>0.3.22</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>gov-grid</artifactId>

epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-issue-server:
     container_name: gov-issue-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:0.3.20
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:0.3.21
     ports:
       - "8101:8101"
     network_mode: host # 使用现有网络

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

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <version>0.3.20</version>
+    <version>0.3.21</version>
     <parent>
         <artifactId>gov-issue</artifactId>
         <groupId>com.epmet</groupId>

epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-mine-server:
     container_name: gov-mine-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/gov-mine-server:0.3.18
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-mine-server:0.3.20
     ports:
       - "8098:8098"
     network_mode: host # 使用现有网络

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

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <version>0.3.18</version>
+    <version>0.3.20</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>gov-mine</artifactId>

epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-org-server:
     container_name: gov-org-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.49
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.51
     ports:
       - "8092:8092"
     network_mode: host # 使用现有网络

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

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.49</version>
+    <version>0.3.51</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>gov-org</artifactId>

epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-project-server:
     container_name: gov-project-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.15
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.16
     ports:
       - "8102:8102"
     network_mode: host # 使用现有网络

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

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <version>0.3.15</version>
+    <version>0.3.16</version>
     <parent>
         <artifactId>gov-project</artifactId>
         <groupId>com.epmet</groupId>

epmet-module/oper-access/oper-access-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   oper-access-server:
     container_name: oper-access-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/oper-access-server:0.3.9
+    image: 192.168.1.130:10080/epmet-cloud-dev/oper-access-server:0.3.10
     ports:
       - "8093:8093"
     network_mode: host # 使用现有网络

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

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-    <version>0.3.9</version>
+    <version>0.3.10</version>
     <parent>
         <artifactId>oper-access</artifactId>
         <groupId>com.epmet</groupId>

epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   oper-crm-server:
     container_name: oper-crm-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/oper-crm-server:0.3.11
+    image: 192.168.1.130:10080/epmet-cloud-dev/oper-crm-server:0.3.13
     ports:
       - "8090:8090"
     network_mode: host # 使用现有网络

epmet-module/oper-crm/oper-crm-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.11</version>
+    <version>0.3.13</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>oper-crm</artifactId>
@@ -75,6 +75,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>oper-customize-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/feign/OperCustomizeFeignClient.java

@@ -0,0 +1,36 @@
+package com.epmet.feign;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.CustomerAgencyDTO;
+import com.epmet.dto.CustomerHomeDTO;
+import com.epmet.dto.form.AddAgencyFormDTO;
+import com.epmet.dto.form.AddRootAgencyFormDTO;
+import com.epmet.dto.form.StaffSubmitFromDTO;
+import com.epmet.dto.result.AddAgencyResultDTO;
+import com.epmet.feign.fallback.GovOrgFeignClientFallBack;
+import com.epmet.feign.fallback.OperCustomizeFeignClientFallBack;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+import java.util.Map;
+
+@FeignClient(name = ServiceConstant.OPER_CUSTOMIZE_SERVER, fallback = OperCustomizeFeignClientFallBack.class, url = "localhost:8089")
+//@FeignClient(name = ServiceConstant.OPER_CUSTOMIZE_SERVER, fallback = OperCustomizeFeignClientFallBack.class)
+public interface OperCustomizeFeignClient {
+
+    /**
+     * 创建客户初始化数据
+     * @author zhaoqifeng
+     * @date 2020/5/22 11:04
+     * @param dto
+     * @return com.epmet.commons.tools.utils.Result
+     */
+    @PostMapping("/oper/customize/customerhome/init")
+    Result init(@RequestBody CustomerHomeDTO dto);
+
+
+}

epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/feign/fallback/OperCustomizeFeignClientFallBack.java

@@ -0,0 +1,17 @@
+package com.epmet.feign.fallback;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.ModuleUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.CustomerHomeDTO;
+import com.epmet.feign.OperCustomizeFeignClient;
+import org.springframework.stereotype.Component;
+
+@Component
+public class OperCustomizeFeignClientFallBack implements OperCustomizeFeignClient {
+
+    @Override
+    public Result init(CustomerHomeDTO dto) {
+        return ModuleUtils.feignConError(ServiceConstant.OPER_CUSTOMIZE_SERVER, "init", dto);
+    }
+}

epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java

@@ -31,12 +31,14 @@ import com.epmet.constant.UserWorkType;
 import com.epmet.dao.CustomerDao;
 import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.CustomerDTO;
+import com.epmet.dto.CustomerHomeDTO;
 import com.epmet.dto.GovStaffRoleDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.entity.CustomerEntity;
 import com.epmet.feign.EpmetUserFeignClient;
 import com.epmet.feign.GovOrgFeignClient;
+import com.epmet.feign.OperCustomizeFeignClient;
 import com.epmet.redis.CustomerRedis;
 import com.epmet.service.CustomerService;
 import org.apache.commons.lang3.StringUtils;
@@ -70,6 +72,9 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn
     @Autowired
     private GovOrgFeignClient govOrgFeignClient;
 
+    @Autowired
+    private OperCustomizeFeignClient operCustomizeFeignClient;
+
     @Override
     public PageData<CustomerDTO> page(Map<String, Object> params) {
         IPage<CustomerEntity> page = baseDao.selectPage(
@@ -229,6 +234,14 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn
             throw new RenException("客户新增:为客户初始化角色调用user服务失败:".concat(initResult.toString()));
         }
 
+        //3. 给客户初始化 定制化首页
+        CustomerHomeDTO initHomeForm = new CustomerHomeDTO();
+        initHomeForm.setCustomerId(customerEntity.getId());
+        Result initHomeResult = operCustomizeFeignClient.init(initHomeForm);
+        if (!initHomeResult.success()) {
+            throw new RenException("初始化首页失败:".concat(initHomeResult.getInternalMsg()));
+        }
+
         return customerEntity.getId();
     }
 

epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   oper-customize-server:
     container_name: oper-customize-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/oper-customize-server:0.3.11
+    image: 192.168.1.130:10080/epmet-cloud-dev/oper-customize-server:0.3.13
     ports:
       - "8089:8089"
     network_mode: host # 使用现有网络

epmet-module/oper-customize/oper-customize-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.11</version>
+    <version>0.3.13</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>oper-customize</artifactId>

epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-group-server:
     container_name: resi-group-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.29
+    image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.30
     ports:
       - "8095:8095"
     network_mode: host # 使用现有网络

epmet-module/resi-group/resi-group-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.29</version>
+    <version>0.3.30</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-group</artifactId>

epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-guide-server:
     container_name: resi-guide-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/resi-guide-server:0.3.8
+    image: 192.168.1.130:10080/epmet-cloud-dev/resi-guide-server:0.3.9
     ports:
       - "8091:8091"
     network_mode: host # 使用现有网络

epmet-module/resi-guide/resi-guide-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.8</version>
+    <version>0.3.9</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-guide</artifactId>

epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-hall-server:
     container_name: resi-hall-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/resi-hall-server:0.3.11
+    image: 192.168.1.130:10080/epmet-cloud-dev/resi-hall-server:0.3.12
     ports:
       - "8100:8100"
     network_mode: host # 使用现有网络

epmet-module/resi-hall/resi-hall-server/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.11</version>
+    <version>0.3.12</version>
     <parent>
         <artifactId>resi-hall</artifactId>
         <groupId>com.epmet</groupId>

epmet-module/resi-home/resi-home-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-home-server:
     container_name: resi-home-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/resi-home-server:0.3.2
+    image: 192.168.1.130:10080/epmet-cloud-dev/resi-home-server:0.3.3
     ports:
       - "8104:8104"
     network_mode: host # 使用现有网络

epmet-module/resi-home/resi-home-server/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.2</version>
+    <version>0.3.3</version>
 
     <parent>
         <artifactId>resi-home</artifactId>

epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-mine-server:
     container_name: resi-mine-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/resi-mine-server:0.3.12
+    image: 192.168.1.130:10080/epmet-cloud-dev/resi-mine-server:0.3.13
     ports:
       - "8094:8094"
     network_mode: host # 使用现有网络

epmet-module/resi-mine/resi-mine-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.12</version>
+    <version>0.3.13</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-mine</artifactId>

epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-partymember-server:
     container_name: resi-partymember-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.31
+    image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.32
     ports:
       - "8096:8096"
     network_mode: host # 使用现有网络

epmet-module/resi-partymember/resi-partymember-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.31</version>
+    <version>0.3.32</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-partymember</artifactId>

epmet-user/epmet-user-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-user-server:
     container_name: epmet-user-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.33
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.34
     ports:
       - "8087:8087"
     network_mode: host # 不会创建新的网络

epmet-user/epmet-user-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.33</version>
+    <version>0.3.34</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-user</artifactId>
@@ -76,6 +76,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>gov-access-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GovStaffRoleServiceImpl.java

@@ -20,12 +20,16 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.GovStaffRoleDao;
 import com.epmet.dao.GovStaffRoleTemplateDao;
 import com.epmet.dto.GovStaffRoleDTO;
+import com.epmet.dto.feign.GovAccessFeignClient;
+import com.epmet.dto.form.InitDefaultOperationsFormDTO;
 import com.epmet.dto.result.GovStaffRoleTemplateDTO;
 import com.epmet.entity.GovStaffRoleEntity;
 import com.epmet.redis.GovStaffRoleRedis;
@@ -35,6 +39,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -57,6 +62,9 @@ public class GovStaffRoleServiceImpl extends BaseServiceImpl<GovStaffRoleDao, Go
     @Autowired
     private GovStaffRoleDao govStaffRoleDao;
 
+    @Autowired
+    private GovAccessFeignClient govAccessFeignClient;
+
     @Override
     public PageData<GovStaffRoleDTO> page(Map<String, Object> params) {
         IPage<GovStaffRoleEntity> page = baseDao.selectPage(
@@ -127,12 +135,29 @@ public class GovStaffRoleServiceImpl extends BaseServiceImpl<GovStaffRoleDao, Go
     @Override
     @Transactional
     public void initGovStaffRolesForCustomer(String customerId) {
+        // 增加角色列表
         List<GovStaffRoleTemplateDTO> validRoles = govStaffRoleTemplateDao.listValidateRoles();
+
+        ArrayList<InitDefaultOperationsFormDTO.InitDefaultOpesRoleDTO> roles = new ArrayList<>();
+
         for (GovStaffRoleTemplateDTO validRole : validRoles) {
             GovStaffRoleEntity entity = ConvertUtils.sourceToTarget(validRole, GovStaffRoleEntity.class);
             entity.setCustomerId(customerId);
             entity.setId(null);
             baseDao.insert(entity);
+
+            InitDefaultOperationsFormDTO.InitDefaultOpesRoleDTO role = new InitDefaultOperationsFormDTO.InitDefaultOpesRoleDTO();
+            role.setRoleId(entity.getId());
+            role.setRoleKey(entity.getRoleKey());
+            roles.add(role);
+        }
+
+        // 调用access给角色列表分配操作权限
+        InitDefaultOperationsFormDTO formDTO = new InitDefaultOperationsFormDTO();
+        formDTO.setRoles(roles);
+        Result result = govAccessFeignClient.initDefaultOperationsForRoles(formDTO);
+        if (!result.success()) {
+            throw new RenException("为客户的角色初始化操作权限列表失败:".concat(result.getInternalMsg()));
         }
     }