唤醒

pcloud-facade-book/src/main/java/com/pcloud/book/guide/vo/RobotWakeUpConfigVO.java

@@ -12,6 +12,9 @@ import java.util.List;
 @ApiModel(description = "机器人唤醒配置")
 public class RobotWakeUpConfigVO {
 
+    @ApiModelProperty("唤醒id")
+    private Integer wakeUpId;
+
     @ApiModelProperty("开始时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date startTime;

pcloud-facade-book/src/main/java/com/pcloud/book/guide/vo/RobotWakeUpMsgVO.java

@@ -13,6 +13,9 @@ public class RobotWakeUpMsgVO {
     @ApiModelProperty("消息类型 text image file")
     private Integer replyType;
 
+    @ApiModelProperty("消息类型 text image file")
+    private String type;
+
     @ApiModelProperty("文本内容")
     private String content;
 
@@ -22,6 +25,9 @@ public class RobotWakeUpMsgVO {
     @ApiModelProperty("文件地址")
     private String fileUrl;
 
+    @ApiModelProperty("文件地址")
+    private String fileName;
+
     @ApiModelProperty("排序值")
     private Integer seqNum;
 

pcloud-facade-book/src/main/java/com/pcloud/book/guide/vo/RobotWakeUpShowVO.java

 package com.pcloud.book.guide.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.pcloud.book.pcloudKeyword.dto.RobotClassifyDTO;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -12,6 +14,10 @@ import java.util.List;
 @Data
 public class RobotWakeUpShowVO {
 
+    @ApiModelProperty("唤醒id")
+    private Integer wakeUpId;
+
+
     @ApiModelProperty("开始时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date startTime;
@@ -28,5 +34,7 @@ public class RobotWakeUpShowVO {
     @ApiModelProperty("回复消息列表")
     private List<RobotWakeUpMsgVO> msgList;
 
+    @ApiModelProperty("机器人分类列表")
+    private List<RobotClassifyDTO> classifyDTOList;
 }
 

pcloud-service-book/src/main/java/com/pcloud/book/guide/biz/PcloudRobotWakeUpBiz.java

@@ -3,6 +3,7 @@ package com.pcloud.book.guide.biz;
 import com.pcloud.book.guide.vo.RobotWakeUpConfigVO;
 import com.pcloud.book.guide.vo.RobotWakeUpShowVO;
 import com.pcloud.book.pcloudkeyword.facade.response.PcloudRobotClassifyResponseVO;
+import com.pcloud.common.page.PageBeanNew;
 
 import java.util.List;
 
@@ -13,11 +14,19 @@ public interface PcloudRobotWakeUpBiz {
 
     void robotWakeUpRemove();
 
-    RobotWakeUpShowVO getRobotWakeUpConfig();
+    RobotWakeUpShowVO getRobotWakeUpConfig(Integer wakeUpId);
 
-    void doJob();
+    void doJob(Integer wakeUpId);
 
     List<PcloudRobotClassifyResponseVO> listAllClassify();
 
     void copyRobotWakeUp(String sourceWxId, String targetWxId);
+
+    void addrobotWakeUpConfig(RobotWakeUpConfigVO robotWakeUpConfigVO);
+
+    PageBeanNew<RobotWakeUpShowVO> getRobotWakeUpConfigList(Integer currentPage, Integer numPerPage);
+
+    void deleterobotWakeUp(Integer wakeUpid);
+
+    void updaterobotWakeUp(RobotWakeUpConfigVO robotWakeUpConfigVO);
 }

pcloud-service-book/src/main/java/com/pcloud/book/guide/dto/WakeUpInfoDto.java

@@ -8,4 +8,5 @@ import java.util.Date;
 public class WakeUpInfoDto {
     private String ip;
     private Date time;
+    private Integer wakeUpId;
 }

pcloud-service-book/src/main/java/com/pcloud/book/guide/entity/PcloudRobotWakeup.java

@@ -67,4 +67,7 @@ public class PcloudRobotWakeup {
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
+
+    public void deleteByWakeUpId(Integer wakeUpId) {
+    }
 }
\ No newline at end of file

pcloud-service-book/src/main/java/com/pcloud/book/guide/entity/PcloudRobotWakeupClassify.java

+package com.pcloud.book.guide.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.util.Date;
+
+import lombok.Data;
+
+@Data
+public class PcloudRobotWakeupClassify {
+    private Integer id;
+
+    private Integer wakeUpId;
+
+    private Integer robotClassifyId;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date updateTime;
+
+
+}
\ No newline at end of file

pcloud-service-book/src/main/java/com/pcloud/book/guide/entity/PcloudWakeupMessage.java

@@ -7,6 +7,8 @@ import java.util.Date;
 public class PcloudWakeupMessage {
     private Integer id;
 
+    private Integer wakeUpId;
+
     private String type;
 
     private String textContent;
@@ -25,6 +27,14 @@ public class PcloudWakeupMessage {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updateTime;
 
+    public Integer getWakeUpId() {
+        return wakeUpId;
+    }
+
+    public void setWakeUpId(Integer wakeUpId) {
+        this.wakeUpId = wakeUpId;
+    }
+
     public Integer getId() {
         return id;
     }

pcloud-service-book/src/main/java/com/pcloud/book/guide/facade/impl/PcloudRobotWakeUpFacadeImpl.java

@@ -7,9 +7,12 @@ import com.pcloud.book.guide.vo.RobotWakeUpShowVO;
 import com.pcloud.book.pcloudkeyword.biz.PcloudRobotClassifyBiz;
 import com.pcloud.book.pcloudkeyword.facade.response.PcloudRobotClassifyResponseVO;
 import com.pcloud.common.dto.ResponseDto;
+import com.pcloud.common.page.PageBeanNew;
 import com.pcloud.common.permission.PermissionException;
 import com.pcloud.common.utils.SessionUtil;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.models.auth.In;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -33,6 +36,7 @@ public class PcloudRobotWakeUpFacadeImpl {
         return new ResponseDto<>();
     }
 
+
     @ApiOperation(value = "解除机器人小号唤醒配置")
     @PostMapping("remove")
     ResponseDto<?> robotWakeUpClose(@RequestHeader String token) throws PermissionException {
@@ -42,10 +46,10 @@ public class PcloudRobotWakeUpFacadeImpl {
     }
 
     @ApiOperation(value = "获取机器人小号配置")
-    @GetMapping("get")
-    ResponseDto<?> getRobotWakeUpConfig(@RequestHeader String token) throws PermissionException {
+    @GetMapping("getRobotWakeUpConfig")
+    ResponseDto<?> getRobotWakeUpConfig(@RequestHeader String token,@RequestParam("wakeUpId") Integer wakeUpId) throws PermissionException {
         SessionUtil.getToken4Redis(token);
-        return new ResponseDto<>(pcloudRobotWakeUpBiz.getRobotWakeUpConfig());
+        return new ResponseDto<>(pcloudRobotWakeUpBiz.getRobotWakeUpConfig(wakeUpId));
     }
 
 
@@ -56,4 +60,39 @@ public class PcloudRobotWakeUpFacadeImpl {
         List<PcloudRobotClassifyResponseVO> classify = pcloudRobotWakeUpBiz.listAllClassify();
         return new ResponseDto<>(classify);
     }
+
+
+    @ApiOperation(value = "新增机器人小号唤醒配置")
+    @PostMapping("addrobotWakeUpConfig")
+    ResponseDto<?> addrobotWakeUpConfig(@RequestHeader String token, @RequestBody RobotWakeUpConfigVO robotWakeUpConfigVO) throws PermissionException {
+        SessionUtil.getToken4Redis(token);
+        pcloudRobotWakeUpBiz.addrobotWakeUpConfig(robotWakeUpConfigVO);
+        return new ResponseDto<>();
+    }
+
+
+    @ApiOperation(value = "获取机器人小号配置列表")
+    @GetMapping("getRobotWakeUpConfigList")
+    ResponseDto<PageBeanNew<RobotWakeUpShowVO>> getRobotWakeUpConfigList(@RequestHeader String token, @RequestParam("currentPage") Integer currentPage,
+                                                                     @RequestParam("numPerPage") Integer numPerPage) throws PermissionException {
+        SessionUtil.getToken4Redis(token);
+        return new ResponseDto<PageBeanNew<RobotWakeUpShowVO>>(pcloudRobotWakeUpBiz.getRobotWakeUpConfigList(currentPage,numPerPage));
+    }
+
+    @ApiOperation(value = "删除机器人小号唤醒配置")
+    @GetMapping("deleterobotWakeUp")
+    ResponseDto<?> deleterobotWakeUp(@RequestHeader String token,@RequestParam("wakeUpId") Integer wakeUpid) throws PermissionException {
+        SessionUtil.getToken4Redis(token);
+        pcloudRobotWakeUpBiz.deleterobotWakeUp(wakeUpid);
+        return new ResponseDto<>();
+    }
+
+    @ApiOperation(value = "更新机器人小号唤醒配置")
+    @PostMapping("updaterobotWakeUp")
+    ResponseDto<?> updaterobotWakeUp(@RequestHeader String token,@RequestBody RobotWakeUpConfigVO robotWakeUpConfigVO) throws PermissionException {
+        SessionUtil.getToken4Redis(token);
+        pcloudRobotWakeUpBiz.updaterobotWakeUp(robotWakeUpConfigVO);
+        return new ResponseDto<>();
+    }
+
 }

pcloud-service-book/src/main/java/com/pcloud/book/guide/mapper/PcloudRobotWakeupClassifyMapper.java

+package com.pcloud.book.guide.mapper;
+
+import com.pcloud.book.guide.entity.PcloudRobotWakeup;
+import com.pcloud.book.guide.entity.PcloudRobotWakeupClassify;
+import com.pcloud.book.pcloudKeyword.dto.RobotClassifyDTO;
+import com.pcloud.book.pcloudkeyword.facade.response.PcloudRobotClassifyResponseVO;
+
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public interface PcloudRobotWakeupClassifyMapper {
+
+
+    int insert(PcloudRobotWakeupClassify pcloudRobotWakeupClassify);
+
+    int batchInsert(List<PcloudRobotWakeupClassify> pcloudRobotWakeupClassifies);
+
+    void deleteAll();
+
+    List<RobotClassifyDTO> getRobotClassifyByWakeUpId(Integer wakeUpId);
+
+    void deleteByWakeUpId(Integer wakeUpId);
+}
\ No newline at end of file

pcloud-service-book/src/main/java/com/pcloud/book/guide/mapper/PcloudRobotWakeupMapper.java

@@ -3,6 +3,8 @@ package com.pcloud.book.guide.mapper;
 import com.pcloud.book.guide.entity.PcloudRobotWakeup;
 import com.pcloud.book.guide.vo.RobotWakeUpShowVO;
 import com.pcloud.book.pcloudkeyword.facade.response.PcloudRobotClassifyResponseVO;
+
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -28,4 +30,10 @@ public interface PcloudRobotWakeupMapper {
     List<String> listAllRobot();
 
     List<PcloudRobotClassifyResponseVO> listAllClassify();
+
+    Integer getRobotWakeUpConfigListCount();
+
+    List<RobotWakeUpShowVO> getRobotWakeUpConfigList(@Param("currentPage") Integer currentPage,@Param("numPerPage") Integer numPerPage);
+
+    RobotWakeUpShowVO getRobotWakeUpConfigById(Integer wakeUpId);
 }
\ No newline at end of file

pcloud-service-book/src/main/java/com/pcloud/book/guide/mapper/PcloudWakeupMessageMapper.java

@@ -28,4 +28,10 @@ public interface PcloudWakeupMessageMapper {
     List<Integer> getAllClassifyInfo();
 
     Integer countAll();
+
+    int batchInsert(List<PcloudWakeupMessage> pcloudWakeupMessages);
+
+    List<RobotWakeUpMsgVO> selectByWakeUpId(Integer wakeUpId);
+
+    void delectByWakeUpId(Integer wakeUpId);
 }
\ No newline at end of file

pcloud-service-book/src/main/java/com/pcloud/book/guide/service/PcloudRobotWakeUpServiceImpl.java

@@ -31,7 +31,8 @@ public class PcloudRobotWakeUpServiceImpl implements PcloudRobotWakeUpService {
     @PostMapping("/doJob")
     public void doJob(@RequestBody Map<String, Object> map)throws BizException {
         log.info("PcloudRobotWakeUpServiceImpl.doJob 开始执行定时任务");
-        pcloudRobotWakeUpBiz.doJob();
+        Integer wakeUpId = (Integer) map.get("wakeUpId");
+        pcloudRobotWakeUpBiz.doJob(wakeUpId);
     }
 
 
@@ -40,7 +41,8 @@ public class PcloudRobotWakeUpServiceImpl implements PcloudRobotWakeUpService {
     public ResponseDto<?> hset(@RequestParam("wxid") String wxid,
                                @RequestParam("robotId")  String robotId,
                                @RequestParam("ip") String ip,
-                               @RequestParam("day") Integer day){
+                               @RequestParam("day") Integer day,
+                               @RequestParam("wakeUpId") Integer wakeUpId){
         WakeUpInfoDto wakeUpInfoDto = new WakeUpInfoDto();
         wakeUpInfoDto.setIp(ip);
         wakeUpInfoDto.setTime(DateUtils.addDay(new Date(),day));

pcloud-service-book/src/main/java/com/pcloud/book/pcloudkeyword/dao/PcloudRobotDao.java

@@ -29,4 +29,7 @@ public interface PcloudRobotDao extends BaseDao<PcloudRobot> {
     PcloudRobot getByUniqueNumber(String uniqueNumber);
 
     void updatePcloudRobotByWxId(PcloudRobot pcloudRobot);
+
+    List<String> getPcloudRobotByTypes(List<Integer> classifyIds);
+
 }

pcloud-service-book/src/main/java/com/pcloud/book/pcloudkeyword/dao/impl/PcloudRobotDaoImpl.java

@@ -48,8 +48,15 @@ public class PcloudRobotDaoImpl extends BaseDaoImpl<PcloudRobot> implements Pclo
     }
 
     @Override
+
     public void updatePcloudRobotByWxId(PcloudRobot pcloudRobot) {
         this.getSessionTemplate().update(this.getStatement("updatePcloudRobotByWxId"), pcloudRobot);
     }
 
+        @Override
+    public List<String> getPcloudRobotByTypes(List<Integer> classifyIds) {
+            return this.getSessionTemplate().selectList(this.getStatement("getPcloudRobotByTypes"), classifyIds);
+
+        }
+
 }

pcloud-service-book/src/main/resources/mapper/guide/PcloudRobotWakeupMapper.xml

@@ -9,6 +9,14 @@
     <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
     <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
   </resultMap>
+
+  <resultMap id="RobotWakeUpShowVOMap" type="com.pcloud.book.guide.vo.RobotWakeUpShowVO">
+    <id column="id" property="wakeUpId" jdbcType="BIGINT"/>
+    <result column="start_time" property="startTime" jdbcType="TIMESTAMP"/>
+    <result column="last" property="lastDay" jdbcType="BIGINT"/>
+    <collection property="classifyDTOList" column="id" select="com.pcloud.book.guide.mapper.PcloudRobotWakeupClassifyMapper.getRobotClassifyByWakeUpId"/>
+    <collection property="msgList" column="id" select="com.pcloud.book.guide.mapper.PcloudWakeupMessageMapper.selectByWakeUpId"/>
+  </resultMap>
   <sql id="Base_Column_List" >
     id, start_time, cycle, last, create_time, update_time
   </sql>
@@ -30,7 +38,7 @@
       #{last,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
       )
   </insert>
-  <insert id="insertSelective" parameterType="com.pcloud.book.guide.entity.PcloudRobotWakeup" >
+  <insert id="insertSelective" parameterType="com.pcloud.book.guide.entity.PcloudRobotWakeup" useGeneratedKeys="true" keyProperty="id" >
     insert into pcloud_robot_wakeup
     <trim prefix="(" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -127,5 +135,32 @@
     AND is_delete = 0
   </select>
 
+  <select id="getRobotWakeUpConfigListCount" resultType="integer">
+    select
+    count(id)
+    from
+    pcloud_robot_wakeup
+  </select>
+
+  <select id="getRobotWakeUpConfigList" resultMap="RobotWakeUpShowVOMap">
+    select
+    id,
+    start_time,
+    last
+    from pcloud_robot_wakeup
+    order by create_time desc
+    <if test="currentPage!=null">
+      limit #{currentPage},#{numPerPage}
+    </if>
+  </select>
+
+  <select id="getRobotWakeUpConfigById" parameterType="integer" resultMap="RobotWakeUpShowVOMap">
+    select
+    id,
+    start_time,
+    last
+    from pcloud_robot_wakeup
+    where id = #{wakeUpId}
+  </select>
 
 </mapper>
\ No newline at end of file

pcloud-service-book/src/main/resources/mapper/guide/PcloudRobotWakeupMapperClassify.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.pcloud.book.guide.mapper.PcloudRobotWakeupClassifyMapper" >
+  <resultMap id="BaseResultMap" type="com.pcloud.book.guide.entity.PcloudRobotWakeupClassify" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="wake_up_id" property="wakeUpId" jdbcType="INTEGER" />
+    <result column="robot_classify_id" property="robotClassifyId" jdbcType="INTEGER" />
+    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+    <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, wake_up_id, robot_classify_id,create_time, update_time
+  </sql>
+
+  <insert id="insert" parameterType="com.pcloud.book.guide.entity.PcloudRobotWakeupClassify" >
+    insert into pcloud_robot_wakeup_classify (wake_up_id, robot_classify_id, create_time
+      )
+    values (#{wakeUpId,jdbcType=INTEGER}, #{robotClassifyId,jdbcType=INTEGER},
+       #{createTime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+
+  <insert id="batchInsert" parameterType="com.pcloud.book.guide.entity.PcloudRobotWakeupClassify">
+    insert into  pcloud_robot_wakeup_classify (wake_up_id, robot_classify_id, create_time
+    )
+    values
+    <foreach collection="list" item="item" index="index" separator=",">
+      (
+      #{item.wakeUpId},
+      #{item.robotClassifyId},
+      #{item.createTime}
+      )
+    </foreach>
+  </insert>
+
+
+  <delete id="deleteAll">
+    delete from pcloud_robot_wakeup_classify
+  </delete>
+
+  <select id="getRobotClassifyByWakeUpId" parameterType="integer" resultType="com.pcloud.book.pcloudKeyword.dto.RobotClassifyDTO">
+    select
+    prwc.robot_classify_id classifyId,
+    prc.classify_name classifyName
+    from
+    pcloud_robot_wakeup_classify prwc
+    left join pcloud_robot_classify prc
+    on prwc.robot_classify_id =  prc.id
+    where prwc.wake_up_id = #{_parameter}
+  </select>
+
+  <select id="deleteByWakeUpId" parameterType="integer">
+    delete
+    from
+    pcloud_robot_wakeup_classify
+    where
+    wake_up_id = #{wakeUpId}
+  </select>
+
+
+</mapper>
\ No newline at end of file

pcloud-service-book/src/main/resources/mapper/guide/PcloudWakeupMessageMapper.xml

@@ -12,6 +12,16 @@
     <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
     <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
   </resultMap>
+
+  <resultMap id="BaseResultMap4VO" type="com.pcloud.book.guide.vo.RobotWakeUpMsgVO" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="type" property="type" jdbcType="VARCHAR" />
+    <result column="text_content" property="content" jdbcType="VARCHAR" />
+    <result column="img_url" property="picUrl" jdbcType="VARCHAR" />
+    <result column="file_url" property="fileUrl" jdbcType="VARCHAR" />
+    <result column="file_name" property="fileName" jdbcType="VARCHAR" />
+    <result column="seq_num" property="seqNum" jdbcType="BIT" />
+  </resultMap>
   <sql id="Base_Column_List" >
     id, type, text_content, img_url, file_url, file_name, seq_num, create_time, update_time
   </sql>
@@ -96,6 +106,23 @@
       </if>
     </trim>
   </insert>
+
+    <insert id="batchInsert" parameterType="com.pcloud.book.guide.entity.PcloudWakeupMessage">
+      insert into pcloud_wakeup_message ( type, text_content,
+      img_url, file_url, file_name,
+      seq_num, create_time, update_time,wake_up_id
+      )
+      values
+      <foreach collection="list" item="item" index="index" separator=",">
+      (
+        #{item.type,jdbcType=VARCHAR}, #{item.textContent,jdbcType=VARCHAR},
+        #{item.imgUrl,jdbcType=VARCHAR}, #{item.fileUrl,jdbcType=VARCHAR}, #{item.fileName,jdbcType=VARCHAR},
+        #{item.seqNum,jdbcType=BIT}, #{item.createTime,jdbcType=TIMESTAMP}, #{item.updateTime,jdbcType=TIMESTAMP},
+        #{item.wakeUpId}
+        )
+      </foreach>
+    </insert>
+
     <update id="updateByPrimaryKeySelective" parameterType="com.pcloud.book.guide.entity.PcloudWakeupMessage" >
     update pcloud_wakeup_message
     <set >
@@ -161,5 +188,22 @@
     select  count(0) from pcloud_robot_classify
   </select>
 
+  <select id="selectByWakeUpId" resultMap="BaseResultMap4VO" parameterType="integer">
+    select
+    id, type, text_content, img_url, file_url, file_name, seq_num
+    from
+    pcloud_wakeup_message
+    where
+    wake_up_id = #{_parameter}
+  </select>
 
+
+  <delete id="delectByWakeUpId" parameterType="integer">
+    delete
+    from
+    pcloud_wakeup_message
+    where
+    wake_up_id = #{wakeUpId}
+
+  </delete>
 </mapper>
\ No newline at end of file

pcloud-service-book/src/main/resources/mapper/pcloudkeyword/PcloudRobot.Mapper.xml

@@ -239,4 +239,17 @@
         limit 1
     </select>
 
+    <select id="getPcloudRobotByTypes" parameterType="list" resultType="string">
+        select
+        DISTINCT wx_id
+        from
+        pcloud_robot p
+        where
+        robot_type in
+        <foreach collection="list" index="index" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+        and state = 1
+    </select>
+
 </mapper>
\ No newline at end of file