添加企微任务接口

src/main/java/com/mokamrp/privates/controller/pangu/FosterwxCashWorkClientController.java

@@ -1,16 +1,13 @@
 package com.mokamrp.privates.controller.pangu;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.mokamrp.privates.entity.pangu.FosterwxCashBoxClientInfo;
 import com.mokamrp.privates.entity.pangu.FosterwxWorkServeHandle;
 import com.mokamrp.privates.help.AjaxResult;
-import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashMobile;
-import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashScheduleTaskList;
-import com.mokamrp.privates.mapper.pangu.pojo.FosterwxMobile;
+import com.mokamrp.privates.mapper.pangu.pojo.*;
 import com.mokamrp.privates.mapper.pojo.Corp;
 import com.mokamrp.privates.service.CorpService;
-import com.mokamrp.privates.service.pangu.FosterwxCashMobileService;
-import com.mokamrp.privates.service.pangu.FosterwxCashScheduleTaskListService;
-import com.mokamrp.privates.service.pangu.FosterwxMobileService;
+import com.mokamrp.privates.service.pangu.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -23,6 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -48,6 +46,12 @@ public class FosterwxCashWorkClientController {
     @Autowired
     private FosterwxCashMobileService fosterwxCashMobileService;
 
+    @Autowired
+    private FosterwxCashWorkBoxClientInfoService fosterwxCashWorkBoxClientInfoService;
+
+    @Autowired
+    private FosterwxCashWorkwxTaskListService fosterwxCashWorkwxTaskListService;
+
 
     @PostMapping("/getTaskInfo")
     @ApiOperation(value = "返回凌晨到当前时间的未发送的数据,主体 昵称/团队id 昵称 两两一组必须有数据")
@@ -85,12 +89,49 @@ public class FosterwxCashWorkClientController {
 
         List<FosterwxCashScheduleTaskList> fosterwxCashScheduleTaskListList = fosterwxCashScheduleTaskListService.list(fosterwxCashScheduleTaskListLambdaQueryWrapper);
 
+        List<FosterwxCashBoxClientInfo> fosterwxCashBoxClientInfoList = new ArrayList<>();
         fosterwxCashScheduleTaskListList.forEach(fosterwxCashScheduleTaskList -> {
             fosterwxCashScheduleTaskListService.updateById(new FosterwxCashScheduleTaskList() {{
                 setId(fosterwxCashScheduleTaskList.getId());
                 setStatus(5);
                 setUpdateAt(LocalDateTime.now());
             }});
+
+            // 获取任务详情
+            FosterwxCashWorkwxTaskList fosterwxCashWorkwxTaskList = fosterwxCashWorkwxTaskListService.getOne(new LambdaQueryWrapper<FosterwxCashWorkwxTaskList>().
+                    eq(FosterwxCashWorkwxTaskList::getTemplateId, fosterwxCashScheduleTaskList.getTemplateId()).
+                    eq(FosterwxCashWorkwxTaskList::getCatalogId, fosterwxCashScheduleTaskList.getTaskId()).
+                    eq(FosterwxCashWorkwxTaskList::getId, fosterwxCashScheduleTaskList.getChildTaskId()).
+                    last("LIMIT 1"));
+            FosterwxCashBoxClientInfo fosterwxCashBoxClientInfo = new FosterwxCashBoxClientInfo();
+            if (1 == fosterwxCashScheduleTaskList.getTaskType() || 3 == fosterwxCashScheduleTaskList.getTaskType()) {
+                FosterwxCashWorkBoxClientInfo fosterwxCashWorkBoxClientInfo = fosterwxCashWorkBoxClientInfoService.getOne(new LambdaQueryWrapper<FosterwxCashWorkBoxClientInfo>().eq(FosterwxCashWorkBoxClientInfo::getGhid, fosterwxCashScheduleTaskList.getBoxGhid()));
+                FosterwxCashBoxClientInfo.BoxInfo boxInfo = fosterwxCashBoxClientInfo.new BoxInfo();
+                boxInfo.setGhid(fosterwxCashWorkBoxClientInfo.getGhid());
+                boxInfo.setWxid(fosterwxCashWorkBoxClientInfo.getWxid());
+                boxInfo.setName(fosterwxCashWorkBoxClientInfo.getName());
+                boxInfo.setTitle(fosterwxCashWorkwxTaskList.getTitle());
+                boxInfo.setEnterpoint(fosterwxCashScheduleTaskList.getBoxUrl());
+                boxInfo.setHeadimg(fosterwxCashWorkBoxClientInfo.getHeadimg());
+                boxInfo.setImage_key1(fosterwxCashWorkBoxClientInfo.getImageKey1());
+                boxInfo.setImage_key2(fosterwxCashWorkBoxClientInfo.getImageKey2());
+                boxInfo.setImage_key3(fosterwxCashWorkBoxClientInfo.getImageKey3());
+                boxInfo.setImageSize(fosterwxCashWorkBoxClientInfo.getImageSize());
+                boxInfo.setAppType(fosterwxCashWorkBoxClientInfo.getAppType());
+                boxInfo.setDesc(fosterwxCashWorkBoxClientInfo.getDesc());
+
+                fosterwxCashBoxClientInfo.setBoxInfo(boxInfo);
+            } else if (2 == fosterwxCashScheduleTaskList.getTaskType()) {
+                FosterwxCashBoxClientInfo.UrlInfo urlInfo = fosterwxCashBoxClientInfo.new UrlInfo();
+                urlInfo.setTitle(fosterwxCashWorkwxTaskList.getUrlTitle());
+                urlInfo.setDesc(fosterwxCashWorkwxTaskList.getUrlDesc());
+                urlInfo.setUrl(fosterwxCashScheduleTaskList.getSendUrl());
+                urlInfo.setImage_url(fosterwxCashWorkwxTaskList.getUrlImage());
+
+                fosterwxCashBoxClientInfo.setUrlInfo(urlInfo);
+            }
+
+            fosterwxCashBoxClientInfoList.add(fosterwxCashBoxClientInfo);
         });
 
         return AjaxResult.success(fosterwxCashScheduleTaskListList);
@@ -165,4 +206,12 @@ public class FosterwxCashWorkClientController {
 
         return "参数没有设置全，无法根据现有信息获取任务";
     }
+
+    @PostMapping("saveBoxInfo")
+    @ApiOperation(value = "保存小程序信息,已经保存过的小程序更新处理")
+    public Object saveBoxInfo(@RequestBody FosterwxCashWorkBoxClientInfo fosterwxCashWorkBoxClientInfo) {
+        fosterwxCashWorkBoxClientInfoService.saveOrUpdate(fosterwxCashWorkBoxClientInfo);
+
+        return "新增修改成功!";
+    }
 }

src/main/java/com/mokamrp/privates/entity/pangu/FosterwxCashBoxClientInfo.java

@@ -0,0 +1,97 @@
+package com.mokamrp.privates.entity.pangu;
+
+import lombok.Data;
+
+/**
+ * @Classname FosterwxCashBoxClientInfo
+ * @Description TODO
+ * @Date 2021/10/26 2:40 下午
+ * @Created by luqiucheng
+ */
+@Data
+public class FosterwxCashBoxClientInfo {
+    private UrlInfo urlInfo;
+
+    private BoxInfo boxInfo;
+
+    /**
+     * 链接消息
+     */
+    @Data
+    public class UrlInfo {
+        // 链接标题
+        private String title;
+        // 链接描述
+        private String desc;
+        // 链接地址
+        private String url;
+        // 链接图片
+        private String image_url;
+    }
+
+    /**
+     * 小程序消息
+     */
+    @Data
+    public class BoxInfo {
+        /**
+         * 小程序ghid
+         */
+        private String ghid;
+
+        /**
+         * appid
+         */
+        private String wxid;
+
+        /**
+         * 小程序名称
+         */
+        private String name;
+
+        /**
+         * 小程序分享的标题
+         */
+        private String title;
+
+        /**
+         * 入口点
+         */
+        private String enterpoint;
+
+        /**
+         * 小程序图标
+         */
+        private String headimg;
+
+        /**
+         * 缩略图key1
+         */
+        private String image_key1;
+
+        /**
+         * 缩略图key2
+         */
+        private String image_key2;
+
+        /**
+         * 缩略图key3
+         */
+        private String image_key3;
+
+        /**
+         * 缩略图大小
+         */
+        private Integer imageSize;
+
+        /**
+         * 小程序类型，默认2（0：小图样式 2：大图样式）
+         */
+        private Integer appType;
+
+        /**
+         * 小程序分享的标题
+         */
+        private String desc;
+    }
+}

src/main/java/com/mokamrp/privates/mapper/pangu/FosterwxCashScheduleTaskListMapper.xml

@@ -14,6 +14,8 @@
         <result column="remark" property="remark"/>
         <result column="task_content" property="taskContent"/>
         <result column="gh_id" property="ghId"/>
+        <result column="box_ghid" property="boxGhid" />
+        <result column="box_url" property="boxUrl" />
         <result column="send_url" property="sendUrl"/>
         <result column="status" property="status"/>
         <result column="type" property="type"/>
@@ -28,8 +30,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id
-        , schedule_id, template_id, task_id, childTaskId, group_id, task_type, remark, task_content, status, err_info, send_time, create_uid, update_uid, create_at, update_at
+        id, schedule_id, template_id, task_id, child_task_id, group_id, task_type, remark, task_content, gh_id, box_ghid, box_url, send_url, status, type, err_info, send_time, create_uid, create_user, update_uid, create_at, update_at
     </sql>
     <select id="getList" resultType="com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashScheduleTaskList">
         <if test="handle.type == 2">

src/main/java/com/mokamrp/privates/mapper/pangu/FosterwxCashWorkBoxClientInfoMapper.java

@@ -0,0 +1,21 @@
+package com.mokamrp.privates.mapper.pangu;
+
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashWorkBoxClientInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.stereotype.Component;
+import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
+/**
+ * <p>
+ * 企微小程序信息 Mapper 接口
+ * </p>
+ *
+ * @author leon
+ * @since 2021-10-26
+ */
+@Component
+public interface FosterwxCashWorkBoxClientInfoMapper extends BaseMapper<FosterwxCashWorkBoxClientInfo> {
+    public List<FosterwxCashWorkBoxClientInfo> getList(Page<FosterwxCashWorkBoxClientInfo> pageObj);
+}

src/main/java/com/mokamrp/privates/mapper/pangu/FosterwxCashWorkBoxClientInfoMapper.xml

@@ -0,0 +1,28 @@
+<?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.mokamrp.privates.mapper.pangu.FosterwxCashWorkBoxClientInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashWorkBoxClientInfo">
+        <id column="ghid" property="ghid" />
+        <result column="wxid" property="wxid" />
+        <result column="name" property="name" />
+        <result column="title" property="title" />
+        <result column="enterpoint" property="enterpoint" />
+        <result column="headimg" property="headimg" />
+        <result column="image_key1" property="imageKey1" />
+        <result column="image_key2" property="imageKey2" />
+        <result column="image_key3" property="imageKey3" />
+        <result column="image_size" property="imageSize" />
+        <result column="app_type" property="appType" />
+        <result column="desc" property="desc" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ghid, wxid, name, title, enterpoint, headimg, image_key1, image_key2, image_key3, image_size, app_type, desc
+    </sql>
+    <select id="getList" resultType="com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashWorkBoxClientInfo">
+        SELECT * FROM pan_fosterwx_cash_work_box_client_info
+    </select>
+</mapper>

src/main/java/com/mokamrp/privates/mapper/pangu/pojo/FosterwxCashScheduleTaskList.java

@@ -75,6 +75,16 @@ public class FosterwxCashScheduleTaskList extends Model<FosterwxCashScheduleTask
     private String ghId;
 
     /**
+     * 小程序ghid
+     */
+    private String boxGhid;
+
+    /**
+     * 小程序路径
+     */
+    private String boxUrl;
+
+    /**
      * 发文链接
      */
     private String sendUrl;
@@ -131,14 +141,8 @@ public class FosterwxCashScheduleTaskList extends Model<FosterwxCashScheduleTask
     private List<FosterwxCashWorkwxTaskList> fosterwxCashWorkwxTaskListList;
 
     @TableField(exist = false)
-    private String boxGhid;
-
-    @TableField(exist = false)
     private Object boxInfo;
 
-    @TableField(exist = false)
-    private String boxUrl;
-
     public Integer getId() {
         return id;
     }
@@ -170,7 +174,7 @@ public class FosterwxCashScheduleTaskList extends Model<FosterwxCashScheduleTask
     public void setTaskId(Integer taskId) {
         this.taskId = taskId;
     }
-    
+
     public Integer getChildTaskId() {
         return childTaskId;
     }

src/main/java/com/mokamrp/privates/mapper/pangu/pojo/FosterwxCashWorkBoxClientInfo.java

@@ -0,0 +1,202 @@
+package com.mokamrp.privates.mapper.pangu.pojo;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 企微小程序信息
+ * </p>
+ *
+ * @author leon
+ * @since 2021-10-26
+ */
+@TableName("pan_fosterwx_cash_work_box_client_info")
+public class FosterwxCashWorkBoxClientInfo extends Model<FosterwxCashWorkBoxClientInfo> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 小程序ghid
+     */
+      @TableId(value = "ghid", type = IdType.AUTO)
+    private String ghid;
+
+    /**
+     * appid
+     */
+    private String wxid;
+
+    /**
+     * 小程序名称
+     */
+    private String name;
+
+    /**
+     * 小程序分享的标题
+     */
+    private String title;
+
+    /**
+     * 入口点
+     */
+    private String enterpoint;
+
+    /**
+     * 小程序图标
+     */
+    private String headimg;
+
+    /**
+     * 缩略图key1
+     */
+    private String imageKey1;
+
+    /**
+     * 缩略图key2
+     */
+    private String imageKey2;
+
+    /**
+     * 缩略图key3
+     */
+    private String imageKey3;
+
+    /**
+     * 缩略图大小
+     */
+    private Integer imageSize;
+
+    /**
+     * 小程序类型，默认2（0：小图样式 2：大图样式）
+     */
+    private Integer appType;
+
+    /**
+     * 小程序分享的标题
+     */
+    private String desc;
+
+
+    public String getGhid() {
+        return ghid;
+    }
+
+    public void setGhid(String ghid) {
+        this.ghid = ghid;
+    }
+
+    public String getWxid() {
+        return wxid;
+    }
+
+    public void setWxid(String wxid) {
+        this.wxid = wxid;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getEnterpoint() {
+        return enterpoint;
+    }
+
+    public void setEnterpoint(String enterpoint) {
+        this.enterpoint = enterpoint;
+    }
+
+    public String getHeadimg() {
+        return headimg;
+    }
+
+    public void setHeadimg(String headimg) {
+        this.headimg = headimg;
+    }
+
+    public String getImageKey1() {
+        return imageKey1;
+    }
+
+    public void setImageKey1(String imageKey1) {
+        this.imageKey1 = imageKey1;
+    }
+
+    public String getImageKey2() {
+        return imageKey2;
+    }
+
+    public void setImageKey2(String imageKey2) {
+        this.imageKey2 = imageKey2;
+    }
+
+    public String getImageKey3() {
+        return imageKey3;
+    }
+
+    public void setImageKey3(String imageKey3) {
+        this.imageKey3 = imageKey3;
+    }
+
+    public Integer getImageSize() {
+        return imageSize;
+    }
+
+    public void setImageSize(Integer imageSize) {
+        this.imageSize = imageSize;
+    }
+
+    public Integer getAppType() {
+        return appType;
+    }
+
+    public void setAppType(Integer appType) {
+        this.appType = appType;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.ghid;
+    }
+
+    @Override
+    public String toString() {
+        return "FosterwxCashWorkBoxClientInfo{" +
+        "ghid=" + ghid +
+        ", wxid=" + wxid +
+        ", name=" + name +
+        ", title=" + title +
+        ", enterpoint=" + enterpoint +
+        ", headimg=" + headimg +
+        ", imageKey1=" + imageKey1 +
+        ", imageKey2=" + imageKey2 +
+        ", imageKey3=" + imageKey3 +
+        ", imageSize=" + imageSize +
+        ", appType=" + appType +
+        ", desc=" + desc +
+        "}";
+    }
+}

src/main/java/com/mokamrp/privates/service/pangu/FosterwxCashWorkBoxClientInfoService.java

@@ -0,0 +1,20 @@
+package com.mokamrp.privates.service.pangu;
+
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashWorkBoxClientInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.mokamrp.privates.entity.PostBasePageHandle;
+import com.mokamrp.privates.entity.ResHandle;
+import java.util.List;
+import java.util.Map;
+/**
+ * <p>
+ * 企微小程序信息 服务类
+ * </p>
+ *
+ * @author leon
+ * @since 2021-10-26
+ */
+public interface FosterwxCashWorkBoxClientInfoService extends IService<FosterwxCashWorkBoxClientInfo> {
+    //.@leon 获取数据列表
+    public ResHandle<List<FosterwxCashWorkBoxClientInfo>> getList(PostBasePageHandle handle);
+}

src/main/java/com/mokamrp/privates/service/pangu/impl/FosterwxCashWorkBoxClientInfoServiceImpl.java

@@ -0,0 +1,43 @@
+package com.mokamrp.privates.service.pangu.impl;
+
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashWorkBoxClientInfo;
+import com.mokamrp.privates.mapper.pangu.FosterwxCashWorkBoxClientInfoMapper;
+import com.mokamrp.privates.service.pangu.FosterwxCashWorkBoxClientInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import com.mokamrp.privates.entity.PostBasePageHandle;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import com.mokamrp.privates.entity.ResHandle;
+import java.util.*;
+
+/**
+ * <p>
+ * 企微小程序信息 服务实现类
+ * </p>
+ *
+ * @author leon
+ * @since 2021-10-26
+ */
+@Service
+public class FosterwxCashWorkBoxClientInfoServiceImpl extends ServiceImpl<FosterwxCashWorkBoxClientInfoMapper, FosterwxCashWorkBoxClientInfo> implements FosterwxCashWorkBoxClientInfoService {
+
+    @Autowired
+    public FosterwxCashWorkBoxClientInfoMapper fosterwxCashWorkBoxClientInfoMapper;
+    /**
+     * 获取数据列表 支持分页
+     * @param handle
+     * @return
+     */
+    public ResHandle<List<FosterwxCashWorkBoxClientInfo>> getList(PostBasePageHandle handle) {
+        Integer pagesize = handle.getPagesize();
+        Integer page = handle.getPage();
+        Page<FosterwxCashWorkBoxClientInfo> pageObj = new Page<FosterwxCashWorkBoxClientInfo>(page, pagesize);
+        List<FosterwxCashWorkBoxClientInfo> list = fosterwxCashWorkBoxClientInfoMapper.getList(pageObj);
+        ResHandle<List<FosterwxCashWorkBoxClientInfo>> res = new ResHandle<>();
+        res.setList(list);
+        res.setTotal(pageObj.getTotal());
+        return res;
+    }
+}

src/test/java/com/mokamrp/AutoMPPangu.java

@@ -46,7 +46,7 @@ public class AutoMPPangu {
                 .setColumnNaming(NamingStrategy.underline_to_camel)
                 .setNaming(NamingStrategy.underline_to_camel) // 数据库表映射到实体的命名策略，下划线转驼峰命名
                 .setTablePrefix("pan_") //表名前缀
-                .setInclude("pan_fosterwx_cash_account_schedule");
+                .setInclude("pan_fosterwx_cash_schedule_task_list");
         //4. 包名策略配置
         PackageConfig pkConfig = new PackageConfig();
         pkConfig.setParent("com.mokamrp.privates")