Merge branch 'test' into dev-lqc

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

@@ -10,10 +10,15 @@ import com.mokamrp.privates.help.AjaxResult;
 import com.mokamrp.privates.entity.ResHandle;
 import com.mokamrp.privates.interceptor.AuthUser;
 import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashTaskList;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashWorkwxTaskCatalog;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashWorkwxTaskList;
 import com.mokamrp.privates.mapper.pojo.User;
 import com.mokamrp.privates.service.pangu.FosterwxCashTaskListService;
+import com.mokamrp.privates.service.pangu.FosterwxCashWorkwxTaskCatalogService;
+import com.mokamrp.privates.service.pangu.FosterwxCashWorkwxTaskListService;
 import org.apache.tomcat.jni.Local;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestMapping;
 import com.mokamrp.privates.service.pangu.FosterwxCashTaskTemplateService;
@@ -48,6 +53,12 @@ public class FosterwxCashTaskTemplateController extends BaseController<FosterwxC
     @Autowired
     public FosterwxCashTaskListService fosterwxCashTaskListService;
 
+    @Autowired
+    public FosterwxCashWorkwxTaskListService fosterwxCashWorkwxTaskListService;
+
+    @Autowired
+    public FosterwxCashWorkwxTaskCatalogService fosterwxCashWorkwxTaskCatalogService;
+
     /*
      * @fast
      * 默认生成的控制器所继承的父类中有index/add/edit/del四个基础方法,均为post json请求
@@ -69,14 +80,23 @@ public class FosterwxCashTaskTemplateController extends BaseController<FosterwxC
             return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
         }
         ResHandle<List<FosterwxCashTaskTemplate>> res = fosterwxCashTaskTemplateService.getList(postBasePageHandle);
-        for (FosterwxCashTaskTemplate fosterwxCashTaskTemplate : res.getList()){
-            List<FosterwxCashTaskList> taskList =  fosterwxCashTaskListService.list(
-                    new QueryWrapper<FosterwxCashTaskList>()
-                            .eq("template_id",fosterwxCashTaskTemplate.getId())
-                            .eq("del_flg",1)
-                            .last("limit 6")
-            );
-            fosterwxCashTaskTemplate.setTaskList(taskList);
+        if (postBasePageHandle.getType() == 1){
+            //.个微
+            for (FosterwxCashTaskTemplate fosterwxCashTaskTemplate : res.getList()){
+                List<FosterwxCashTaskList> taskList =  fosterwxCashTaskListService.list(
+                        new QueryWrapper<FosterwxCashTaskList>()
+                                .eq("template_id",fosterwxCashTaskTemplate.getId())
+                                .eq("del_flg",1)
+                                .last("limit 6")
+                );
+                fosterwxCashTaskTemplate.setTaskList(taskList);
+            }
+        }else{
+            //.企微
+            for (FosterwxCashTaskTemplate fosterwxCashTaskTemplate : res.getList()){
+                List<FosterwxCashWorkwxTaskList> taskList =  fosterwxCashWorkwxTaskCatalogService.getTaskByTemplateId(fosterwxCashTaskTemplate.getId());
+                fosterwxCashTaskTemplate.setWorkwxTaskList(taskList);
+            }
         }
         return AjaxResult.success(res);
     }
@@ -106,6 +126,43 @@ public class FosterwxCashTaskTemplateController extends BaseController<FosterwxC
         }
     }
 
+
+    @PostMapping("/addWorkwxPro")
+    @Transactional(rollbackFor = Exception.class)
+    public Object addWorkwxPro(@Valid @RequestBody AddHandle<FosterwxCashTaskTemplate> addHandle, @AuthUser User authUser, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
+        }
+        this.onInsert(addHandle.getRaw());
+        FosterwxCashTaskTemplate add = addHandle.getRaw();
+        add.setCreateUid(authUser.getId());
+        add.setUpdateUid(authUser.getId());
+        Boolean res = service.save(add);
+        for (FosterwxCashWorkwxTaskCatalog fosterwxCashWorkwxTaskCatalog : add.getWorkwxTaskCatalogList()){
+            //.保存任务目录
+            fosterwxCashWorkwxTaskCatalog.setTemplateId(add.getId());
+            fosterwxCashWorkwxTaskCatalog.setCreateAt(LocalDateTime.now());
+            fosterwxCashWorkwxTaskCatalog.setUpdateAt(LocalDateTime.now());
+            fosterwxCashWorkwxTaskCatalog.setCreateUid(authUser.getId());
+            fosterwxCashWorkwxTaskCatalog.setUpdateUid(authUser.getId());
+            fosterwxCashWorkwxTaskCatalogService.save(fosterwxCashWorkwxTaskCatalog);
+            for (FosterwxCashWorkwxTaskList fosterwxCashWorkwxTaskList : fosterwxCashWorkwxTaskCatalog.getTaskList()){
+                //.保存任务目录内任务列表
+                fosterwxCashWorkwxTaskList.setTemplateId(add.getId());
+                fosterwxCashWorkwxTaskList.setCatalogId(fosterwxCashWorkwxTaskList.getId());
+                fosterwxCashWorkwxTaskList.setCreateAt(LocalDateTime.now());
+                fosterwxCashWorkwxTaskList.setUpdateAt(LocalDateTime.now());
+                fosterwxCashWorkwxTaskList.setCreateUid(authUser.getId());
+                fosterwxCashWorkwxTaskList.setUpdateUid(authUser.getId());
+                fosterwxCashWorkwxTaskListService.save(fosterwxCashWorkwxTaskList);
+            }
+        }
+        if (res) {
+            return AjaxResult.success(Constants.SUCCESS, res);
+        } else {
+            return AjaxResult.error("新增失败", res);
+        }
+    }
     /**
      * 软删除
      * @param delHandle

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

@@ -0,0 +1,55 @@
+package com.mokamrp.privates.controller.pangu;
+
+import com.mokamrp.privates.constant.HttpStatus;
+import com.mokamrp.privates.entity.PostBasePageHandle;
+import com.mokamrp.privates.help.AjaxResult;
+import com.mokamrp.privates.entity.ResHandle;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.mokamrp.privates.service.pangu.FosterwxCashWorkwxTaskCatalogService;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashWorkwxTaskCatalog;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.mokamrp.privates.controller.BaseController;
+import javax.validation.Valid;
+import java.util.Map;
+import java.util.List;
+
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * <p>
+ * 盘古企微变现任务目录表 前端控制器
+ * </p>
+ *
+ * @author leon
+ * @since 2021-10-25
+ */
+@RestController
+@RequestMapping("/fosterwxCashWorkwxTaskCatalog")
+public class FosterwxCashWorkwxTaskCatalogController extends BaseController<FosterwxCashWorkwxTaskCatalog> {
+
+    @Autowired
+    public FosterwxCashWorkwxTaskCatalogService fosterwxCashWorkwxTaskCatalogService;
+
+    /*
+     * @fast
+     * 默认生成的控制器所继承的父类中有index/add/edit/del四个基础方法,均为post json请求
+     * 如果需要定制化，需要将BaseController中对应的方法复制到当前控制器,然后进行修改
+     */
+
+    @PostMapping("/list")
+    public Object list(@Valid @RequestBody PostBasePageHandle postBasePageHandle, BindingResult bindingResult){
+        if (bindingResult.hasErrors()) {
+            return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
+        }
+        ResHandle<List<FosterwxCashWorkwxTaskCatalog>> res = fosterwxCashWorkwxTaskCatalogService.getList(postBasePageHandle);
+        return AjaxResult.success(res);
+    }
+
+
+}
+

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

@@ -0,0 +1,93 @@
+package com.mokamrp.privates.controller.pangu;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.mokamrp.privates.constant.Constants;
+import com.mokamrp.privates.constant.HttpStatus;
+import com.mokamrp.privates.entity.DelHandle;
+import com.mokamrp.privates.entity.PostBasePageHandle;
+import com.mokamrp.privates.entity.pangu.GetByIdHandle;
+import com.mokamrp.privates.help.AjaxResult;
+import com.mokamrp.privates.entity.ResHandle;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashTaskList;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.mokamrp.privates.service.pangu.FosterwxCashWorkwxTaskListService;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashWorkwxTaskList;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.mokamrp.privates.controller.BaseController;
+import javax.validation.Valid;
+import java.time.LocalDateTime;
+import java.util.Map;
+import java.util.List;
+
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * <p>
+ * 盘古企微微信变现任务列表 前端控制器
+ * </p>
+ *
+ * @author leon
+ * @since 2021-10-25
+ */
+@RestController
+@RequestMapping("/fosterwxCashWorkwxTaskList")
+public class FosterwxCashWorkwxTaskListController extends BaseController<FosterwxCashWorkwxTaskList> {
+
+    @Autowired
+    public FosterwxCashWorkwxTaskListService fosterwxCashWorkwxTaskListService;
+
+    /*
+     * @fast
+     * 默认生成的控制器所继承的父类中有index/add/edit/del四个基础方法,均为post json请求
+     * 如果需要定制化，需要将BaseController中对应的方法复制到当前控制器,然后进行修改
+     */
+
+    @PostMapping("/list")
+    public Object list(@Valid @RequestBody PostBasePageHandle postBasePageHandle, BindingResult bindingResult){
+        if (bindingResult.hasErrors()) {
+            return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
+        }
+        ResHandle<List<FosterwxCashWorkwxTaskList>> res = fosterwxCashWorkwxTaskListService.getList(postBasePageHandle);
+        return AjaxResult.success(res);
+    }
+
+    @PostMapping("/getTaskListByCatalogId")
+    public Object getTaskListByCatalogId(@Valid @RequestBody GetByIdHandle getByIdHandle,BindingResult bindingResult){
+        if (bindingResult.hasErrors()) {
+            return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<FosterwxCashWorkwxTaskList> res = fosterwxCashWorkwxTaskListService.list(new QueryWrapper<FosterwxCashWorkwxTaskList>()
+                .eq("catalog_id",getByIdHandle.getId()));
+        return AjaxResult.success(res);
+    }
+
+    /**
+     * 软删除
+     * @param delHandle
+     * @param bindingResult
+     * @return
+     */
+    @PostMapping("/del")
+    public Object delete(@Valid @RequestBody DelHandle<FosterwxCashWorkwxTaskList> delHandle, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
+        }
+        QueryWrapper<FosterwxCashWorkwxTaskList> QueryWrapper = new QueryWrapper<>();
+        String[] ids = delHandle.getIds().split(",");
+        QueryWrapper.in("id", ids);
+        FosterwxCashWorkwxTaskList save = new FosterwxCashWorkwxTaskList();
+        save.setDelFlg(0);
+        save.setUpdateAt(LocalDateTime.now());
+        boolean res = service.update(save,QueryWrapper);
+        if (!res) {
+            return AjaxResult.error("删除失败");
+        }
+        return AjaxResult.success(Constants.SUCCESS, res);
+    }
+}
+

src/main/java/com/mokamrp/privates/entity/PostBasePageHandle.java

@@ -13,6 +13,7 @@ public class PostBasePageHandle {
     private Integer createUid;
     private String title;
     private String name;
+    private Integer type;
     public Integer getPage() {
         return page;
     }

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

@@ -0,0 +1,8 @@
+package com.mokamrp.privates.entity.pangu;
+
+import lombok.Data;
+
+@Data
+public class GetByIdHandle {
+    private Integer id;
+}

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

@@ -21,6 +21,9 @@
         SELECT A.*,
                B.mobile_code,
                B.mobile_unio_code,
+               B.custservice_name,
+               B.team_id,
+               B.work_wx_login_status,
                C.station_name,
                D.domain
         FROM pan_fosterwx_cash_mobile as A

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

@@ -0,0 +1,23 @@
+package com.mokamrp.privates.mapper.pangu;
+
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashWorkwxTaskCatalog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashWorkwxTaskList;
+import org.springframework.stereotype.Component;
+import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
+/**
+ * <p>
+ * 盘古企微变现任务目录表 Mapper 接口
+ * </p>
+ *
+ * @author leon
+ * @since 2021-10-25
+ */
+@Component
+public interface FosterwxCashWorkwxTaskCatalogMapper extends BaseMapper<FosterwxCashWorkwxTaskCatalog> {
+    public List<FosterwxCashWorkwxTaskCatalog> getList(Page<FosterwxCashWorkwxTaskCatalog> pageObj);
+    public List<FosterwxCashWorkwxTaskList>getTaskByTemplateId(@Param("templateId") Integer templateId);
+}

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

@@ -0,0 +1,34 @@
+<?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.FosterwxCashWorkwxTaskCatalogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashWorkwxTaskCatalog">
+        <id column="id" property="id" />
+        <result column="template_id" property="templateId" />
+        <result column="catalog_name" property="catalogName" />
+        <result column="send_at" property="sendAt" />
+        <result column="del_flg" property="delFlg" />
+        <result column="create_uid" property="createUid" />
+        <result column="update_uid" property="updateUid" />
+        <result column="create_at" property="createAt" />
+        <result column="update_at" property="updateAt" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, template_id, catalog_name, send_at, del_flg, create_uid, update_uid, create_at, update_at
+    </sql>
+    <select id="getList" resultType="com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashWorkwxTaskCatalog">
+        SELECT * FROM pan_fosterwx_cash_workwx_task_catalog
+    </select>
+    <select id="getTaskByTemplateId"
+            resultType="com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashWorkwxTaskList">
+        select A.catalog_name,
+               A.send_at,
+               B.*
+        from pan_fosterwx_cash_workwx_task_catalog as A
+        left join pan_fosterwx_cash_workwx_task_list as B on A.id = B.catalog_id
+        order by send_at desc
+    </select>
+</mapper>

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

@@ -0,0 +1,21 @@
+package com.mokamrp.privates.mapper.pangu;
+
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashWorkwxTaskList;
+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-25
+ */
+@Component
+public interface FosterwxCashWorkwxTaskListMapper extends BaseMapper<FosterwxCashWorkwxTaskList> {
+    public List<FosterwxCashWorkwxTaskList> getList(Page<FosterwxCashWorkwxTaskList> pageObj);
+}

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

@@ -0,0 +1,45 @@
+<?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.FosterwxCashWorkwxTaskListMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashWorkwxTaskList">
+        <id column="id" property="id" />
+        <result column="group_id" property="groupId" />
+        <result column="template_id" property="templateId" />
+        <result column="task_type" property="taskType" />
+        <result column="task_name" property="taskName" />
+        <result column="task_detail_name" property="taskDetailName" />
+        <result column="title" property="title" />
+        <result column="image" property="image" />
+        <result column="box_type" property="boxType" />
+        <result column="box_appid" property="boxAppid" />
+        <result column="box_path" property="boxPath" />
+        <result column="box_image" property="boxImage" />
+        <result column="video_id" property="videoId" />
+        <result column="tag_id" property="tagId" />
+        <result column="card_image" property="cardImage" />
+        <result column="url" property="url" />
+        <result column="url_title" property="urlTitle" />
+        <result column="url_desc" property="urlDesc" />
+        <result column="url_image" property="urlImage" />
+        <result column="rich_txt_body" property="richTxtBody" />
+        <result column="is_txt_center_ads" property="isTxtCenterAds" />
+        <result column="is_original" property="isOriginal" />
+        <result column="remark" property="remark" />
+        <result column="send_at" property="sendAt" />
+        <result column="del_flg" property="delFlg" />
+        <result column="create_uid" property="createUid" />
+        <result column="update_uid" property="updateUid" />
+        <result column="create_at" property="createAt" />
+        <result column="update_at" property="updateAt" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, group_id, template_id, task_type, task_name, task_detail_name, title, image, box_type, box_appid, box_path, box_image, video_id, tag_id, card_image, url, url_title, url_desc, url_image, rich_txt_body, is_txt_center_ads, is_original, remark, send_at, del_flg, create_uid, update_uid, create_at, update_at
+    </sql>
+    <select id="getList" resultType="com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashWorkwxTaskList">
+        SELECT *  FROM pan_fosterwx_cash_workwx_task_list
+    </select>
+</mapper>

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

@@ -63,6 +63,22 @@ public class FosterwxCashMobile extends Model<FosterwxCashMobile> {
     private String mobileUnioCode;
 
     /**
+     * 客服名称
+     */
+    @TableField(exist = false)
+    private String custserviceName;
+    /**
+     * 团队ID
+     */
+    @TableField(exist = false)
+    private String teamId;
+    /**
+     * 微信登录状态
+     */
+    @TableField(exist = false)
+    private Integer workWxLoginStatus;
+
+    /**
      * 创建时间
      */
     private LocalDateTime createAt;

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

@@ -59,6 +59,12 @@ public class FosterwxCashTaskTemplate extends Model<FosterwxCashTaskTemplate> {
     @TableField(exist = false)
     private List<FosterwxCashTaskList> taskList;
 
+    @TableField(exist = false)
+    private List<FosterwxCashWorkwxTaskCatalog> workwxTaskCatalogList;
+
+    @TableField(exist = false)
+    private List<FosterwxCashWorkwxTaskList> workwxTaskList;
+
     /**
      * 创建时间
      */

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

@@ -0,0 +1,79 @@
+package com.mokamrp.privates.mapper.pangu.pojo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+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 lombok.Data;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * <p>
+ * 盘古企微变现任务目录表
+ * </p>
+ *
+ * @author leon
+ * @since 2021-10-25
+ */
+@Data
+@TableName("pan_fosterwx_cash_workwx_task_catalog")
+public class FosterwxCashWorkwxTaskCatalog extends Model<FosterwxCashWorkwxTaskCatalog> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+      @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 模板id
+     */
+    private Integer templateId;
+
+    /**
+     * 任务名称
+     */
+    private String catalogName;
+
+    /**
+     * 发送时间
+     */
+    private LocalTime sendAt;
+
+    @TableField(exist = false)
+    private List<FosterwxCashWorkwxTaskList> taskList;
+
+    /**
+     * 删除标志
+     */
+    private Integer delFlg;
+
+    /**
+     * 创建人
+     */
+    private Integer createUid;
+
+    /**
+     * 更新人
+     */
+    private Integer updateUid;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createAt;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateAt;
+
+
+}

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

@@ -0,0 +1,169 @@
+package com.mokamrp.privates.mapper.pangu.pojo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+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 lombok.Data;
+
+import java.sql.Time;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 盘古企微微信变现任务列表
+ * </p>
+ *
+ * @author leon
+ * @since 2021-10-25
+ */
+@Data
+@TableName("pan_fosterwx_cash_workwx_task_list")
+public class FosterwxCashWorkwxTaskList extends Model<FosterwxCashWorkwxTaskList> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+      @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 模板id
+     */
+    private Integer templateId;
+
+    private Integer catalogId;
+
+    @TableField(exist = false)
+    private Integer catalogName;
+
+    @TableField(exist = false)
+    private LocalTime sendAt;
+
+    /**
+     * 任务类型(1.小程序2.链接-发文小程序卡片3.链接-发文图文4.链接)
+     */
+    private Integer taskType;
+
+    /**
+     * 任务名称
+     */
+    private String taskName;
+
+    /**
+     * 发文标题
+     */
+    private String title;
+
+    /**
+     * 发文封面图
+     */
+    private String image;
+
+    /**
+     * 小程序类型(关联珊瑚云小程序类型)
+     */
+    private Integer boxType;
+
+    /**
+     * 小程序appid
+     */
+    private String boxAppid;
+
+    /**
+     * 小程序路径
+     */
+    private String boxPath;
+
+    /**
+     * 小程序封面图
+     */
+    private String boxImage;
+
+    /**
+     * 珊瑚云视频id
+     */
+    private Integer videoId;
+
+    /**
+     * 珊瑚云标签id
+     */
+    private Integer tagId;
+
+    /**
+     * 卡片封面图
+     */
+    private String cardImage;
+
+    /**
+     * 链接
+     */
+    private String url;
+
+    /**
+     * 链接标题
+     */
+    private String urlTitle;
+
+    /**
+     * 链接描述
+     */
+    private String urlDesc;
+
+    /**
+     * 链接封面图
+     */
+    private String urlImage;
+
+    /**
+     * 图文富文本内容
+     */
+    private String richTxtBody;
+
+    /**
+     * 是否插入文中广告(1.插入2.不插入)
+     */
+    private Integer isTxtCenterAds;
+
+    /**
+     * 原创(1.原创2.非原创)
+     */
+    private Integer isOriginal;
+
+    /**
+     * 任务描述
+     */
+    private String remark;
+
+    /**
+     * 删除标志
+     */
+    private Integer delFlg;
+
+    /**
+     * 创建人
+     */
+    private Integer createUid;
+
+    /**
+     * 更新人
+     */
+    private Integer updateUid;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createAt;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateAt;
+
+}

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

@@ -153,11 +153,22 @@ public class FosterwxMobile extends Model<FosterwxMobile> {
      * 企业微信注册时间
      */
     private LocalDateTime workWxRegisterAt;
-
     /**
      * 企业微信状态(1.正常2.封禁)
      */
     private Integer workWxStatus;
+    /**
+     * 客服名称
+     */
+    private String custserviceName;
+    /**
+     * 团队ID
+     */
+    private String teamId;
+    /**
+     * 微信登录状态
+     */
+    private Integer workWxLoginStatus;
 
     @TableField(exist = false)
     private List<FosterwxMobileWxfriend> friend;

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

@@ -5,6 +5,8 @@ import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashTaskTemplate;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.mokamrp.privates.entity.PostBasePageHandle;
 import com.mokamrp.privates.entity.ResHandle;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashWorkwxTaskList;
+
 import java.util.List;
 import java.util.Map;
 /**
@@ -20,4 +22,6 @@ public interface FosterwxCashTaskTemplateService extends IService<FosterwxCashTa
     public ResHandle<List<FosterwxCashTaskTemplate>> getList(PostBasePageHandle handle);
     //.@leon 通过模板ID获取模板内详细任务
     public ResHandle<List<FosterwxCashTaskList>> getTaskByTemplateId(Integer id);
+    //.@leon 通过模板ID获取模板内企微任务
+    public ResHandle<List<FosterwxCashWorkwxTaskList>> getWorkwxTaskByTemplateId(Integer id);
 }

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

@@ -0,0 +1,24 @@
+package com.mokamrp.privates.service.pangu;
+
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashWorkwxTaskCatalog;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.mokamrp.privates.entity.PostBasePageHandle;
+import com.mokamrp.privates.entity.ResHandle;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashWorkwxTaskList;
+
+import java.util.List;
+import java.util.Map;
+/**
+ * <p>
+ * 盘古企微变现任务目录表 服务类
+ * </p>
+ *
+ * @author leon
+ * @since 2021-10-25
+ */
+public interface FosterwxCashWorkwxTaskCatalogService extends IService<FosterwxCashWorkwxTaskCatalog> {
+    //.@leon 获取数据列表
+    public ResHandle<List<FosterwxCashWorkwxTaskCatalog>> getList(PostBasePageHandle handle);
+
+    public List<FosterwxCashWorkwxTaskList> getTaskByTemplateId(Integer templateId);
+}

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

@@ -0,0 +1,20 @@
+package com.mokamrp.privates.service.pangu;
+
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashWorkwxTaskList;
+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-25
+ */
+public interface FosterwxCashWorkwxTaskListService extends IService<FosterwxCashWorkwxTaskList> {
+    //.@leon 获取数据列表
+    public ResHandle<List<FosterwxCashWorkwxTaskList>> getList(PostBasePageHandle handle);
+}

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

@@ -4,9 +4,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashTaskList;
 import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashTaskTemplate;
 import com.mokamrp.privates.mapper.pangu.FosterwxCashTaskTemplateMapper;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashWorkwxTaskList;
 import com.mokamrp.privates.service.pangu.FosterwxCashTaskListService;
 import com.mokamrp.privates.service.pangu.FosterwxCashTaskTemplateService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mokamrp.privates.service.pangu.FosterwxCashWorkwxTaskCatalogService;
+import com.mokamrp.privates.service.pangu.FosterwxCashWorkwxTaskListService;
 import org.springframework.stereotype.Service;
 import com.mokamrp.privates.entity.PostBasePageHandle;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -31,6 +34,9 @@ public class FosterwxCashTaskTemplateServiceImpl extends ServiceImpl<FosterwxCas
 
     @Autowired
     public FosterwxCashTaskListService fosterwxCashTaskListService;
+
+    @Autowired
+    public FosterwxCashWorkwxTaskCatalogService fosterwxCashWorkwxTaskCatalogService;
     /**
      * 获取数据列表 支持分页
      * @param handle
@@ -61,4 +67,17 @@ public class FosterwxCashTaskTemplateServiceImpl extends ServiceImpl<FosterwxCas
         res.setTotal(Long.valueOf(1));
         return res;
     }
+
+    /**
+     * 通过模板ID获取模板内企微详细任务
+     * @param id
+     * @return
+     */
+    public ResHandle<List<FosterwxCashWorkwxTaskList>> getWorkwxTaskByTemplateId(Integer id){
+        List<FosterwxCashWorkwxTaskList> list = fosterwxCashWorkwxTaskCatalogService.getTaskByTemplateId(id);
+        ResHandle<List<FosterwxCashWorkwxTaskList>> res = new ResHandle<>();
+        res.setList(list);
+        res.setTotal(Long.valueOf(1));
+        return res;
+    }
 }

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

@@ -0,0 +1,51 @@
+package com.mokamrp.privates.service.pangu.impl;
+
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashWorkwxTaskCatalog;
+import com.mokamrp.privates.mapper.pangu.FosterwxCashWorkwxTaskCatalogMapper;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashWorkwxTaskList;
+import com.mokamrp.privates.service.pangu.FosterwxCashWorkwxTaskCatalogService;
+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-25
+ */
+@Service
+public class FosterwxCashWorkwxTaskCatalogServiceImpl extends ServiceImpl<FosterwxCashWorkwxTaskCatalogMapper, FosterwxCashWorkwxTaskCatalog> implements FosterwxCashWorkwxTaskCatalogService {
+
+    @Autowired
+    public FosterwxCashWorkwxTaskCatalogMapper fosterwxCashWorkwxTaskCatalogMapper;
+    /**
+     * 获取数据列表 支持分页
+     * @param handle
+     * @return
+     */
+    public ResHandle<List<FosterwxCashWorkwxTaskCatalog>> getList(PostBasePageHandle handle) {
+        Integer pagesize = handle.getPagesize();
+        Integer page = handle.getPage();
+        Page<FosterwxCashWorkwxTaskCatalog> pageObj = new Page<FosterwxCashWorkwxTaskCatalog>(page, pagesize);
+        List<FosterwxCashWorkwxTaskCatalog> list = fosterwxCashWorkwxTaskCatalogMapper.getList(pageObj);
+        ResHandle<List<FosterwxCashWorkwxTaskCatalog>> res = new ResHandle<>();
+        res.setList(list);
+        res.setTotal(pageObj.getTotal());
+        return res;
+    }
+
+    public List<FosterwxCashWorkwxTaskList> getTaskByTemplateId(Integer templateId) {
+        List<FosterwxCashWorkwxTaskList> list = fosterwxCashWorkwxTaskCatalogMapper.getTaskByTemplateId(templateId);
+        return list;
+    }
+
+
+}

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

@@ -0,0 +1,44 @@
+package com.mokamrp.privates.service.pangu.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashWorkwxTaskList;
+import com.mokamrp.privates.mapper.pangu.FosterwxCashWorkwxTaskListMapper;
+import com.mokamrp.privates.service.pangu.FosterwxCashWorkwxTaskListService;
+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-25
+ */
+@Service
+public class FosterwxCashWorkwxTaskListServiceImpl extends ServiceImpl<FosterwxCashWorkwxTaskListMapper, FosterwxCashWorkwxTaskList> implements FosterwxCashWorkwxTaskListService {
+
+    @Autowired
+    public FosterwxCashWorkwxTaskListMapper fosterwxCashWorkwxTaskListMapper;
+    /**
+     * 获取数据列表 支持分页
+     * @param handle
+     * @return
+     */
+    public ResHandle<List<FosterwxCashWorkwxTaskList>> getList(PostBasePageHandle handle) {
+        Integer pagesize = handle.getPagesize();
+        Integer page = handle.getPage();
+        Page<FosterwxCashWorkwxTaskList> pageObj = new Page<FosterwxCashWorkwxTaskList>(page, pagesize);
+        List<FosterwxCashWorkwxTaskList> list = fosterwxCashWorkwxTaskListMapper.getList(pageObj);
+        ResHandle<List<FosterwxCashWorkwxTaskList>> 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_schedule_task_list");
+                .setInclude("pan_fosterwx_cash_workwx_task_catalog");
         //4. 包名策略配置
         PackageConfig pkConfig = new PackageConfig();
         pkConfig.setParent("com.mokamrp.privates")