【五大图层】完善

3 years ago · 5fb1ed5320
5 changed files with 54 additions and 5 deletions
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/DataSourceConstant.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/DataSourceConstant.java
@ -37,4 +37,5 @@ public interface DataSourceConstant {

    String EPMET_T_DUCK = "epmettduck";
    String EPMETTDUCK="epmettduck";
+    String EPMET_HEART="heart";
 }
--- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml
@ -242,6 +242,13 @@
                <datasource.druid.epmettduck.username>epmet_tduck_user</datasource.druid.epmettduck.username>
                <datasource.druid.epmettduck.password>EpmEt-db-UsEr</datasource.druid.epmettduck.password>

+                <!--heart-->
+                <datasource.druid.heart.url>
+                    <![CDATA[jdbc:mysql://192.168.1.140:3306/epmet_heart?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.heart.url>
+                <datasource.druid.heart.username>epmet_heart_user</datasource.druid.heart.username>
+                <datasource.druid.heart.password>EpmEt-db-UsEr</datasource.druid.heart.password>
+
                <!-- redis配置 -->
                <spring.redis.index>0</spring.redis.index>
                <spring.redis.host>192.168.1.140</spring.redis.host>
@ -367,6 +374,12 @@
                <datasource.druid.epmettduck.username>epmet_tduck_user</datasource.druid.epmettduck.username>
                <datasource.druid.epmettduck.password>EpmEt-db-UsEr</datasource.druid.epmettduck.password>

+                <datasource.druid.heart.url>
+                    <![CDATA[jdbc:mysql://192.168.1.140:3306/epmet_heart?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.heart.url>
+                <datasource.druid.heart.username>epmet_heart_user</datasource.druid.heart.username>
+                <datasource.druid.heart.password>EpmEt-db-UsEr</datasource.druid.heart.password>
+
                <!-- redis配置 -->
                <spring.redis.index>0</spring.redis.index>
                <spring.redis.host>192.168.1.140</spring.redis.host>
@ -492,6 +505,13 @@
                <datasource.druid.epmettduck.username>epmet</datasource.druid.epmettduck.username>
                <datasource.druid.epmettduck.password>elink@833066</datasource.druid.epmettduck.password>

+                <!--heart-->
+                <datasource.druid.heart.url>
+                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_heart?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.heart.url>
+                <datasource.druid.heart.username>epmet</datasource.druid.heart.username>
+                <datasource.druid.heart.password>elink@833066</datasource.druid.heart.password>
+
                <!-- redis配置 -->
                <spring.redis.index>0</spring.redis.index>
                <spring.redis.host>192.168.10.150</spring.redis.host>
@ -617,6 +637,13 @@
                <datasource.druid.epmettduck.username>epmet_tduck</datasource.druid.epmettduck.username>
                <datasource.druid.epmettduck.password>EpmEt-db-UsEr</datasource.druid.epmettduck.password>

+                <!--heart-->
+                <datasource.druid.heart.url>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_heart?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.heart.url>
+                <datasource.druid.heart.username>epmet_heart_user</datasource.druid.heart.username>
+                <datasource.druid.heart.password>EpmEt-db-UsEr</datasource.druid.heart.password>
+
                <!-- redis配置 -->
                <spring.redis.index>0</spring.redis.index>
                <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/impl/HeartServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/impl/HeartServiceImpl.java
@ -1,6 +1,8 @@
 package com.epmet.dataaggre.service.heart.impl;

 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+import com.epmet.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.dao.heart.IcCommunitySelfOrganizationDao;
 import com.epmet.dataaggre.entity.heart.IcCommunitySelfOrganizationEntity;
 import com.epmet.dataaggre.service.heart.HeartService;
@ -12,6 +14,7 @@ import org.springframework.stereotype.Service;

 import java.util.List;

+@DataSource(value = DataSourceConstant.EPMET_HEART)
@Service
 public class HeartServiceImpl implements HeartService {

--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java
@ -11,6 +11,7 @@ import com.epmet.dataaggre.dto.govorg.result.CoverageAnalisisDataListResultDTO;
 import com.epmet.dataaggre.entity.epmetuser.IcResiUserEntity;
 import com.epmet.dataaggre.entity.govorg.IcCityManagementEntity;
 import com.epmet.dataaggre.entity.govorg.IcDangerousChemicalsEntity;
+import com.epmet.dataaggre.entity.govorg.IcHouseEntity;
 import com.epmet.dataaggre.entity.heart.IcCommunitySelfOrganizationEntity;
 import com.epmet.dataaggre.service.CoverageService;
 import com.epmet.dataaggre.service.epmetuser.IcResiService;
@ -145,14 +146,26 @@ public class CoverageServiceImpl implements CoverageService {
            return resiEntities.stream().map(re -> {
                // 使用楼栋的坐标补充居民的坐标信息
                BuildingInfoCache resiBuilding = getBuildingInfo(re.getId(), re.getBuildId());
-                return new CoverageAnalisisDataListResultDTO(re.getId(), categoryKey, placeType, re.getName(), resiBuilding.getLatitude(), resiBuilding.getLongitude());
+                String buildingLatitude = null;
+                String buildingLongitude = null;
+                if (resiBuilding != null) {
+                    buildingLatitude = resiBuilding.getLatitude();
+                    buildingLongitude = resiBuilding.getLongitude();
+                }
+                return new CoverageAnalisisDataListResultDTO(re.getId(), categoryKey, placeType, re.getName(), buildingLatitude, buildingLongitude);
            }).collect(Collectors.toList());
        } else if (PLACE_TYPE_SPECIAL_RESI.equals(placeType)) {
            // 特殊人群
            List<IcResiInfoResultDTO> resiInfos = icResiService.listSpecialResisBySpecialType(customerId, agencyId, staffOrgIds, categoryKey, search, pageNo, pageSize, isPage);
            return resiInfos.stream().map(re -> {
                BuildingInfoCache resiBuilding = getBuildingInfo(re.getId(), re.getBuildId());
-                return new CoverageAnalisisDataListResultDTO(re.getId(), categoryKey, placeType, re.getName(), resiBuilding.getLatitude(), resiBuilding.getLongitude());
+                String buildingLatitude = null;
+                String buildingLongitude = null;
+                if (resiBuilding != null) {
+                    buildingLatitude = resiBuilding.getLatitude();
+                    buildingLongitude = resiBuilding.getLongitude();
+                }
+                return new CoverageAnalisisDataListResultDTO(re.getId(), categoryKey, placeType, re.getName(), buildingLatitude, buildingLongitude);
            }).collect(Collectors.toList());
        } else if (PLACE_TYPE_EVENT.equals(placeType)) {
            // 难点痛点 todo
@ -181,8 +194,8 @@ public class CoverageServiceImpl implements CoverageService {

        } else if (PLACE_TYPE_GROUP_RENT.equals(placeType)) {
            // 群租房。出租的房屋，住的人口超过5人属于群租房（是个规定）
-
-
+            List<IcHouseEntity> icHouseEntities = orgCoverageService.searchGroupRentHouseEntities(customerId, staffOrgIds, search, isPage, pageNo, pageSize);
+            //icHouseEntities

        } else if (PLACE_TYPE_PUBLIC_SERVICE.equals(placeType)) {
            // 公共服务
@ -193,7 +206,7 @@ public class CoverageServiceImpl implements CoverageService {


        }
-        return null;
+        return new ArrayList<>();
    }

    /**
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml
@ -156,6 +156,11 @@ dynamic:
      url: @datasource.druid.epmettduck.url@
      username: @datasource.druid.epmettduck.username@
      password: @datasource.druid.epmettduck.password@
+    heart:
+      driver-class-name: com.mysql.cj.jdbc.Driver
+      url: @datasource.druid.heart.url@
+      username: @datasource.druid.heart.username@
+      password: @datasource.druid.heart.password@
 feign:
  hystrix:
    enabled: true