zhongrj
2023-06-29 374551edb483cb44c788995ce90d8c4ecc349e30
外呼填报时间调整
2 files modified
1 files added
84 ■■■■■ changed files
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/message/entity/MessageRecord.java 78 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/constant/MinConstant.java 4 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsServiceImpl.java 2 ●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/message/entity/MessageRecord.java
New file
@@ -0,0 +1,78 @@
package cn.gistack.sm.message.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
 * 消息记录实体
 * @author zhongrj
 * @date 2023-06-16
 */
@Data
@TableName("sm_message_record")
public class MessageRecord implements Serializable {
    /**
     * 主键id
     */
    @TableId(value = "id", type = IdType.ASSIGN_ID)
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;
    /**
     * 主题
     */
    private String theme;
    /**
     * 消息发送人
     */
    private String sender;
    /**
     * 消息内容
     */
    private String recipient;
    /**
     * 消息内容
     */
    private String content;
    /**
     * 状态  已读,未读
     */
    private Integer status;
    /**
     * 来源
     */
    private String source;
    /**
     * 创建人
     */
    private String createUser;
    /**
     * 创建时间
     */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date createTime;
    /**
     * 更新时间
     */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date updateTime;
}
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/constant/MinConstant.java
@@ -23,7 +23,7 @@
    public static final String fill_info_prefix = "blade:alerts:fill:info:";
    /**
     * 已发短息人员redis 过期时间(秒),暂定3小时
     * 已发短息人员redis 过期时间(秒),暂定24小时
     */
    public static final Long is_send_time = 3 * 60 * 60L;
    public static final Long is_send_time = 24 * 60 * 60L;
}
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsServiceImpl.java
@@ -502,7 +502,7 @@
        boolean flag = false;
        List<Map<String, Object>> list = new ArrayList<>();
        // 通过手机号查询外呼任务id
        String taskId = bladeRedis.get(MinConstant.fill_info_prefix + callId);
        String taskId = bladeRedis.get(MinConstant.is_send_prefix + callId);
        // 判断
        if (null!=taskId && !taskId.equals("")){
            List<String> taskIdList = new ArrayList<>();