Merge branch 'dev_five_coverage' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_five_coverage

epmet-gateway/pom.xml

@@ -278,6 +278,7 @@
 <!--                <gateway.routes.epmet-oss-server.uri>http://localhost:8083</gateway.routes.epmet-oss-server.uri>-->
                 <!--  5、消息服务  -->
                 <gateway.routes.epmet-message-server.uri>lb://epmet-message-server</gateway.routes.epmet-message-server.uri>
+<!--                <gateway.routes.epmet-message-server.uri>http://localhost:8085</gateway.routes.epmet-message-server.uri>-->
                 <!--  6、工作流服务 -->
                 <gateway.routes.epmet-activiti-server.uri>lb://epmet-activiti-server</gateway.routes.epmet-activiti-server.uri>
                 <!--  7、定时任务服务  -->
@@ -357,7 +358,7 @@
 
                 <!-- 32、爱心互助            -->
                 <gateway.routes.epmet-heart-server.url>lb://epmet-heart-server</gateway.routes.epmet-heart-server.url>
-                <!--                <gateway.routes.epmet-heart-server.url>http://127.0.0.1:8111</gateway.routes.epmet-heart-server.url>-->
+<!--                                <gateway.routes.epmet-heart-server.url>http://127.0.0.1:8111</gateway.routes.epmet-heart-server.url>-->
                 <!-- 33、 积分银行 -->
                 <gateway.routes.epmet-point-server.url>lb://epmet-point-server</gateway.routes.epmet-point-server.url>
                 <!--                <gateway.routes.epmet-point-server.url>http://127.0.0.1:8112</gateway.routes.epmet-point-server.url>-->

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcResiUserDao.java

@@ -62,7 +62,8 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
                                                             @Param("agencyId") String agencyId,
                                                             @Param("queryPids") String queryPids,
                                                             @Param("categoryKey") String categoryKey,
-                                                            @Param("search") String search);
+                                                            @Param("search") String search,
+                                                            @Param("gridId")String gridId);
 
     /**
      * 政策查找居民

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/IcResiService.java

@@ -40,7 +40,7 @@ public interface IcResiService {
     List<IcResiInfoResultDTO> listSpecialResisBySpecialType(String customerId, String agencyId, String queryPids, String categoryKey, String search,
                                                             Integer pageNo, Integer pageSize, Boolean isPage);
 
-    Integer countSpecialResisBySpecialType(String customerId, String agencyId, String staffOrgIds, String categoryKey, String search);
+    Integer countSpecialResisBySpecialType(String customerId, String agencyId, String staffOrgIds, String categoryKey, String search,String gridId);
 
     /**
      * Desc: 获取icUser

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/IcResiServiceImpl.java

@@ -137,8 +137,8 @@ public class IcResiServiceImpl implements IcResiService {
     }
 
     @Override
-    public Integer countSpecialResisBySpecialType(String customerId, String agencyId, String staffOrgIds, String categoryKey, String search) {
-        return resiUserDao.countSpecialResisBySpecialType(customerId, agencyId, staffOrgIds, categoryKey, search);
+    public Integer countSpecialResisBySpecialType(String customerId, String agencyId, String staffOrgIds, String categoryKey, String search, String gridId) {
+        return resiUserDao.countSpecialResisBySpecialType(customerId, agencyId, staffOrgIds, categoryKey, search,gridId);
     }
 
     /**

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java

@@ -294,6 +294,8 @@ public class GovOrgCoverageServiceImpl implements GovOrgCoverageService {
 
     @Override
     public Integer countEnterprisePatrol(String customerId, String agencyId, String staffOrgIds, String search, String categoryKey,String latestResult,String gridId) {
+        // ic_enterprise.AGENCY_PIDS:agency_id的所有上级
+        // 网格不为空时按网格查询， 网格为空时，根据agency_id或者AGENCY_PIDS查看
         return enterprisePatrolRecordDao.countEnterprisePatrol(customerId, agencyId, staffOrgIds, search, categoryKey,latestResult,gridId);
     }
 

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java

@@ -682,6 +682,9 @@ public class GovProjectServiceImpl implements GovProjectService {
 	 */
 	private LambdaQueryWrapper<IcEventEntity> constructIcEventQueryWrapper(String customerId, String staffOrgIds,
 																		   String search, Boolean difficultPoint, String gridId) {
+		//ic_event.grid_pids是网格所有的上级，不包括网格自己
+		//ic_event.agency_id网格的所属组织
+		//所以这staffOrgIds是组织的全路径
 		LambdaQueryWrapper<IcEventEntity> query = new LambdaQueryWrapper<>();
 		query.eq(IcEventEntity::getCustomerId, customerId)
 				.eq(StringUtils.isNotBlank(gridId), IcEventEntity::getGridId, gridId);

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java

@@ -39,7 +39,6 @@ import com.epmet.dataaggre.entity.opercustomize.IcResiCategoryWarnConfigEntity;
 import com.epmet.dataaggre.enums.MenusEnums;
 import com.epmet.dataaggre.redis.GovCustomerMenuRedis;
 import com.epmet.dataaggre.service.CoverageService;
-import com.epmet.dataaggre.service.epmetuser.EpmetUserService;
 import com.epmet.dataaggre.service.epmetuser.IcResiService;
 import com.epmet.dataaggre.service.govorg.GovOrgCoverageService;
 import com.epmet.dataaggre.service.govorg.GovOrgService;
@@ -94,9 +93,6 @@ public class CoverageServiceImpl implements CoverageService {
     @Autowired
     private ExecutorService executorService;
 
-    @Autowired
-    private EpmetUserService epmetUserService;
-
     // 1：出租 0：自住  2：闲置 3：未售出
     public static final Integer HOUSE_RENT_FLAG_RENT = 1;
 
@@ -576,7 +572,7 @@ public class CoverageServiceImpl implements CoverageService {
                     staffOrgIds, categoryKey, search,gridId);
         } else if (CoveragePlaceTypeEnum.SPECIAL_RESI.getCode().equals(placeType)) {
             // 特殊人群
-            return icResiService.countSpecialResisBySpecialType(customerId, agencyId, staffOrgIds, categoryKey, search);
+            return icResiService.countSpecialResisBySpecialType(customerId, agencyId, staffOrgIds, categoryKey, search,gridId);
         } else if (CoveragePlaceTypeEnum.EVENT.getCode().equals(placeType)) {
             // 难点痛点
             return govProjectService.countIcEventEntities(customerId, staffOrgIds, search, true,gridId);
@@ -611,11 +607,8 @@ public class CoverageServiceImpl implements CoverageService {
         } else if(CoveragePlaceTypeEnum.ENTERPRISE_PATROL_UNQUALIFIED.getCode().equals(placeType)){
             // 企事业单位巡查
             // 最新巡查结果【0:合格 1:不合格】
+            // 左侧用，可以到网格，
             return orgCoverageService.countEnterprisePatrol(customerId, agencyId, staffOrgIds, search, categoryKey,NumConstant.ONE_STR,gridId);
-        } else if (CoveragePlaceTypeEnum.VOLUNTEER.getCode().equals(placeType)) {
-            // 志愿者
-            String[] parts = categoryKey.split("_");
-            return epmetUserService.countVolunteers(customerId, agencyId, staffOrgIds, search, parts[1]);
         }
 
         return 0;
@@ -778,21 +771,6 @@ public class CoverageServiceImpl implements CoverageService {
                             StringUtils.isNotBlank(dc.getLatitude()) ? dc.getLatitude() : rootAgency.getLatitude(),
                             StringUtils.isNotBlank(dc.getLongitude()) ? dc.getLongitude() : rootAgency.getLongitude()))
                     .collect(Collectors.toList());
-        } else if (CoveragePlaceTypeEnum.VOLUNTEER.getCode().equals(placeType)) {
-            // 志愿者
-            String[] parts = categoryKey.split("_");
-            List<IcResiUserEntity> resiEntities = epmetUserService.listVolunteers(customerId, agencyId, staffOrgIds, search, parts[1]);
-
-            return resiEntities.parallelStream().map(re -> {
-                // 使用楼栋的坐标补充居民的坐标信息
-                String[] coordinates = getUserCoordinates(re.getId(), re.getBuildId(), rootAgency);
-
-                return new CoverageAnalisisDataListResultDTO(
-                        re.getId(), categoryKey, isPage ? categoryDict.getCategoryName() : null, placeType,
-                        re.getName().concat(StrConstant.BRACKET_LEFT).concat(re.getIdCard()).concat(StrConstant.BRACKET_RIGNT),
-                        coordinates[1], coordinates[0]);
-
-            }).collect(Collectors.toList());
         }
         return new ArrayList<>();
     }
@@ -1234,7 +1212,7 @@ public class CoverageServiceImpl implements CoverageService {
                 }else{
                     gridId=orgRes.getOrgId();
                     GridInfoCache gridInfoCache=CustomerOrgRedis.getGridInfo(orgRes.getOrgId());
-                    orgIdPath=gridInfoCache.getPids().concat(":").concat(gridId);
+                    orgIdPath=gridInfoCache.getPids();
                 }
                 int count = doDataListCount(formDTO.getCustomerId(), agencyId, orgIdPath, formDTO.getPlaceType(), formDTO.getCategoryKey(), null, gridId);
                 orgRes.setTotal(count);

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml

@@ -63,6 +63,9 @@
           <if test="search != null and search != ''">
             and resi.NAME like CONCAT('%', #{search},'%')
           </if>
+          <if test="gridId != null and gridId != ''">
+            and resi.GRID_ID =#{gridId}
+          </if>
           and s.SPECIAL_RQLB like CONCAT('%', #{categoryKey},'%')
           and resi.DEL_FLAG = '0'
           and s.DEL_FLAG = '0'

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcCoverageCategoryDictDao.xml

@@ -11,6 +11,14 @@
         WHERE DEL_FLAG = '0'
           AND CUSTOMER_ID = #{customerId}
           AND data_type = #{dataType}
+        UNION ALL
+        SELECT
+            DISTINCT MENU_URL
+        FROM ic_coverage_category_dict
+        WHERE DEL_FLAG = '0'
+          AND CUSTOMER_ID = #{customerId}
+          AND data_type = 'governedTarget'
+          AND category_key = 'event_tdnd'
     </select>
     <resultMap type="com.epmet.dataaggre.entity.govorg.IcCoverageCategoryDictEntity" id="icCoverageCategoryDictMap">
         <result property="id" column="ID"/>

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcEnterprisePatrolRecordDao.xml

@@ -8,8 +8,12 @@
         select count(1)
         from ic_enterprise e
         where e.CUSTOMER_ID = #{customerId}
+          <if test='null != search and "" != search'>
                 and e.PLACE_ORG_NAME like CONCAT('%',#{search},'%')
+          </if>
+          <if test="null==gridId || ''==gridId">
               and (e.AGENCY_ID = #{agencyId} or e.AGENCY_PIDS like CONCAT(#{staffOrgIds}, '%'))
+          </if>
           <if test="'enterprise_patrol_unqualified'!= categoryKey">
               and e.PLACE_TYPE = #{categoryKey}
           </if>

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java

@@ -444,7 +444,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
         if (StringUtils.isBlank(mobile) || mobile.length() < 11 || mobile.contains("-")) {
             return;
         }
-        // XXX社区给您指派了一个新的需求，请查看
+        // ${name}给您指派了一个新的需求，请服务完成后尽快反馈，谢谢合作。
         CustomerStaffInfoCacheResult staffInfoCacheResult=CustomerStaffRedis.getStaffInfo(customerId,staffId);
         if (null == staffInfoCacheResult || StringUtils.isBlank(staffInfoCacheResult.getAgencyName())) {
             return;

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.27__alter_party_communit.sql

@@ -0,0 +1,11 @@
+
+ALTER TABLE `ic_community_self_organization`
+ADD COLUMN `SYNC_TYPE`  varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'not_sync' COMMENT '同步状态【已同步:sync  未同步:not_sync】' AFTER `ADDRESS`,
+ADD COLUMN `DEPT_ID`  varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '部门ID customer_department.id' AFTER `SYNC_TYPE`,
+ADD COLUMN `DEPT_STAFF_ID`  varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '部门下工作人员Id' AFTER `DEPT_ID`;
+
+ALTER TABLE `ic_party_unit`
+ADD COLUMN `SYNC_TYPE`  varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'not_sync' COMMENT '同步状态【已同步:sync  未同步:not_sync】' AFTER `REMARK`,
+ADD COLUMN `DEPT_ID`  varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '部门ID customer_department.id' AFTER `SYNC_TYPE`,
+ADD COLUMN `DEPT_STAFF_ID`  varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '部门下工作人员Id' AFTER `DEPT_ID`;
+

epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/EpmetMessageOpenFeignClient.java

@@ -21,8 +21,8 @@ import java.util.List;
  * @author yinzuomei@elink-cn.com
  * @date 2020/6/4 13:47
  */
-@FeignClient(name = ServiceConstant.EPMET_MESSAGE_SERVER, fallbackFactory = EpmetMessageOpenFeignClientFallbackFactory.class, url = "http://127.0.0.1:8085")
-// @FeignClient(name = ServiceConstant.EPMET_MESSAGE_SERVER, fallbackFactory = EpmetMessageOpenFeignClientFallbackFactory.class)
+// @FeignClient(name = ServiceConstant.EPMET_MESSAGE_SERVER, fallbackFactory = EpmetMessageOpenFeignClientFallbackFactory.class, url = "http://127.0.0.1:8085")
+@FeignClient(name = ServiceConstant.EPMET_MESSAGE_SERVER, fallbackFactory = EpmetMessageOpenFeignClientFallbackFactory.class)
 public interface EpmetMessageOpenFeignClient {
     /**
      * 发送短信

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

@@ -9,6 +9,7 @@ import com.epmet.dto.form.*;
 import com.epmet.dto.result.NewUserRoleResultDTO;
 import com.epmet.feign.fallback.GovAccessFeignClientFallBackFactory;
 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;
 
@@ -64,4 +65,7 @@ public interface GovAccessFeignClient {
     @PostMapping("/gov/access/govrole/getgovrole")
     Result<GovRoleDTO> getGovRole(@RequestBody GovRoleListDTO formDTO);
 
+    @PostMapping("/gov/access/govrole/initgovrole/{customerId}")
+    Result initGovRole(@PathVariable(value = "customerId") String customerId);
+
 }

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

@@ -50,4 +50,9 @@ public class GovAccessFeignClientFallBack implements GovAccessFeignClient {
     public Result<GovRoleDTO> getGovRole(GovRoleListDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ACCESS_SERVER, "getGovRole", formDTO);
     }
+
+    @Override
+    public Result initGovRole(String customerId) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ACCESS_SERVER, "initGovRole", customerId);
+    }
 }

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

@@ -108,4 +108,14 @@ public class GovRoleController {
         return new Result<GovRoleDTO>().ok(govRoleService.getGovRole(fromDTO));
     }
 
+    /**
+     * 数字平台客户初始化化设置默认角色数据
+     * @Author sun
+     */
+    @PostMapping("initgovrole/{customerId}")
+    public Result initGovRole(@PathVariable(value = "customerId") String customerId){
+        govRoleService.initGovRole(customerId);
+        return new Result();
+    }
+
 }

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

@@ -95,4 +95,6 @@ public interface GovRoleService extends BaseService<GovRoleEntity> {
     void delete(String[] ids);
 
     GovRoleDTO getGovRole(GovRoleListDTO fromDTO);
+
+    void initGovRole(String customerId);
 }

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

@@ -41,6 +41,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;
@@ -135,4 +136,20 @@ public class GovRoleServiceImpl extends BaseServiceImpl<GovRoleDao, GovRoleEntit
         return baseDao.selectGovRole(fromDTO.getCustomerId(), fromDTO.getName());
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void initGovRole(String customerId) {
+        List<GovRoleEntity> list = new ArrayList<>();
+        GovRoleEntity entity = new GovRoleEntity();
+        entity.setCustomerId(customerId);
+        entity.setName("联建单位负责人");
+        entity.setRemark("默认角色");
+        entity.setDefaultRole("1");
+        list.add(entity);
+        GovRoleEntity entity1 = entity;
+        entity1.setName("社区自组织负责人");
+        list.add(entity1);
+        insertBatch(list);
+    }
+
 }

epmet-module/gov-access/gov-access-server/src/main/resources/db/migration/V0.0.8__alter_gov_role.sql

@@ -0,0 +1,4 @@
+
+
+ALTER TABLE `gov_role`
+ADD COLUMN `default_role`  char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '是否默认角色【0:否  1:是】' AFTER `remark`;

epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.39__alter_dept.sql

@@ -0,0 +1,5 @@
+
+ALTER TABLE `customer_department`
+ADD COLUMN `DEPT_TYPE`  varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT 'duty' COMMENT '部门类型【职能部门:  duty   \r\n联建单位:  party_unit    \r\n社会自组织:  community_org】' AFTER `MOBILE`;
+
+

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

@@ -95,6 +95,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-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormServiceImpl.java

@@ -37,6 +37,7 @@ import com.epmet.dto.result.FormGroupDTO;
 import com.epmet.dto.result.FormItemResult;
 import com.epmet.entity.*;
 import com.epmet.feign.EpmetHeartOpenFeignClient;
+import com.epmet.feign.GovAccessFeignClient;
 import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.redis.CustomerFootBarRedis;
 import com.epmet.service.IcFormService;
@@ -83,6 +84,8 @@ public class IcFormServiceImpl extends BaseServiceImpl<IcFormDao, IcFormEntity>
     private EpmetHeartOpenFeignClient epmetHeartOpenFeignClient;
     @Resource
     private GovOrgOpenFeignClient govOrgOpenFeignClient;
+    @Resource
+    private GovAccessFeignClient govAccessFeignClient;
 
     /**
      * 获取居民信息表单
@@ -329,6 +332,12 @@ public class IcFormServiceImpl extends BaseServiceImpl<IcFormDao, IcFormEntity>
             throw new EpmetException(dictResult.getCode(), dictResult.getMsg());
         }
 
+        //7-29  初始化为客户设置(联建单位负责人、社区自组织负责人)两个默认角色数据
+        Result accessResult = govAccessFeignClient.initGovRole(customerId);
+        if (!accessResult.success()) {
+            throw new EpmetException(accessResult.getCode(), accessResult.getMsg());
+        }
+
         return "初始化成功!客户ID:" + customerId + " formCode:" + formCode;
     }
 }