2baa05224b72fbae849678e338bbc85506a9cfe6..b17665b2645701d6eea22ab9d4662b76c97dd6e3
5 天以前 liusheng
代码提交
b17665 对比 | 目录
5 天以前 liusheng
代码提交
c7ef5f 对比 | 目录
已修改5个文件
63 ■■■■ 文件已修改
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceExternalController.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-common/src/main/java/com/ruoyi/common/enums/MsgLSEnum.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/domain/ServiceTaskVO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java 42 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceExternalController.java
@@ -5,6 +5,7 @@
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.DtoConversionUtils;
import com.ruoyi.system.service.ISysConfigService;
import com.smartor.domain.*;
import com.smartor.service.IServiceExternalService;
import com.smartor.service.IServiceSubtaskDetailService;
@@ -37,6 +38,8 @@
    private IServiceExternalService serviceExternalService;
    @Autowired
    private ISvyTaskSingleService svyTaskSingleService;
    @Autowired
    private ISysConfigService configService;
    /**
     * 通用接口
@@ -83,6 +86,10 @@
        log.info("------serviceQueryInfo的入参为:{}", serviceQueryInfo);
        Map map = null;
        try {
            String url = configService.selectConfigByKey("token.360",serviceQueryInfo.getXiaoXiTou().getFaSongJGID());
            serviceQueryInfo.setUrl(url);
            String url360 = configService.selectConfigByKey("url.360",serviceQueryInfo.getXiaoXiTou().getFaSongJGID());
            serviceQueryInfo.setUrl360(url360);
            map = svyTaskSingleService.query360PatInfo(serviceQueryInfo);
        } catch (Exception e) {
            e.printStackTrace();
ruoyi-common/src/main/java/com/ruoyi/common/enums/MsgLSEnum.java
@@ -1,9 +1,7 @@
package com.ruoyi.common.enums;
import com.ruoyi.common.utils.uuid.IdUtils;
import com.sun.org.apache.bcel.internal.generic.NEW;
import javax.xml.crypto.Data;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -678,7 +678,15 @@
                        setSuccessPreachForm(serviceSubtask, sendPreachform, "【公众号】公众号发送失败,his系统的患者id为空", "5");
                        return;
                    }
                    String wxCode = getWXCode(serviceSubtask.getSfzh(), url, serviceSubtask.getTaskName(), serviceSubtask.getTaskDesc(), patArchive.getTelcode(), serviceSubtask.getSendname(), patArchive.getPatidHis(), wxqqxx);
                    String wxCode = "";
                    if (visitHosp == 3) {//市一医院
                        String urlTemp = "http://192.200.54.14:5003/sfjk/SendMessage?sfzh=" + serviceSubtask.getSfzh()
                                + "&title=您好,邀请您填写出院调查表,请点击填写。&content=您好,邀请您填写出院调查表,请点击填写。&phone=" + patArchive.getTelcode()
                                + "&url=" + url + "&key=ff76f8904f5f32b5ee1739e8ea46e60g";
                        HttpUtils.sendGet(urlTemp);
                    } else {
                        wxCode = getWXCode(serviceSubtask.getSfzh(), url, serviceSubtask.getTaskName(), serviceSubtask.getTaskDesc(), patArchive.getTelcode(), serviceSubtask.getSendname(), patArchive.getPatidHis(), wxqqxx);
                    }
                    Map<String, Object> map = JSONObject.parseObject(wxCode, Map.class);
                    //任务发送记录
smartor/src/main/java/com/smartor/domain/ServiceTaskVO.java
@@ -140,7 +140,7 @@
     */
    @Excel(name = "  任务形式 1,人工   2,纸质  3,电话  4,短信  5.微信公众号 6.微信小程序  7.支付宝  8.智能小程序  9.钉钉 ")
    @ApiModelProperty(value = " 任务形式 1,人工   2,纸质  3,电话  4,短信  5.微信公众号 6.微信小程序  7.支付宝  8.智能小程序  9.钉钉 ")
    private List<ServiceSubtaskPreachform> preachformList;
    private List<Map<String, Object>> preachformList;
    /**
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -174,7 +174,20 @@
        ServiceTask serviceTask = serviceTaskService.selectServiceTaskByTaskid(serviceSubtask.getTaskid());
        if (CollectionUtils.isEmpty(list) || list.size() == 0) {
            return DtoConversionUtils.sourceToTarget(serviceTask, ServiceTaskVO.class);
            ServiceTaskVO serviceTaskVO = DtoConversionUtils.sourceToTarget(serviceTask, ServiceTaskVO.class);
            ObjectMapper objectMapper = new ObjectMapper();
            try {
                List<Map<String, Object>> mapList = objectMapper.readValue(serviceTask.getPreachform(), List.class);
                serviceTaskVO.setPreachformList(mapList);
                String result = mapList.stream().map(mapList1 -> mapList1.get("preachform")).map(String::valueOf).collect(Collectors.joining(","));
                serviceTaskVO.setPreachform(result);
            } catch (JsonProcessingException e) {
                e.printStackTrace();
            }
            return serviceTaskVO;
        }
        //将查出来的数据倒入ServiceSubtaskVO中
@@ -262,8 +275,17 @@
            serviceSubtaskPreachform.setTaskid(serviceTask.getTaskid());
            serviceSubtaskPreachform.setSubid(serviceSubtask1.getId());
            List<ServiceSubtaskPreachform> serviceSubtaskPreachformList = serviceSubtaskPreachformMapper.selectServiceSubtaskPreachformList(serviceSubtaskPreachform);
            serviceTaskVO.setPreachformList(serviceSubtaskPreachformList);
            List<Map<String, Object>> resultList = serviceSubtaskPreachformList.stream().map(item -> {
                Map<String, Object> map = new HashMap<>();
                map.put("sort", item.getSort());
                map.put("preachform", item.getPreachform());
                map.put("compensateTime", item.getCompensateTime());
                return map;
            }).collect(Collectors.toList());
            serviceTaskVO.setPreachformList(resultList);
            String result = resultList.stream().map(mapList1 -> mapList1.get("preachform")).map(String::valueOf).collect(Collectors.joining(","));
            serviceTaskVO.setPreachform(result);
        }
        serviceTaskVO.setPatTaskRelevances(patTaskRelevances);
@@ -594,8 +616,12 @@
                    //需要按service_task里的preachform的顺序将发送方式保存到service_subtask_preachform表中
                    if (StringUtils.isNotEmpty(serviceTaskVO.getPreachformList())) {
                        List<ServiceSubtaskPreachform> pfList = serviceTaskVO.getPreachformList();
                        for (ServiceSubtaskPreachform serviceSubtaskPreachform : pfList) {
                        List<Map<String, Object>> pfList = serviceTaskVO.getPreachformList();
                        for (Map<String, Object> map : pfList) {
                            ServiceSubtaskPreachform serviceSubtaskPreachform = new ServiceSubtaskPreachform();
                            serviceSubtaskPreachform.setSort(ObjectUtils.isEmpty(map.get("sort")) ? 0 : Long.valueOf(map.get("sort").toString()));
                            serviceSubtaskPreachform.setPreachform(ObjectUtils.isEmpty(map.get("preachform")) ? "" : map.get("preachform").toString());
                            serviceSubtaskPreachform.setCompensateTime(ObjectUtils.isEmpty(map.get("compensateTime")) ? "" : map.get("preachcompensateTimeform").toString());
                            serviceSubtaskPreachform.setTaskid(serviceTask.getTaskid());
                            serviceSubtaskPreachform.setSubid(serviceSubtask.getId());
                            //这个sendstate需要在数据库设置一个默认值为“1”
@@ -818,8 +844,12 @@
                ServiceSubtask serviceSubtask = ssTaskList.get(i);
                serviceSubtaskPreachformMapper.deleteServiceSubtaskPreachformBySubid(serviceSubtask.getId());
                if (StringUtils.isNotEmpty(serviceTaskVO.getPreachformList())) {
                    List<ServiceSubtaskPreachform> pfList = serviceTaskVO.getPreachformList();
                    for (ServiceSubtaskPreachform serviceSubtaskPreachform : pfList) {
                    List<Map<String, Object>> pfList = serviceTaskVO.getPreachformList();
                    for (Map<String, Object> map : pfList) {
                        ServiceSubtaskPreachform serviceSubtaskPreachform = new ServiceSubtaskPreachform();
                        serviceSubtaskPreachform.setSort(ObjectUtils.isEmpty(map.get("sort")) ? 0 : Long.valueOf(map.get("sort").toString()));
                        serviceSubtaskPreachform.setPreachform(ObjectUtils.isEmpty(map.get("preachform")) ? "" : map.get("preachform").toString());
                        serviceSubtaskPreachform.setCompensateTime(ObjectUtils.isEmpty(map.get("compensateTime")) ? "" : map.get("preachcompensateTimeform").toString());
                        serviceSubtaskPreachform.setTaskid(serviceTask.getTaskid());
                        serviceSubtaskPreachform.setSubid(serviceSubtask.getId());
                        //这个sendstate需要在数据库设置一个默认值为“1”