sendWorkflowApproveWx

src/main/java/com/xjrsoft/module/oa/service/impl/NewsServiceImpl.java

@@ -1,6 +1,7 @@
 package com.xjrsoft.module.oa.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.yulichang.base.MPJBaseServiceImpl;
@@ -8,6 +9,7 @@ import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.xjrsoft.common.enums.EnabledMark;
 import com.xjrsoft.common.utils.LocalDateTimeUtil;
 import com.xjrsoft.common.utils.VoToColumnUtil;
+import com.xjrsoft.config.CommonPropertiesConfig;
 import com.xjrsoft.module.oa.dto.*;
 import com.xjrsoft.module.oa.entity.News;
 import com.xjrsoft.module.oa.entity.NewsAppendix;
@@ -57,12 +59,14 @@ public class NewsServiceImpl extends MPJBaseServiceImpl<NewsMapper, News> implem
     private final UserDeptRelationMapper userDeptRelationMapper;
 
 
-    private final BaseStudentSchoolRollMapper  baseStudentSchoolRollMapper;
+    private final BaseStudentSchoolRollMapper baseStudentSchoolRollMapper;
 
     private final IWeChatService weChatService;
 
     private final UserMapper userMapper;
 
+    private final CommonPropertiesConfig commonPropertiesConfig;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Long add(AddNewsDto addNewsDto) {
@@ -107,7 +111,7 @@ public class NewsServiceImpl extends MPJBaseServiceImpl<NewsMapper, News> implem
         News news = BeanUtil.toBean(updateNewsDto, News.class);
         newsMapper.updateById(news);
 
-        newsAppendixMapper.delete(Wrappers.lambdaQuery(NewsAppendix.class).eq(NewsAppendix::getNewsId,news.getId()));
+        newsAppendixMapper.delete(Wrappers.lambdaQuery(NewsAppendix.class).eq(NewsAppendix::getNewsId, news.getId()));
         if (updateNewsDto.getAppendixList() != null) {
             for (AddNewsAppendixDto appendixDto : updateNewsDto.getAppendixList()) {
                 NewsAppendix newsAppendix = BeanUtil.toBean(appendixDto, NewsAppendix.class);
@@ -116,7 +120,7 @@ public class NewsServiceImpl extends MPJBaseServiceImpl<NewsMapper, News> implem
             }
         }
 
-        if(updateNewsDto.getRelationList()!=null) {
+        if (updateNewsDto.getRelationList() != null) {
             newsRelationMapper.delete(Wrappers.lambdaQuery(NewsRelation.class).eq(NewsRelation::getNewsId, news.getId()));
             newsRelationConfigMapper.delete(Wrappers.lambdaQuery(NewsRelationConfig.class).eq(NewsRelationConfig::getNewsId, news.getId()));
 
@@ -146,7 +150,7 @@ public class NewsServiceImpl extends MPJBaseServiceImpl<NewsMapper, News> implem
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public  boolean updateRelation(UpdateNewsRelationDto updateRelationDto) {
+    public boolean updateRelation(UpdateNewsRelationDto updateRelationDto) {
 
         if (updateRelationDto.getRelationList() != null) {
             for (NewsRelationConfigDto newsRelationConfigDto : updateRelationDto.getRelationList()) {
@@ -267,7 +271,7 @@ public class NewsServiceImpl extends MPJBaseServiceImpl<NewsMapper, News> implem
                         WeChatSendMessageDto weChatSendMessageDto = new WeChatSendMessageDto();
                         weChatSendMessageDto.setUserId(user.getOpenId());
                         weChatSendMessageDto.setTemplateId("qmpXORPM1Cocqn503Qa4OkNNQ0uxlj2-ed9m6uWO-v4");
-                        weChatSendMessageDto.setUrl("/pages/message/notice/detail?id=" + id);
+                        weChatSendMessageDto.setUrl(StrUtil.format("{}/pages/message/notice/detail?id={}", commonPropertiesConfig.getDomainApp(), id));
                         weChatSendMessageDto.setMsgId(id.toString());
                         JSONObject data = new JSONObject();
 
@@ -299,7 +303,7 @@ public class NewsServiceImpl extends MPJBaseServiceImpl<NewsMapper, News> implem
                         WeChatSendMessageDto weChatSendMessageDto = new WeChatSendMessageDto();
                         weChatSendMessageDto.setUserId(newsRelationVo.getUserName());
                         weChatSendMessageDto.setTemplateId("sHsmz7LRj7HLd7GSTS3r2uKMhE2f1iDAW15RqSK_6KM");
-                        weChatSendMessageDto.setUrl("/pages/message/notice/detail?id=" + id);
+                        weChatSendMessageDto.setUrl(StrUtil.format("{}/pages/message/notice/detail?id={}", commonPropertiesConfig.getDomainApp(), id));
                         weChatSendMessageDto.setMsgId(id.toString());
                         JSONObject data = new JSONObject();
 
@@ -319,8 +323,8 @@ public class NewsServiceImpl extends MPJBaseServiceImpl<NewsMapper, News> implem
                     }
                 }
             }
+        } catch (Exception ex) {
         }
-        catch(Exception ex) {}
 
         return true;
     }

src/main/java/com/xjrsoft/module/oa/utils/SendMessageUtil.java

@@ -113,10 +113,11 @@ public class SendMessageUtil {
                 JSONObject object = new JSONObject();
                 object.put("touser", openId);
                 object.put("template_id", "sHsmz7LRj7HLd7GSTS3r2jCLvK-4Wp19iGzEvYK8n_I");
-                object.put("miniprogram", new JSONObject() {{
-                    put("appid", weChatUtil.getAppletAppKey());
-                    put("pagepath", StrUtil.format("{}/xjrsoft/pages/workflow/approval?taskId={}&processId={}&type=todo",cpConfig.getDomainApp(), param.getTaskId(), param.getProcessId()));
-                }});
+//                object.put("miniprogram", new JSONObject() {{
+//                    put("appid", weChatUtil.getAppletAppKey());
+//                    put("pagepath", StrUtil.format("{}/xjrsoft/pages/workflow/approval?taskId={}&processId={}&type=todo",cpConfig.getDomainApp(), param.getTaskId(), param.getProcessId()));
+//                }});
+                object.put("url", StrUtil.format("{}/xjrsoft/pages/workflow/approval?taskId={}&processId={}&type=todo",cpConfig.getDomainApp(), param.getTaskId(), param.getProcessId()));
                 object.put("client_msg_id", param.getTaskId());
                 object.put("data", data);
                 weChatUtil.sendTemplateMessage(object);

src/main/java/com/xjrsoft/module/organization/service/impl/WeChatServiceImgl.java

@@ -48,10 +48,11 @@ public class WeChatServiceImgl implements IWeChatService {
         JSONObject object = new JSONObject();
         object.put("touser", dto.getUserId());
         object.put("template_id", dto.getTemplateId());
-        object.put("miniprogram", new JSONObject() {{
-            put("appid", weChatUtil.getAppletAppKey());
-            put("pagepath", dto.getUrl());
-        }});
+//        object.put("miniprogram", new JSONObject() {{
+//            put("appid", weChatUtil.getAppletAppKey());
+//            put("pagepath", dto.getUrl());
+//        }});
+        object.put("url", dto.getUrl());
         object.put("client_msg_id", dto.getMsgId());
         object.put("data", dto.getContent());
         weChatUtil.sendTemplateMessage(object);

src/main/java/com/xjrsoft/module/workflow/service/impl/WorkflowExecuteServiceImpl.java

@@ -56,6 +56,7 @@ import com.xjrsoft.module.workflow.utils.WorkFlowUtil;
 import com.xjrsoft.module.workflow.vo.*;
 import lombok.AllArgsConstructor;
 import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.tuple.ImmutableTriple;
 import org.apache.commons.lang3.tuple.Triple;
 import org.camunda.bpm.engine.HistoryService;
@@ -91,6 +92,7 @@ import java.util.stream.Collectors;
  * @Author: tzx
  * @Date: 2022/9/8 14:25
  */
+@Slf4j
 @Service
 @AllArgsConstructor
 public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
@@ -1171,6 +1173,7 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
 
                 relations.add(formRelation);
             } catch (Exception e) {
+                log.error("提交表单数据失败（newLaunch）:",e);
                 for (Session session : sessionList) {
                     session.quietRollback();
                 }
@@ -1331,6 +1334,7 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
 
                 relations.add(formRelation);
             } catch (Exception e) {
+                log.error("提交表单数据失败（reLaunch）:",e);
                 for (Session session : sessionList) {
                     session.quietRollback();
                 }