Merge branch 'feat-1002297' into 'master'

zhengyong 1002297推出时间点功能

See merge request rays/pcloud-book!384

pcloud-facade-book/src/main/java/com/pcloud/book/timecontrol/dto/CreateTaskItemDto.java

@@ -35,4 +35,9 @@ public class CreateTaskItemDto implements Serializable {
 
     List<CreateReplyMessageDto> completedReplyMessageList;
 
+    private Integer addSendTime;
+
+    @NotNull(message = "发送时间设置不能为空")
+    private String sendHour;
+
 }

pcloud-facade-book/src/main/java/com/pcloud/book/timecontrol/dto/TaskItemDto.java

@@ -39,4 +39,9 @@ public class TaskItemDto implements Serializable {
 
     List<ReplyMessageDto> completedReplyMessageList;
 
+    private Integer addSendTime;
+
+    private String sendHour;
+
+
 }

pcloud-facade-book/src/main/java/com/pcloud/book/timecontrol/dto/UpdateTaskItemDto.java

@@ -36,4 +36,9 @@ public class UpdateTaskItemDto implements Serializable {
 
     List<CreateReplyMessageDto> completedReplyMessageList;
 
+    private Integer addSendTime;
+
+    @NotNull(message = "发送时间设置不能为空")
+    private String sendHour;
+
 }

pcloud-facade-book/src/main/java/com/pcloud/book/timecontrol/service/TimeControlTaskService.java

@@ -22,7 +22,7 @@ import java.util.Map;
  * @Date：2020-01-30
  * @Version：1.0
  */
-@FeignClient(value = "pcloud-service-wechatgroup", qualifier = "timeControlTaskServiceCloud", path = "/wechatgroup/v1.0/timeControlTaskService")
+@FeignClient(value = "pcloud-service-book", qualifier = "timeControlTaskServiceCloud", path = "/book/v1.0/timeControlTaskService")
 @Api(description = "时间管理内部接口")
 public interface TimeControlTaskService {
 

pcloud-service-book/src/main/java/com/pcloud/book/timecontrol/biz/impl/TaskBizImpl.java

@@ -192,6 +192,9 @@ public class TaskBizImpl implements TaskBiz {
         if(null==item.getTdConfirm()){
             item.setTdConfirm(0);
         }
+        if(null==item.getAddSendTime()){
+            item.setAddSendTime(0);
+        }
         taskItemMapper.insert(item);
         Integer taskItemId = item.getId();
         List<TimeControlReplyMessage> list = new ArrayList<>();
@@ -276,6 +279,9 @@ public class TaskBizImpl implements TaskBiz {
         if(null==item.getTdConfirm()){
             item.setTdConfirm(0);
         }
+        if(null==item.getAddSendTime()){
+            item.setAddSendTime(0);
+        }
         taskItemMapper.updateTtaskItem(timeControlTaskItem);
         //删除原item下的配置
         replyMessageMapper.deleteByItemId(taskItemId);

pcloud-service-book/src/main/java/com/pcloud/book/timecontrol/biz/impl/TaskSubscribeBizImpl.java

@@ -378,6 +378,18 @@ public class TaskSubscribeBizImpl implements TaskSubscribeBiz {
                     }
                 }
             }
+            if(YesOrNoEnums.YES.getValue().equals(timeControlTaskItem.getAddSendTime())){
+                //封装退订提醒
+                SendTextMessageVO sendTextMessageVO = new SendTextMessageVO();
+                sendTextMessageVO.setCode(SendMessageTypeEnum.SELF.getCode());
+                sendTextMessageVO.setWxId(robotWxId);
+                sendTextMessageVO.setAltId(robotWxId);
+                sendTextMessageVO.setWxGroupId(wxUserId);
+                sendTextMessageVO.setIp(ip);
+                String content = "消息发送时间(" + DateUtils.formatDate(new Date())+")";
+                sendTextMessageVO.setContent(content);
+                WxGroupSDK.sendTextMessage(sendTextMessageVO);
+            }
             if (YesOrNoEnums.YES.getValue().equals(timeControlTaskItem.getFinishConfirm()) || YesOrNoEnums.YES.getValue().equals(timeControlTaskItem.getTdConfirm())){
                 //封装退订提醒
                 SendTextMessageVO sendTextMessageVO = new SendTextMessageVO();
@@ -423,6 +435,8 @@ public class TaskSubscribeBizImpl implements TaskSubscribeBiz {
         }
     }
 
+
+
     /**
      * 补充退订提示信息
      *

pcloud-service-book/src/main/java/com/pcloud/book/timecontrol/entity/TimeControlTaskItem.java

@@ -23,6 +23,26 @@ public class TimeControlTaskItem {
 
     private String finishLinkUrl;
 
+    private Integer addSendTime;
+
+    private String sendHour;
+
+    public Integer getAddSendTime() {
+        return addSendTime;
+    }
+
+    public void setAddSendTime(Integer addSendTime) {
+        this.addSendTime = addSendTime;
+    }
+
+    public String getSendHour() {
+        return sendHour;
+    }
+
+    public void setSendHour(String sendHour) {
+        this.sendHour = sendHour;
+    }
+
     public Integer getTdConfirm() {
         return tdConfirm;
     }

pcloud-service-book/src/main/resources/mapper/timecontrol/TimeControlTaskItemMapper.xml

@@ -12,15 +12,19 @@
     <result column="td_confirm" property="tdConfirm" jdbcType="INTEGER" />
     <result column="finish_link_introduce" property="finishLinkIntroduce" jdbcType="VARCHAR" />
     <result column="finish_link_url" property="finishLinkUrl" jdbcType="VARCHAR" />
+    <result column="add_send_time" property="addSendTime" jdbcType="INTEGER" />
+    <result column="send_hour" property="sendHour" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
     id, task_id, start_day, finish_confirm, finish_key_word, create_time, update_time,td_confirm,finish_link_introduce,finish_link_url
+    ,add_send_time,send_hour
   </sql>
 
   <insert id="insert" parameterType="com.pcloud.book.timecontrol.entity.TimeControlTaskItem" useGeneratedKeys="true" keyProperty="id">
     insert into time_control_task_item(task_id, start_day, finish_confirm, finish_key_word, create_time, update_time
-    ,td_confirm,finish_link_introduce,finish_link_url)
-    values (#{taskId}, #{startDay}, #{finishConfirm}, #{finishKeyWord}, now(), now(),#{tdConfirm},#{finishLinkIntroduce},#{finishLinkUrl})
+    ,td_confirm,finish_link_introduce,finish_link_url,add_send_time,send_hour)
+    values (#{taskId}, #{startDay}, #{finishConfirm}, #{finishKeyWord}, now(), now(),#{tdConfirm},#{finishLinkIntroduce},#{finishLinkUrl}
+    ,#{addSendTime},#{sendHour})
   </insert>
 
   <update id="updateTtaskItem" parameterType="com.pcloud.book.timecontrol.entity.TimeControlTaskItem">
@@ -32,6 +36,8 @@
    <if test="finishLinkUrl">
      finish_link_url=#{finishLinkUrl},
    </if>
+    add_send_time=#{addSendTime},
+    send_hour=#{sendHour},
     update_time = now()
     where id = #{id}
   </update>

pcloud-service-book/src/main/resources/mapper/timecontrol/TimeControlTaskSendMapper.xml

@@ -39,8 +39,9 @@
     a.task_item_id taskItemId
     from time_control_task_send a
     left join time_control_task_subscribe b on a.subscribe_id = b.id
+    LEFT JOIN time_control_task_item c on a.task_item_id=c.id
     where a.send_state = 0
-    and a.send_day = DATE_FORMAT(NOW(), '%Y-%m-%d')
+    and CONCAT_WS(" ",a.send_day,SUBSTRING_INDEX(c.send_hour,":",1))  = DATE_FORMAT(NOW(), '%Y-%m-%d %H');
   </select>