Merge branch 'zhc' into ppt-20260120

dongjian-dashboard-back-common/src/main/resources/config/language/msg/msg_cn.yml

@@ -49,7 +49,7 @@ msgcn:
         roleHasBinded: 角色已绑定用户，请先解绑再删除
         loginNameOrEmailHasExisted: 用户名或邮箱已被使用
         mailAddUserPwdSubject: 新建账号密码
-        mailAddUserPwdContent: '账号 <u>{0}</u> 的密码为 <span style="text-transform: none;"><u>{1}</u></span> 请妥善保管<br/><br/>登陆网址：<u>{2}</u>'
+        mailAddUserPwdContent: '{0}<br/><br/>このたびは、データ管理プラットフォームへのご登録、誠にありがとうございます。<br/><br/>下記の通り、アカウントが発行されましたのでご案内いたします。<br/><br/>-------------------------------------------------<br/>ユーザー名（ID）：<u>{1}</u><br/>初期パスワード：<span style="text-transform: none;"><u>{2}</u></span><br/>-------------------------------------------------<br/><br/>ご不明な点がございましたら、お気軽にサポートまでお問い合わせください。<br/><br/>-------------------------------<br/>イオンディライト株式会社<br/>サポート窓口: smbil-support@ifmservice.jp<br/>-------------------------------'
         mailResetUserPwdSubject: 重置账号密码
         pwdFormatError: 密码组成必须包含数字、英文字母、特殊符号(~!@#$%^&*)且大于等于12位
         oldPwdError: 旧密码错误

dongjian-dashboard-back-common/src/main/resources/config/language/msg/msg_en.yml

@@ -49,7 +49,7 @@ msgen:
         roleHasBinded: 角色已绑定用户，请先解绑再删除
         loginNameOrEmailHasExisted: 用户名或邮箱已被使用
         mailAddUserPwdSubject: 新建账号密码
-        mailAddUserPwdContent: '账号 <u>{0}</u> 的密码为 <span style="text-transform: none;"><u>{1}</u></span> 请妥善保管<br/><br/>登陆网址：<u>{2}</u>'
+        mailAddUserPwdContent: '{0}<br/><br/>このたびは、データ管理プラットフォームへのご登録、誠にありがとうございます。<br/><br/>下記の通り、アカウントが発行されましたのでご案内いたします。<br/><br/>-------------------------------------------------<br/>ユーザー名（ID）：<u>{1}</u><br/>初期パスワード：<span style="text-transform: none;"><u>{2}</u></span><br/>-------------------------------------------------<br/><br/>ご不明な点がございましたら、お気軽にサポートまでお問い合わせください。<br/><br/>-------------------------------<br/>イオンディライト株式会社<br/>サポート窓口: smbil-support@ifmservice.jp<br/>-------------------------------'
         mailResetUserPwdSubject: 重置账号密码
         pwdFormatError: 密码组成必须包含数字、英文字母、特殊符号(~!@#$%^&*)且大于等于12位
         oldPwdError: 旧密码错误

dongjian-dashboard-back-common/src/main/resources/config/language/msg/msg_jp.yml

@@ -49,7 +49,7 @@ msgjp:
         roleHasBinded: 役割はユーザーにバインドされている ので、削除する前にバインドを解除してください
         loginNameOrEmailHasExisted: ユーザー名またはメールボックスはすでに使用されています
         mailAddUserPwdSubject: 新規アカウント・パスワードの作成
-        mailAddUserPwdContent: 'アカウント <u>{0}</u> のパスワードは <span style="text-transform: none;"><u>{1}</u></span> お忘れにならないようにお願いします。<br/><br/>ログインWebアドレス：<u>{2}</u>'
+        mailAddUserPwdContent: '{0} 様<br/><br/>このたびは、データ管理プラットフォームへのご登録、誠にありがとうございます。<br/><br/>下記の通り、アカウントが発行されましたのでご案内いたします。<br/><br/>-------------------------------------------------<br/>ユーザー名（ID）：<u>{1}</u><br/>初期パスワード：<span style="text-transform: none;"><u>{2}</u></span><br/>-------------------------------------------------<br/><br/>ご不明な点がございましたら、お気軽にサポートまでお問い合わせください。<br/><br/>ログインはこちらから：<br/>【AD スマビル 可視化UI URL】：https://smbil.ifmservice.jp/login<br/><br/>-------------------------------<br/>イオンディライト株式会社<br/>サポート窓口: smbil-support@ifmservice.jp<br/>-------------------------------'
         mailResetUserPwdSubject: アカウント・パスワードのリセット
         pwdFormatError: パスワードの構成には、数字、アルファベット、特殊文字（~!@#$%^&*) で、12桁以上
         oldPwdError: 旧パスワードエラー

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-controller/src/main/java/com/dongjian/dashboard/back/controller/DeviceDataAccumulateController.java

@@ -90,12 +90,12 @@ public class DeviceDataAccumulateController {
     @OperationLog(operation = "exportCumulativeData", remark = "")
     @GetMapping("/exportData")
     public void exportDeviceAccumulate(HttpServletResponse response,
-           @Parameter(name = "LoginName", description = "Login name", required = true, schema = @Schema(defaultValue = "admin")) @RequestHeader(required=true) String LoginName,
-           @Parameter(name = "AccessToken", description = "Authentication token", required = true) @RequestHeader(required=true) String AccessToken,
-           @Parameter(name = "UserId", description = "User ID", required = true, schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) Long UserId,
-           @Parameter(name = "CompanyId", description = "ID of the company to which the user belongs", required = false, schema = @Schema(defaultValue = "1")) @RequestHeader(required=false) Long CompanyId,
-           @Parameter(name = "LanguageType", description = "Language type (0: Chinese, 1: English, 2: Japanese)", required = true, schema = @Schema(defaultValue = "2")) @RequestHeader(required=true) Integer LanguageType,
-           AccumulateDataSearchParam pageSearchParam
+                                       @Parameter(name = "LoginName", description = "Login name", required = true, schema = @Schema(defaultValue = "admin")) @RequestHeader(required=true) String LoginName,
+                                       @Parameter(name = "AccessToken", description = "Authentication token", required = true) @RequestHeader(required=true) String AccessToken,
+                                       @Parameter(name = "UserId", description = "User ID", required = true, schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) Long UserId,
+                                       @Parameter(name = "CompanyId", description = "ID of the company to which the user belongs", required = false, schema = @Schema(defaultValue = "1")) @RequestHeader(required=false) Long CompanyId,
+                                       @Parameter(name = "LanguageType", description = "Language type (0: Chinese, 1: English, 2: Japanese)", required = true, schema = @Schema(defaultValue = "2")) @RequestHeader(required=true) Integer LanguageType,
+                                       AccumulateDataSearchParam pageSearchParam
     ) throws IOException {
 
         response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");

dongjian-dashboard-back-controller/src/main/java/com/dongjian/dashboard/back/controller/DeviceDataAlarmController.java

@@ -90,12 +90,12 @@ public class DeviceDataAlarmController {
     @OperationLog(operation = "exportAlarmData", remark = "")
     @GetMapping("/exportData")
     public void exportDeviceAlarm(HttpServletResponse response,
-           @Parameter(name = "LoginName", description = "Login name", required = true, schema = @Schema(defaultValue = "admin")) @RequestHeader(required=true) String LoginName,
-           @Parameter(name = "AccessToken", description = "Authentication token", required = true) @RequestHeader(required=true) String AccessToken,
-           @Parameter(name = "UserId", description = "User ID", required = true, schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) Long UserId,
-           @Parameter(name = "CompanyId", description = "ID of the company to which the user belongs", required = false, schema = @Schema(defaultValue = "1")) @RequestHeader(required=false) Long CompanyId,
-           @Parameter(name = "LanguageType", description = "Language type (0: Chinese, 1: English, 2: Japanese)", required = true, schema = @Schema(defaultValue = "2")) @RequestHeader(required=true) Integer LanguageType,
-           AlarmDataSearchParam pageSearchParam
+                                  @Parameter(name = "LoginName", description = "Login name", required = true, schema = @Schema(defaultValue = "admin")) @RequestHeader(required=true) String LoginName,
+                                  @Parameter(name = "AccessToken", description = "Authentication token", required = true) @RequestHeader(required=true) String AccessToken,
+                                  @Parameter(name = "UserId", description = "User ID", required = true, schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) Long UserId,
+                                  @Parameter(name = "CompanyId", description = "ID of the company to which the user belongs", required = false, schema = @Schema(defaultValue = "1")) @RequestHeader(required=false) Long CompanyId,
+                                  @Parameter(name = "LanguageType", description = "Language type (0: Chinese, 1: English, 2: Japanese)", required = true, schema = @Schema(defaultValue = "2")) @RequestHeader(required=true) Integer LanguageType,
+                                  AlarmDataSearchParam pageSearchParam
     ) throws IOException {
 
         response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");

dongjian-dashboard-back-controller/src/main/java/com/dongjian/dashboard/back/controller/DeviceDataBaStatusController.java

@@ -89,12 +89,12 @@ public class DeviceDataBaStatusController {
     @OperationLog(operation = "exportBaStatusData", remark = "")
     @GetMapping("/exportData")
     public void exportDeviceBaStatus(HttpServletResponse response,
-           @Parameter(name = "LoginName", description = "Login name", required = true, schema = @Schema(defaultValue = "admin")) @RequestHeader(required=true) String LoginName,
-           @Parameter(name = "AccessToken", description = "Authentication token", required = true) @RequestHeader(required=true) String AccessToken,
-           @Parameter(name = "UserId", description = "User ID", required = true, schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) Long UserId,
-           @Parameter(name = "CompanyId", description = "ID of the company to which the user belongs", required = false, schema = @Schema(defaultValue = "1")) @RequestHeader(required=false) Long CompanyId,
-           @Parameter(name = "LanguageType", description = "Language type (0: Chinese, 1: English, 2: Japanese)", required = true, schema = @Schema(defaultValue = "2")) @RequestHeader(required=true) Integer LanguageType,
-           BaStatusDataSearchParam pageSearchParam
+                                     @Parameter(name = "LoginName", description = "Login name", required = true, schema = @Schema(defaultValue = "admin")) @RequestHeader(required=true) String LoginName,
+                                     @Parameter(name = "AccessToken", description = "Authentication token", required = true) @RequestHeader(required=true) String AccessToken,
+                                     @Parameter(name = "UserId", description = "User ID", required = true, schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) Long UserId,
+                                     @Parameter(name = "CompanyId", description = "ID of the company to which the user belongs", required = false, schema = @Schema(defaultValue = "1")) @RequestHeader(required=false) Long CompanyId,
+                                     @Parameter(name = "LanguageType", description = "Language type (0: Chinese, 1: English, 2: Japanese)", required = true, schema = @Schema(defaultValue = "2")) @RequestHeader(required=true) Integer LanguageType,
+                                     BaStatusDataSearchParam pageSearchParam
     ) throws IOException {
 
         response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");

dongjian-dashboard-back-controller/src/main/java/com/dongjian/dashboard/back/controller/DeviceDataMeasureController.java

@@ -89,12 +89,12 @@ public class DeviceDataMeasureController {
     @OperationLog(operation = "exportMeasureData", remark = "")
     @GetMapping("/exportData")
     public void exportDeviceMeasure(HttpServletResponse response,
-           @Parameter(name = "LoginName", description = "Login name", required = true, schema = @Schema(defaultValue = "admin")) @RequestHeader(required=true) String LoginName,
-           @Parameter(name = "AccessToken", description = "Authentication token", required = true) @RequestHeader(required=true) String AccessToken,
-           @Parameter(name = "UserId", description = "User ID", required = true, schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) Long UserId,
-           @Parameter(name = "CompanyId", description = "ID of the company to which the user belongs", required = false, schema = @Schema(defaultValue = "1")) @RequestHeader(required=false) Long CompanyId,
-           @Parameter(name = "LanguageType", description = "Language type (0: Chinese, 1: English, 2: Japanese)", required = true, schema = @Schema(defaultValue = "2")) @RequestHeader(required=true) Integer LanguageType,
-           MeasureDataSearchParam pageSearchParam
+                                    @Parameter(name = "LoginName", description = "Login name", required = true, schema = @Schema(defaultValue = "admin")) @RequestHeader(required=true) String LoginName,
+                                    @Parameter(name = "AccessToken", description = "Authentication token", required = true) @RequestHeader(required=true) String AccessToken,
+                                    @Parameter(name = "UserId", description = "User ID", required = true, schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) Long UserId,
+                                    @Parameter(name = "CompanyId", description = "ID of the company to which the user belongs", required = false, schema = @Schema(defaultValue = "1")) @RequestHeader(required=false) Long CompanyId,
+                                    @Parameter(name = "LanguageType", description = "Language type (0: Chinese, 1: English, 2: Japanese)", required = true, schema = @Schema(defaultValue = "2")) @RequestHeader(required=true) Integer LanguageType,
+                                    MeasureDataSearchParam pageSearchParam
     ) throws IOException {
 
         response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");

dongjian-dashboard-back-controller/src/main/resources/config/application.properties

@@ -81,14 +81,15 @@ mail.smtp.host=email-smtp.ap-northeast-1.amazonaws.com
 mail.smtp.port=465
 mail.smtp.auth=true
 mail.smtp.ssl=true
-mail.sender.username=AKIAVRXFMB43Z4Q6WGZN
-mail.sender.password_encrypted=true
-mail.sender.password=a/52R0rao7ksRMvl1j17fVEmPCw7gC9OreHDqWOE+S7sgmoQT0YgoLRJqOlJqX7e
-mail.sender.sendername=datacenter-info
-mail.sender.from=alert@ttkdatatechbuild.com
-#邮件通知服务开关
+mail.sender.username=AKIAR26KHSVR3E7N7V3X
+mail.sender.password_encrypted=false
+mail.sender.password=BFe3PePmvmKJKF/cwVxKq2C3EG10IcYQ+fNq0Eccl0PU
+mail.sender.sendername=smbil-support@ifmservice.jp
+mail.sender.from=smbil-support@ifmservice.jp
+#\u90AE\u4EF6\u901A\u77E5\u670D\u52A1\u5F00\u5173
 mail.send.switch=true
 
+
 Spring.mvc.hiddenmethod.filter.enabled=true
 #单个文件上传发大小
 spring.servlet.multipart.max-file-size=20MB

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);

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

@@ -134,7 +134,7 @@ public class UserServiceImpl implements UserService {
 			}
 			optAsync.doSendWork(
 					msgLanguageChange.getParameterMapByCode(languageType, "mailAddUserPwdSubject") + "【" + basicCompany.getCompanyName() +"】",
-					MessageFormat.format(msgLanguageChange.getParameterMapByCode(languageType, "mailAddUserPwdContent"), basicUser.getLoginName(), rawPwd, loginUrl), 
+					MessageFormat.format(msgLanguageChange.getParameterMapByCode(languageType, "mailAddUserPwdContent"),basicUser.getLastName()+" "+basicUser.getFirstName(),basicUser.getLoginName(), rawPwd, loginUrl),
 					basicUser.getEmail(),
 					null);
 			
@@ -338,7 +338,7 @@ public class UserServiceImpl implements UserService {
 					}
 					optAsync.doSendWork(
 							msgLanguageChange.getParameterMapByCode(languageType, "mailResetUserPwdSubject") + "【" + basicCompany.getCompanyName() +"】", 
-							MessageFormat.format(msgLanguageChange.getParameterMapByCode(languageType, "mailAddUserPwdContent"), basicUser.getLoginName(), rawPwd, loginUrl),
+							MessageFormat.format(msgLanguageChange.getParameterMapByCode(languageType, "mailAddUserPwdContent"),basicUser.getLastName()+" "+basicUser.getFirstName(),basicUser.getLoginName(), rawPwd, loginUrl),
 							basicUser.getEmail(), 
 							null);
 				}