衔接语链接替换

pcloud-service-book/src/main/java/com/pcloud/book/personalstage/biz/impl/PersonalStageBizImpl.java

@@ -105,8 +105,10 @@ public class PersonalStageBizImpl implements PersonalStageBiz {
     private String wechatLinkPrefix;
 
     private final static String PERSONAL_STAGE_PROJECT_PROGRESS_TEMPLATE = "${PROGRESS_URL}";
-
+    //需求单链接替换符
     private final static String PERSONAL_STAGE_PAPER_TEMPLATE = "${PROGRESS_URL&ProgressId}";
+    //需求单链接替换符
+    private final static String PERSONAL_STAGE_PAPER_TEMPLATE1 = "${PROGRESS_URL&ProgressId}";
 
     // 项目进度路由
     private final static String PERSONAL_STAGE_PROJECT_PROGRESS = "/personalCenter/projectProgress";
@@ -531,9 +533,7 @@ public class PersonalStageBizImpl implements PersonalStageBiz {
             return;
         }
         //替换需求定制单链接
-        if (null != personalStageReply.getPaperId()) {
-            this.replacePaperUrl(items, robotId, userWxId, personalStageReply.getPaperId());
-        }
+        this.replacePaperUrl(items, robotId, userWxId, personalStageReply.getPaperId());
         sendReplyItems(items,robotId,userWxId,ip,personalStageUserId);
     }
 
@@ -556,13 +556,19 @@ public class PersonalStageBizImpl implements PersonalStageBiz {
 
     @ParamLog("替换需求定制单链接")
     private void replacePaperUrl(List<PersonalStageReplyItem> items, String robotId, String userWxId, Long paperId){
-        if (null == paperId){
-            return;
-        }
+
         for (PersonalStageReplyItem item : items){
             if(ReplyTypeEnum.TEXT.value.equals(item.getReplyType())){
+                if (null == paperId){
+                    item.setContent(item.getContent().replace(PERSONAL_STAGE_PAPER_TEMPLATE, ""));
+                    item.setContent(item.getContent().replace(PERSONAL_STAGE_PAPER_TEMPLATE1, ""));
+                    return;
+                }
                 String longUrl = wechatLinkPrefix.concat(PERSONAL_STAGE_PAPER).concat(paperId.toString()).concat("&wxId=" + userWxId + "&robotWxId=" + robotId);
-                item.setContent(item.getContent().replace(PERSONAL_STAGE_PAPER_TEMPLATE, UrlUtils.getShortUrl4Own(longUrl)));
+                //由于前端给的替换符中的“&”可能会是“&amp;”,所以两种替换符都要换掉
+                String shortLink = UrlUtils.getShortUrl4Own(longUrl);
+                item.setContent(item.getContent().replace(PERSONAL_STAGE_PAPER_TEMPLATE, shortLink));
+                item.setContent(item.getContent().replace(PERSONAL_STAGE_PAPER_TEMPLATE1, shortLink));
             }
         }
     }

pcloud-service-book/src/main/java/com/pcloud/book/personalstage/biz/impl/PersonalStageJumpBizImpl.java

@@ -42,6 +42,7 @@ import com.pcloud.common.page.PageParam;
 import com.pcloud.common.utils.DateNewUtils;
 import com.pcloud.common.utils.ListUtils;
 import com.pcloud.common.utils.NumberUtil;
+import com.pcloud.common.utils.httpclient.UrlUtils;
 import com.pcloud.common.utils.string.StringUtil;
 import com.pcloud.wechatgroup.group.dto.GroupRobotDTO;
 import com.pcloud.wechatgroup.group.dto.GroupUserDTO;
@@ -98,6 +99,15 @@ public class PersonalStageJumpBizImpl implements PersonalStageJumpBiz {
     @Value("${system.env}")
     private String envStr;
 
+    @Value("${wechat.group.link.prefix}")
+    private String wechatLinkPrefix;
+    //需求单链接替换符
+    private final static String PERSONAL_STAGE_PAPER_TEMPLATE = "${PROGRESS_URL&ProgressId}";
+    //需求单链接替换符
+    private final static String PERSONAL_STAGE_PAPER_TEMPLATE1 = "${PROGRESS_URL&ProgressId}";
+    //需求定制单路由  https://wechat666.raysgo.com/personalCenter/questionNaire?paperId=679
+    private final static String PERSONAL_STAGE_PAPER = "/personalCenter/questionNaire?paperId=";
+
     @Override
     @ParamLog("新增阶段跳转")
     @Transactional(rollbackFor = Exception.class)
@@ -375,6 +385,10 @@ public class PersonalStageJumpBizImpl implements PersonalStageJumpBiz {
             LOGGER.info("没有该跳转衔接语！");
             return;
         }
+        List<PersonalStageJumpLinkup> list = new ArrayList<>();
+        list.add(jumpLinkup);
+        this.replacePaperUrl(list, linkupDelayDTO.getRobotId(), linkupDelayDTO.getWxId(), jumpLinkup.getPersonalStageJumpId());
+        jumpLinkup = list.get(0);
         if(ReplyTypeEnum.TEXT.value.equals( jumpLinkup.getReplyType())){
             SendTextMessageVO sendTextMessageVO = new SendTextMessageVO();
             sendTextMessageVO.setContent(personalStageBiz.replaceProjectProgressUrl(jumpLinkup.getLinkupContent(),linkupDelayDTO.getRobotId(),linkupDelayDTO.getWxId(),linkupDelayDTO.getPersonalStageUserId()));
@@ -547,6 +561,7 @@ public class PersonalStageJumpBizImpl implements PersonalStageJumpBiz {
         if(ListUtils.isEmpty(linkups)){
             return;
         }
+        this.replacePaperUrl(linkups, robotWxId, userWxId, jumpId);
         for (PersonalStageJumpLinkup jumpLinkup : linkups){
             if (jumpLinkup.getToStageStartTime()!=null&&jumpLinkup.getToStageStartTime()>0){
                 LinkupDelayDTO linkupDelayDTO=new LinkupDelayDTO();
@@ -588,4 +603,30 @@ public class PersonalStageJumpBizImpl implements PersonalStageJumpBiz {
         updateStageUser.setUpdateTime(new Date());
         personalStageUserDao.update(updateStageUser);
     }
+
+    @ParamLog("替换需求定制单链接")
+    private void replacePaperUrl(List<PersonalStageJumpLinkup> linkups, String robotId, String userWxId, Long jumpId){
+        PersonalStageJumpDto stageJump = personalStageJumpDao.getDtoById(jumpId);
+        if (null == stageJump){
+            return;
+        }
+        PersonalStage personalStage = personalStageDao.getById(stageJump.getPersonalStageId());
+        if (null == personalStage){
+            return;
+        }
+        for (PersonalStageJumpLinkup linkup : linkups){
+            if(ReplyTypeEnum.TEXT.value.equals(linkup.getReplyType())){
+                if (null == personalStage.getPaperId()){
+                    linkup.setLinkupContent(linkup.getLinkupContent().replace(PERSONAL_STAGE_PAPER_TEMPLATE, ""));
+                    linkup.setLinkupContent(linkup.getLinkupContent().replace(PERSONAL_STAGE_PAPER_TEMPLATE1, ""));
+                    continue;
+                }
+                String longUrl = wechatLinkPrefix.concat(PERSONAL_STAGE_PAPER).concat(personalStage.getPaperId().toString()).concat("&wxId=" + userWxId + "&robotWxId=" + robotId);
+                //由于前端给的替换符中的“&”可能会是“&amp;”,所以两种替换符都要换掉
+                String shortLink = UrlUtils.getShortUrl4Own(longUrl);
+                linkup.setLinkupContent(linkup.getLinkupContent().replace(PERSONAL_STAGE_PAPER_TEMPLATE, shortLink));
+                linkup.setLinkupContent(linkup.getLinkupContent().replace(PERSONAL_STAGE_PAPER_TEMPLATE1, shortLink));
+            }
+        }
+    }
 }