代码提交

liusheng

7 天以前 bd6c66c1a161e9f0fe94b94bed7935b2bde541f2

代码提交

 ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java

@@ -93,6 +93,9 @@
    @Value("${visitHosp}")
    private Integer visitHosp;

    @Value("${server.port}")
    private String port;

    // åˆ›å»ºå›ºå®šå¤§å°çš„线程池
    private static final ExecutorService executorService = Executors.newFixedThreadPool(10);

@@ -107,7 +110,7 @@
        log.error("本机的网络IP为:{}", ip);
        String content = message.toString();
        //判断是不是任务信息，如果不是，直接返回，不需要执行
        if (!content.contains("taskid")) {
        if (!content.contains("taskid") || !port.equals("8095")) {
            log.error("不是任务信息");
            return;
        }
@@ -407,7 +410,7 @@
                            }
                            if (s.equals("true")) {
                                //在子任务表里记录一下
                                log.error("serviceSubtask保存成功了吗？：{}",s);
                                log.error("serviceSubtask保存成功了吗？：{}", s);
                                String uuid = UUID.randomUUID().toString();
                                serviceSubtask.setResult("success");
                                serviceSubtask.setRemark("短信发送成功");
@@ -427,7 +430,7 @@
                                serviceSubtaskRecord.setResult("success");
                                serviceSubtaskRecord.setRemark("短信发送成功");
                                serviceSubtaskRecordService.insertServiceSubtaskRecord(serviceSubtaskRecord);
                                log.error("serviceSubtaskRecord保存成功了吗？：{}",serviceSubtaskRecord);
                                log.error("serviceSubtaskRecord保存成功了吗？：{}", serviceSubtaskRecord);
                            }
                        } catch (Exception e) {
                            ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java

@@ -9,6 +9,7 @@
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.enums.PreachFormEnum;
import com.ruoyi.common.utils.DtoConversionUtils;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -83,6 +84,36 @@
//        return getDataTable(serviceSubtaskService.patItem(ivrTaskcall));
    }


    /**
     * å¯¼å‡ºå•ä¸€ä»»åŠ¡ï¼ˆéšè®¿å®£æ•™ï¼‰åˆ—表
     */
    //@PreAuthorize("@ss.hasPermi('system:taskcall:export')")
    @Log(title = "单一任务（随访宣教）", businessType = BusinessType.EXPORT)
    @PostMapping("/patItemExport")
    public void patItemExport(HttpServletResponse response, @RequestBody ServiceSubtaskVO serviceSubtaskVO) {
        List<ServiceSubtask> serviceSubtaskList = null;
        if (serviceSubtaskVO != null) {
            if (serviceSubtaskVO.getPageNum() != null && serviceSubtaskVO.getPageSize() != null)
                PageUtils.startPageByPost(serviceSubtaskVO.getPageNum(), serviceSubtaskVO.getPageSize());
            serviceSubtaskList = serviceSubtaskService.patItem(serviceSubtaskVO);
        }
        List<ServiceSubtaskExprot> serviceSubtaskExprots = null;
        if (!CollectionUtils.isEmpty(serviceSubtaskList)) {
            serviceSubtaskExprots = DtoConversionUtils.sourceToTarget(serviceSubtaskList, ServiceSubtaskExprot.class);
            for (ServiceSubtaskExprot serviceSubtaskExprot : serviceSubtaskExprots) {
                String pf = PreachFormEnum.getDescByCode(serviceSubtaskExprot.getPreachform());
                serviceSubtaskExprot.setPreachform(pf);
            }

        }


        ExcelUtil<ServiceSubtaskExprot> util = new ExcelUtil<ServiceSubtaskExprot>(ServiceSubtaskExprot.class);
        util.exportExcel(response, serviceSubtaskExprots, "患者随访信息表单");
    }


    /**
     * æŸ¥è¯¢æ‚£è€…随访信息
     */

 ruoyi-common/src/main/java/com/ruoyi/common/enums/PreachFormEnum.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,54 @@
package com.ruoyi.common.enums;

/**
 * å‘送类型枚举
 */
public enum PreachFormEnum {
    rg("1", "人工"),
    zz("2", "纸质"),
    dh("3", "电话"),
    dx("4", "短信"),
    wxgzh("5", "微信公众号"),
    wxxch("6", "微信小程序"),
    zfbxch("7", "支付宝小程序"),
    znjqr("8", "智能机器人"),
    dd("8", "钉钉"),
    dr("8", "导入");


    private String code;
    private String desc;

    PreachFormEnum(String code, String desc) {
        this.code = code;
        this.desc = desc;
    }

    public static String getDescByCode(String code) {
        PreachFormEnum[] organEnums = values();
        for (int i = 0; i < organEnums.length; i++) {
            PreachFormEnum organEnum = organEnums[i];
            if (organEnum.getCode().equals(code)) {
                return organEnum.getDesc();
            }
        }
        return null;
    }


    public String getCode() {
        return code;
    }

    public void setCode(String code) {
        this.code = code;
    }

    public String getDesc() {
        return desc;
    }

    public void setDesc(String desc) {
        this.desc = desc;
    }
}

 ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java

@@ -610,6 +610,7 @@
                                if ((Boolean) map.get("succ") == true) {
                                    serviceSubtask.setResult("success");
                                } else {
                                    log.error("serviceSubtask1231313的值为：{}",serviceSubtask);
                                    serviceSubtask.setResult("error");
                                    serviceSubtask.setSendstate(5L);
                                    serviceSubtask.setRemark(map.get("msg").toString());

 smartor/src/main/java/com/smartor/domain/ServiceSubtask.java

@@ -234,28 +234,28 @@
    /**
     * å‘送状态
     */
    @Excel(name = " å‘送状态 1 è¢«é¢†å–(在任务中是新建，在服务中是被领取)  2 å¾…发送  3 å·²å‘送  4 ä¸æ‰§è¡Œ  5 å‘送失败 6 å·²å®Œæˆ\") ")
//    @Excel(name = " å‘送状态 1 è¢«é¢†å–(在任务中是新建，在服务中是被领取)  2 å¾…发送  3 å·²å‘送  4 ä¸æ‰§è¡Œ  5 å‘送失败 6 å·²å®Œæˆ\") ")
    @ApiModelProperty(value = "发送状态 1 è¢«é¢†å–(在任务中是新建，在服务中是被领取)  2 å¾…发送  3 å·²å‘送  4 ä¸æ‰§è¡Œ  5 å‘送失败 6 å·²å®Œæˆ")
    private Long sendstate;

    /**
     * æš‚停状 ï¼š çŠ¶æ€å¦‚果发生修改，值就加1
     */
    @Excel(name = " æš‚停状 ï¼š çŠ¶æ€å¦‚果发生修改，值就加1 ")
//    @Excel(name = " æš‚停状 ï¼š çŠ¶æ€å¦‚果发生修改，值就加1 ")
    @ApiModelProperty(value = "暂停状 ï¼š çŠ¶æ€å¦‚果发生修改，值就加1")
    private Long stopState;

    /**
     * å‘送UUID
     */
    @Excel(name = " å‘送UUID ")
//    @Excel(name = " å‘送UUID ")
    @ApiModelProperty(value = "发送UUID")
    private String senduuid;

    /**
     * ç»“æžœ
     */
    @Excel(name = " ç»“æžœ ")
//    @Excel(name = " ç»“æžœ ")
    @ApiModelProperty(value = "结果")
    private String result;


 smartor/src/main/java/com/smartor/domain/ServiceSubtaskExprot.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,132 @@
package com.smartor.domain;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;
import java.util.List;
import java.util.Map;

/**
 * å•ä¸€ä»»åŠ¡ï¼ˆéšè®¿ï¼‰å¯¹è±¡ ivr_taskcall
 *
 * @author ruoyi
 * @date 2024-02-02
 */
@ApiModel(value = "ServiceSubtaskExprot", description = "单一随访任务入参")
@Data
public class ServiceSubtaskExprot extends BaseEntity {
    private static final long serialVersionUID = 1L;

    /**
     * ä»»åŠ¡åç§°
     */
    @Excel(name = "任务名称")
    @ApiModelProperty(value = "任务名称")
    private String taskName;

    /**
     * å‘送人
     */
    @Excel(name = " å‘送人 ")
    @ApiModelProperty(value = "发送人")
    private String sendname;

    /**
     * åˆ›å»ºè€…
     */
    @Excel(name = "随访人")
    private String updateBy;

    /**
     * å®Œæˆæ—¶é—´
     */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = " å®Œæˆæ—¶é—´ ", width = 30, dateFormat = "yyyy-MM-dd")
    @ApiModelProperty(value = "完成时间")
    private Date finishtime;

    /**
     * å‡ºé™¢æ—¶é—´
     */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = " å‡ºé™¢æ—¶é—´ ", width = 30, dateFormat = "yyyy-MM-dd")
    @ApiModelProperty(value = "出院时间")
    private Date endtime;


    /**
     * åŒ»ç”Ÿå§“名
     */
    @Excel(name = "主治医生")
    @ApiModelProperty(value = "医生姓名")
    private String drname;


    /**
     * èº«ä»½è¯å·
     */
    @Excel(name = " èº«ä»½è¯å· ")
    @ApiModelProperty(value = "身份证号")
    private String sfzh;


    /**
     * æ‰‹æœºå·
     */
    @Excel(name = "联系电话")
    @ApiModelProperty(value = "手机号")
    private String phone;

    /**
     * è´£ä»»æŠ¤å£«å§“名
     */
    @Excel(name = "责任护士")
    @ApiModelProperty("责任护士姓名")
    private String nurseName;


    /**
     * ç§‘室名称
     */
    @Excel(name = "科室名称")
    @ApiModelProperty(value = "科室名称")
    private String deptname;


    /**
     * å‡ºé™¢ç—…区名称
     */
    @ApiModelProperty(value = "出院病区名称")
    @Excel(name = " å‡ºé™¢ç—…区名称 ")
    private String leavehospitaldistrictname;


    /**
     * æ¨¡æ¿å
     */
    @Excel(name = "出院随访模板名称")
    @ApiModelProperty(value = "模板名")
    private String templatename;


    /**
     * å®£æ•™å½¢å¼ :文本、图片、语音、视频、混合
     */
    @Excel(name = "任务执行方式")
    @ApiModelProperty(value = "任务形式(1,人工 2,纸质  3,电话  4,短信  5.微信公众号 6.微信小程序 7.支付宝小程序  8.智能机器人  9.钉钉   10.导入)")
    private String preachform;


    /**
     * å¤‡æ³¨
     */
    @ApiModelProperty(value = "备注")
    private String remark;


}

 smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java

@@ -687,6 +687,7 @@
        serviceSubtask.setLongSendTime(newDate);
        //患者发送时间
        if (StringUtils.isNotEmpty(patArchive.getNotrequiredFlag()) && patArchive.getNotrequiredFlag().equals("1")) {
            log.error("serviceSubtask99999999的值为：{}",serviceSubtask);
            String remark = patArchive.getNotrequiredreason();
            serviceSubtask.setRemark(remark);
            serviceSubtask.setResult("error");

 smartor/src/main/java/com/smartor/service/impl/PatMedOperationServiceImpl.java

@@ -227,6 +227,7 @@
            serviceSubtask.setRemark(remark);
            serviceSubtask.setResult("error");
            serviceSubtask.setFinishtime(new Date());
            log.error("serviceSubtask888888的值为：{}",serviceSubtask);
            //不执行
            serviceSubtask.setSendstate(4L);
        }

 smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java

@@ -382,7 +382,7 @@
    private Map<String, Object> getMap(Map<String, Object> scriptInfoByCondition, Long subid, Long patid) {
        Map<String, Object> map = new HashMap<>();
        if (ObjectUtils.isNotEmpty(scriptInfoByCondition) && ObjectUtils.isNotEmpty(scriptInfoByCondition.get("script"))) {
            log.error("-----------scriptInfoByCondition的值为：{}", scriptInfoByCondition);
//            log.error("-----------scriptInfoByCondition的值为：{}", scriptInfoByCondition);
            if (scriptInfoByCondition.get("type").equals("1")) {
                List<IvrLibaTemplateScriptVO> ivrLibaTemplateScriptVOList = (List) scriptInfoByCondition.get("script");
                for (IvrLibaTemplateScriptVO ivrLibaTemplateScriptVO : ivrLibaTemplateScriptVOList) {