Merge branch 'feature-国际环境邮件场景链接更改-20240923' into test

src/main/java/com/fdkankan/contro/mq/service/impl/BuildObjServiceImpl.java

@@ -318,7 +318,7 @@ public class BuildObjServiceImpl implements IBuildSceneService {
 
             //国际环境需要发邮件通知
             if("eur".equals(env)){
-                commonService.sendEmail(projectNum);
+                commonService.sendEmail(projectNum, "obj");
             }
 
         }catch (Exception e){

src/main/java/com/fdkankan/contro/mq/service/impl/BuildSceneServiceImpl.java

@@ -410,7 +410,7 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
 
             //国际环境需要发邮件通知
             if("eur".equals(env)){
-                commonService.sendEmail(sceneCode);
+                commonService.sendEmail(sceneCode, "V4");
             }
 
             wbService.sendMq(sceneCode, CommonSuccessStatus.SUCCESS.code());

src/main/java/com/fdkankan/contro/mq/service/impl/BuildV3SceneServiceImpl.java

@@ -309,7 +309,7 @@ public class BuildV3SceneServiceImpl implements IBuildSceneService {
 
             //国际环境需要发邮件通知
             if("eur".equals(env)){
-                commonService.sendEmail(sceneCode);
+                commonService.sendEmail(sceneCode, "V3");
             }
 
         }catch (Exception e){

src/main/java/com/fdkankan/contro/service/ICommonService.java

@@ -30,7 +30,7 @@ public interface ICommonService {
 
     public void uploadFloorplanJson(String num, String dataSource) throws Exception;
 
-    public void sendEmail(String num);
+    public void sendEmail(String num, String type);
 
     String getOssOrignPath(String path);
 

src/main/java/com/fdkankan/contro/service/impl/CommonServiceImpl.java

@@ -59,8 +59,8 @@ import java.util.stream.Collectors;
 @RefreshScope
 public class CommonServiceImpl implements ICommonService {
 
-    @Value("${main.url}")
-    private String mainUrl;
+    @Value("${main.laserUrlP:#{null}}")
+    private String laserUrl;
 
     @Value("${env:gn}")
     private String env;
@@ -251,7 +251,7 @@ public class CommonServiceImpl implements ICommonService {
     }
 
     @Override
-    public void sendEmail(String num) {
+    public void sendEmail(String num, String type) {
         try {
             Long userId = null;
             String websize = "";
@@ -287,6 +287,10 @@ public class CommonServiceImpl implements ICommonService {
                 helpLink = helpLinkZh;
             }
             websize += "&lang=" + lang;
+            if(("V4".equals(type) || "V3".equals(type))
+                    && (scenePlus.getSceneSource() == SceneSource.JG.code() || scenePlus.getSceneSource() == SceneSource.SG.code())){
+                websize = String.format(laserUrl, num, lang);
+            }
 
             MailTemplate mailTemplate = mailTemplateService.getOne(new LambdaQueryWrapper<MailTemplate>().eq(MailTemplate::getRemark, "计算完成").eq(MailTemplate::getLang, lang));
             String content = mailTemplate.getMsg().replaceAll("scene_name", title).replaceAll("scene_link", websize).replaceAll("help_link", helpLink);