同步

dongjian-dashboard-back-controller/buildPush-aeon-prod.sh

@@ -0,0 +1,11 @@
+aws configure set aws_access_key_id AKIAR26KHSVRUEAKRBPZ
+aws configure set aws_secret_access_key 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
+aws configure set default.region ap-northeast-1
+aws ecr get-login-password --region ap-northeast-1 | docker login --username AWS --password-stdin 126588786019.dkr.ecr.ap-northeast-1.amazonaws.com
+
+docker build -t 126588786019.dkr.ecr.ap-northeast-1.amazonaws.com/aeon-prod/dashboard-back:latest\
+    --build-arg JAR_FILE=target/dongjian-dashboard-back-controller-0.0.1-SNAPSHOT.jar \
+    --build-arg LIB_DIR=target/lib \
+    --build-arg CONFIG_DIR=target/config \
+    .
+docker push 126588786019.dkr.ecr.ap-northeast-1.amazonaws.com/aeon-prod/dashboard-back:latest

dongjian-dashboard-back-controller/buildPush-aeon.sh

@@ -1,11 +1,11 @@
-aws configure set aws_access_key_id AKIAQNYBBSGDVT3VF4ON
-aws configure set aws_secret_access_key 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
+aws configure set aws_access_key_id AKIAVSKFRQDPNWHJDSHL
+aws configure set aws_secret_access_key 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
 aws configure set default.region ap-northeast-1
-aws ecr get-login-password --region ap-northeast-1 | docker login --username AWS --password-stdin 029530100103.dkr.ecr.ap-northeast-1.amazonaws.com
+aws ecr get-login-password --region ap-northeast-1 | docker login --username AWS --password-stdin 382934810846.dkr.ecr.ap-northeast-1.amazonaws.com
 
-docker build -t 029530100103.dkr.ecr.ap-northeast-1.amazonaws.com/aeon/dashboard-back:latest\
+docker build -t 382934810846.dkr.ecr.ap-northeast-1.amazonaws.com/aeon/dashboard-back-stg:latest\
     --build-arg JAR_FILE=target/dongjian-dashboard-back-controller-0.0.1-SNAPSHOT.jar \
     --build-arg LIB_DIR=target/lib \
     --build-arg CONFIG_DIR=target/config \
     .
-docker push 029530100103.dkr.ecr.ap-northeast-1.amazonaws.com/aeon/dashboard-back:latest
+docker push 382934810846.dkr.ecr.ap-northeast-1.amazonaws.com/aeon/dashboard-back-stg:latest

dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/OverviewServiceImpl.java

@@ -74,8 +74,8 @@ public class OverviewServiceImpl implements OverviewService {
 			mergeOverviewList(buildingInfoList, overviewVOList);
 
 			// 查找楼宇没有的监测点分类
-			Map<Long, List<Long>> notExistingCategoryMap = handleMissingMonitoringPointCategory(companyId, buildingInfoList);
-			mergeMissingMonitoringPointCategory(buildingInfoList, notExistingCategoryMap);
+//			Map<Long, List<Long>> notExistingCategoryMap = handleMissingMonitoringPointCategory(companyId, buildingInfoList);
+//			mergeMissingMonitoringPointCategory(buildingInfoList, notExistingCategoryMap);
 		}
 
 		return SimpleDataResponse.success(buildingInfoList);