Merge branch 'test' into dev-lqc

src/main/java/com/mokamrp/privates/controller/OasBoxController.java

@@ -75,7 +75,7 @@ public class OasBoxController extends BaseController<OasBox> {
         feild.put(3, "boxType");
         feild.put(4, "fansType");
         feild.put(5, "scope");
-        feild.put(6, "remark");
+        feild.put(6, "remark|default");
         List<Map<String, String>> row;
         VoltaHandle<ArrayList<Map<String, String>>> voltaRes = Analysis.analysis(file, feild);
         if (voltaRes.getErr() != null) {

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

@@ -0,0 +1,66 @@
+package com.mokamrp.privates.controller.pangu;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.mokamrp.privates.constant.HttpStatus;
+import com.mokamrp.privates.entity.PostBasePageHandle;
+import com.mokamrp.privates.entity.SetIdsHandle;
+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.FosterwxCashMobileService;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashMobile;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import com.mokamrp.privates.controller.BaseController;
+import javax.validation.Valid;
+import java.time.LocalDateTime;
+import java.util.List;
+
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * <p>
+ * 盘古个微养号变现账号库 前端控制器
+ * </p>
+ *
+ * @author leon
+ * @since 2021-10-08
+ */
+@RestController
+@RequestMapping("/fosterwxCashMobile")
+public class FosterwxCashMobileController extends BaseController<FosterwxCashMobile> {
+
+    @Autowired
+    public FosterwxCashMobileService fosterwxCashMobileService;
+
+    /*
+     * @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<FosterwxCashMobile>> res = fosterwxCashMobileService.getList(postBasePageHandle);
+        return AjaxResult.success(res);
+    }
+
+    @PostMapping("/setDomain")
+    public Object setDoamin(@Valid @RequestBody SetIdsHandle setIdsHandle, BindingResult bindingResult){
+        if (bindingResult.hasErrors()) {
+            return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
+        }
+        FosterwxCashMobile save = new FosterwxCashMobile();
+        save.setDomainId(setIdsHandle.getId());
+        save.setUpdateAt(LocalDateTime.now());
+        fosterwxCashMobileService.update(save,new QueryWrapper<FosterwxCashMobile>().in("id",setIdsHandle.getIds()));
+        return AjaxResult.success();
+    }
+}
+

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

@@ -0,0 +1,83 @@
+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.help.AjaxResult;
+import com.mokamrp.privates.entity.ResHandle;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashTaskTemplate;
+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.FosterwxCashTaskListService;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashTaskList;
+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-08
+ */
+@RestController
+@RequestMapping("/fosterwxCashTaskList")
+public class FosterwxCashTaskListController extends BaseController<FosterwxCashTaskList> {
+
+    @Autowired
+    public FosterwxCashTaskListService fosterwxCashTaskListService;
+
+    /*
+     * @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<FosterwxCashTaskList>> res = fosterwxCashTaskListService.getList(postBasePageHandle);
+        return AjaxResult.success(res);
+    }
+
+    /**
+     * 软删除
+     * @param delHandle
+     * @param bindingResult
+     * @return
+     */
+    @PostMapping("/del")
+    public Object delete(@Valid @RequestBody DelHandle<FosterwxCashTaskList> delHandle, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
+        }
+        QueryWrapper<FosterwxCashTaskList> QueryWrapper = new QueryWrapper<>();
+        String[] ids = delHandle.getIds().split(",");
+        QueryWrapper.in("id", ids);
+        FosterwxCashTaskList save = new FosterwxCashTaskList();
+        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/controller/pangu/FosterwxCashTaskTemplateController.java

@@ -0,0 +1,86 @@
+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.help.AjaxResult;
+import com.mokamrp.privates.entity.ResHandle;
+import org.apache.tomcat.jni.Local;
+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.FosterwxCashTaskTemplateService;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashTaskTemplate;
+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-08
+ */
+@RestController
+@RequestMapping("/fosterwxCashTaskTemplate")
+public class FosterwxCashTaskTemplateController extends BaseController<FosterwxCashTaskTemplate> {
+
+    @Autowired
+    public FosterwxCashTaskTemplateService fosterwxCashTaskTemplateService;
+
+    /*
+     * @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<FosterwxCashTaskTemplate>> res = fosterwxCashTaskTemplateService.getList(postBasePageHandle);
+        return AjaxResult.success(res);
+    }
+
+    /**
+     * 软删除
+     * @param delHandle
+     * @param bindingResult
+     * @return
+     */
+    @PostMapping("/del")
+    public Object delete(@Valid @RequestBody DelHandle<FosterwxCashTaskTemplate> delHandle, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
+        }
+        QueryWrapper<FosterwxCashTaskTemplate> QueryWrapper = new QueryWrapper<>();
+        String[] ids = delHandle.getIds().split(",");
+        QueryWrapper.in("id", ids);
+        FosterwxCashTaskTemplate save = new FosterwxCashTaskTemplate();
+        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/controller/pangu/FosterwxMobileController.java

@@ -320,7 +320,20 @@ public class FosterwxMobileController extends BaseController<FosterwxMobile> {
         return AjaxResult.success("更新账号成功");
     }
 
-
+    /**
+     * 批量加入变现账号
+     * @param setIdsHandle
+     * @param bindingResult
+     * @return
+     */
+    @PostMapping("/addCashMobileList")
+    public Object addCashMobileList(@Valid @RequestBody SetIdsHandle setIdsHandle,BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
+        }
+        fosterwxMobileService.addCashMobileList(setIdsHandle.getIds());
+        return AjaxResult.success();
+    }
 
     /*
      *@Leon 以下接口为站点负责人后台页面接口，需要独立登陆才可访问

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

@@ -0,0 +1,15 @@
+package com.mokamrp.privates.entity;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
+@Data
+public class SetIdsHandle {
+    @NotEmpty(message = "ids不可为空")
+    private List<Integer> ids;
+
+    private Integer id;
+}

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

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

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

@@ -0,0 +1,23 @@
+<?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.FosterwxCashMobileMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashMobile">
+        <id column="id" property="id" />
+        <result column="group_id" property="groupId" />
+        <result column="station_id" property="stationId" />
+        <result column="mobile_id" property="mobileId" />
+        <result column="domain_id" property="domainId" />
+        <result column="create_at" property="createAt" />
+        <result column="update_at" property="updateAt" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, group_id, station_id, mobile_id, domain_id, create_at, update_at
+    </sql>
+    <select id="getList" resultType="com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashMobile">
+        SELECT * FROM pan_fosterwx_cash_mobile
+    </select>
+</mapper>

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

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

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

@@ -0,0 +1,35 @@
+<?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.FosterwxCashTaskListMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashTaskList">
+        <id column="id" property="id" />
+        <result column="template_id" property="templateId" />
+        <result column="task_type" property="taskType" />
+        <result column="task_name" property="taskName" />
+        <result column="title" property="title" />
+        <result column="image" property="image" />
+        <result column="box_type" property="boxType" />
+        <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="rich_txt_body" property="richTxtBody" />
+        <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, template_id, task_type, task_name, title, image, box_type, video_id, tag_id, card_image, url, rich_txt_body, remark, send_at, del_flg, create_uid, update_uid, create_at, update_at
+    </sql>
+    <select id="getList" resultType="com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashTaskList">
+        SELECT * FROM pan_fosterwx_cash_task_list where del_flg = 1
+    </select>
+</mapper>

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

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

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

@@ -0,0 +1,24 @@
+<?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.FosterwxCashTaskTemplateMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashTaskTemplate">
+        <id column="id" property="id" />
+        <result column="template_name" property="templateName" />
+        <result column="template_type" property="templateType" />
+        <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_name, template_type, del_flg, create_uid, update_uid, create_at, update_at
+    </sql>
+    <select id="getList" resultType="com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashTaskTemplate">
+        SELECT * FROM pan_fosterwx_cash_task_template where del_flg = 1
+    </select>
+</mapper>

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

@@ -0,0 +1,133 @@
+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.time.LocalDateTime;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 盘古个微养号变现账号库
+ * </p>
+ *
+ * @author leon
+ * @since 2021-10-08
+ */
+@TableName("pan_fosterwx_cash_mobile")
+public class FosterwxCashMobile extends Model<FosterwxCashMobile> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+      @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 分组
+     */
+    private Integer groupId;
+
+    /**
+     * 站点id(pan_fosterwx_station.id)
+     */
+    private Integer stationId;
+
+    /**
+     * 账号id
+     */
+    private Integer mobileId;
+
+    /**
+     * 域名id
+     */
+    private Integer domainId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createAt;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateAt;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getGroupId() {
+        return groupId;
+    }
+
+    public void setGroupId(Integer groupId) {
+        this.groupId = groupId;
+    }
+
+    public Integer getStationId() {
+        return stationId;
+    }
+
+    public void setStationId(Integer stationId) {
+        this.stationId = stationId;
+    }
+
+    public Integer getMobileId() {
+        return mobileId;
+    }
+
+    public void setMobileId(Integer mobileId) {
+        this.mobileId = mobileId;
+    }
+
+    public Integer getDomainId() {
+        return domainId;
+    }
+
+    public void setDomainId(Integer domainId) {
+        this.domainId = domainId;
+    }
+
+    public LocalDateTime getCreateAt() {
+        return createAt;
+    }
+
+    public void setCreateAt(LocalDateTime createAt) {
+        this.createAt = createAt;
+    }
+
+    public LocalDateTime getUpdateAt() {
+        return updateAt;
+    }
+
+    public void setUpdateAt(LocalDateTime updateAt) {
+        this.updateAt = updateAt;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "FosterwxCashMobile{" +
+        "id=" + id +
+        ", groupId=" + groupId +
+        ", stationId=" + stationId +
+        ", mobileId=" + mobileId +
+        ", domainId=" + domainId +
+        ", createAt=" + createAt +
+        ", updateAt=" + updateAt +
+        "}";
+    }
+}

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

@@ -0,0 +1,301 @@
+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.time.LocalDateTime;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 盘古微信变现任务列表
+ * </p>
+ *
+ * @author leon
+ * @since 2021-10-08
+ */
+@TableName("pan_fosterwx_cash_task_list")
+public class FosterwxCashTaskList extends Model<FosterwxCashTaskList> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+      @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 模板id
+     */
+    private Integer templateId;
+
+    /**
+     * 任务类型(1.发文-小程序卡片2.发文-图文3.小程序4.链接)
+     */
+    private Integer taskType;
+
+    /**
+     * 任务名称
+     */
+    private String taskName;
+
+    /**
+     * 发文标题
+     */
+    private String title;
+
+    /**
+     * 发文封面图
+     */
+    private String image;
+
+    /**
+     * 小程序类型(关联珊瑚云小程序类型)
+     */
+    private Integer boxType;
+
+    /**
+     * 珊瑚云视频id
+     */
+    private Integer videoId;
+
+    /**
+     * 珊瑚云标签id
+     */
+    private Integer tagId;
+
+    /**
+     * 卡片封面图
+     */
+    private String cardImage;
+
+    /**
+     * 链接
+     */
+    private String url;
+
+    /**
+     * 图文富文本内容
+     */
+    private String richTxtBody;
+
+    /**
+     * 任务描述
+     */
+    private String remark;
+
+    /**
+     * 发送时间
+     */
+    private LocalDateTime sendAt;
+
+    /**
+     * 删除标志
+     */
+    private Integer delFlg;
+
+    /**
+     * 创建人
+     */
+    private Integer createUid;
+
+    /**
+     * 更新人
+     */
+    private Integer updateUid;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createAt;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateAt;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getTemplateId() {
+        return templateId;
+    }
+
+    public void setTemplateId(Integer templateId) {
+        this.templateId = templateId;
+    }
+
+    public Integer getTaskType() {
+        return taskType;
+    }
+
+    public void setTaskType(Integer taskType) {
+        this.taskType = taskType;
+    }
+
+    public String getTaskName() {
+        return taskName;
+    }
+
+    public void setTaskName(String taskName) {
+        this.taskName = taskName;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getImage() {
+        return image;
+    }
+
+    public void setImage(String image) {
+        this.image = image;
+    }
+
+    public Integer getBoxType() {
+        return boxType;
+    }
+
+    public void setBoxType(Integer boxType) {
+        this.boxType = boxType;
+    }
+
+    public Integer getVideoId() {
+        return videoId;
+    }
+
+    public void setVideoId(Integer videoId) {
+        this.videoId = videoId;
+    }
+
+    public Integer getTagId() {
+        return tagId;
+    }
+
+    public void setTagId(Integer tagId) {
+        this.tagId = tagId;
+    }
+
+    public String getCardImage() {
+        return cardImage;
+    }
+
+    public void setCardImage(String cardImage) {
+        this.cardImage = cardImage;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getRichTxtBody() {
+        return richTxtBody;
+    }
+
+    public void setRichTxtBody(String richTxtBody) {
+        this.richTxtBody = richTxtBody;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public LocalDateTime getSendAt() {
+        return sendAt;
+    }
+
+    public void setSendAt(LocalDateTime sendAt) {
+        this.sendAt = sendAt;
+    }
+
+    public Integer getDelFlg() {
+        return delFlg;
+    }
+
+    public void setDelFlg(Integer delFlg) {
+        this.delFlg = delFlg;
+    }
+
+    public Integer getCreateUid() {
+        return createUid;
+    }
+
+    public void setCreateUid(Integer createUid) {
+        this.createUid = createUid;
+    }
+
+    public Integer getUpdateUid() {
+        return updateUid;
+    }
+
+    public void setUpdateUid(Integer updateUid) {
+        this.updateUid = updateUid;
+    }
+
+    public LocalDateTime getCreateAt() {
+        return createAt;
+    }
+
+    public void setCreateAt(LocalDateTime createAt) {
+        this.createAt = createAt;
+    }
+
+    public LocalDateTime getUpdateAt() {
+        return updateAt;
+    }
+
+    public void setUpdateAt(LocalDateTime updateAt) {
+        this.updateAt = updateAt;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "FosterwxCashTaskList{" +
+        "id=" + id +
+        ", templateId=" + templateId +
+        ", taskType=" + taskType +
+        ", taskName=" + taskName +
+        ", title=" + title +
+        ", image=" + image +
+        ", boxType=" + boxType +
+        ", videoId=" + videoId +
+        ", tagId=" + tagId +
+        ", cardImage=" + cardImage +
+        ", url=" + url +
+        ", richTxtBody=" + richTxtBody +
+        ", remark=" + remark +
+        ", sendAt=" + sendAt +
+        ", delFlg=" + delFlg +
+        ", createUid=" + createUid +
+        ", updateUid=" + updateUid +
+        ", createAt=" + createAt +
+        ", updateAt=" + updateAt +
+        "}";
+    }
+}

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

@@ -0,0 +1,147 @@
+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.time.LocalDateTime;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 盘古微信变现任务模版
+ * </p>
+ *
+ * @author leon
+ * @since 2021-10-08
+ */
+@TableName("pan_fosterwx_cash_task_template")
+public class FosterwxCashTaskTemplate extends Model<FosterwxCashTaskTemplate> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+      @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 模板名称
+     */
+    private String templateName;
+
+    /**
+     * 模板类型(1:个微任务 2:企微任务)
+     */
+    private Integer templateType;
+
+    /**
+     * 删除标志
+     */
+    private Integer delFlg;
+
+    /**
+     * 创建人
+     */
+    private Integer createUid;
+
+    /**
+     * 更新人
+     */
+    private Integer updateUid;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createAt;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateAt;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getTemplateName() {
+        return templateName;
+    }
+
+    public void setTemplateName(String templateName) {
+        this.templateName = templateName;
+    }
+
+    public Integer getTemplateType() {
+        return templateType;
+    }
+
+    public void setTemplateType(Integer templateType) {
+        this.templateType = templateType;
+    }
+
+    public Integer getDelFlg() {
+        return delFlg;
+    }
+
+    public void setDelFlg(Integer delFlg) {
+        this.delFlg = delFlg;
+    }
+
+    public Integer getCreateUid() {
+        return createUid;
+    }
+
+    public void setCreateUid(Integer createUid) {
+        this.createUid = createUid;
+    }
+
+    public Integer getUpdateUid() {
+        return updateUid;
+    }
+
+    public void setUpdateUid(Integer updateUid) {
+        this.updateUid = updateUid;
+    }
+
+    public LocalDateTime getCreateAt() {
+        return createAt;
+    }
+
+    public void setCreateAt(LocalDateTime createAt) {
+        this.createAt = createAt;
+    }
+
+    public LocalDateTime getUpdateAt() {
+        return updateAt;
+    }
+
+    public void setUpdateAt(LocalDateTime updateAt) {
+        this.updateAt = updateAt;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "FosterwxCashTaskTemplate{" +
+        "id=" + id +
+        ", templateName=" + templateName +
+        ", templateType=" + templateType +
+        ", delFlg=" + delFlg +
+        ", createUid=" + createUid +
+        ", updateUid=" + updateUid +
+        ", createAt=" + createAt +
+        ", updateAt=" + updateAt +
+        "}";
+    }
+}

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

@@ -36,6 +36,7 @@ public class FosterwxMobile extends Model<FosterwxMobile> {
      */
     private Integer stationId;
 
+
     /**
      * 手机编号
      */
@@ -198,278 +199,4 @@ public class FosterwxMobile extends Model<FosterwxMobile> {
 
     @TableField(exist = false)
     private Integer incomeFansType;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getStationId() {
-        return stationId;
-    }
-
-    public void setStationId(Integer stationId) {
-        this.stationId = stationId;
-    }
-
-    public String getMobileUnioCode() {
-        return mobileUnioCode;
-    }
-
-    public void setMobileUnioCode(String mobileUnioCode) {
-        this.mobileUnioCode = mobileUnioCode;
-    }
-
-    public String getMobileNo() {
-        return mobileNo;
-    }
-
-    public void setMobileNo(String mobileNo) {
-        this.mobileNo = mobileNo;
-    }
-
-    public Integer getMobileOperator() {
-        return mobileOperator;
-    }
-
-    public void setMobileOperator(Integer mobileOperator) {
-        this.mobileOperator = mobileOperator;
-    }
-
-    public LocalDateTime getMobileCreateAt() {
-        return mobileCreateAt;
-    }
-
-    public void setMobileCreateAt(LocalDateTime mobileCreateAt) {
-        this.mobileCreateAt = mobileCreateAt;
-    }
-
-    public Integer getMobileAdvancePayAmt() {
-        return mobileAdvancePayAmt;
-    }
-
-    public void setMobileAdvancePayAmt(Integer mobileAdvancePayAmt) {
-        this.mobileAdvancePayAmt = mobileAdvancePayAmt;
-    }
-
-    public String getMobileCombo() {
-        return mobileCombo;
-    }
-
-    public void setMobileCombo(String mobileCombo) {
-        this.mobileCombo = mobileCombo;
-    }
-
-    public String getMobileComboFlow() {
-        return mobileComboFlow;
-    }
-
-    public void setMobileComboFlow(String mobileComboFlow) {
-        this.mobileComboFlow = mobileComboFlow;
-    }
-
-    public String getMobileRealName() {
-        return mobileRealName;
-    }
-
-    public void setMobileRealName(String mobileRealName) {
-        this.mobileRealName = mobileRealName;
-    }
-
-    public String getMobileIdentityCardNo() {
-        return mobileIdentityCardNo;
-    }
-
-    public void setMobileIdentityCardNo(String mobileIdentityCardNo) {
-        this.mobileIdentityCardNo = mobileIdentityCardNo;
-    }
-
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    public Integer getWxStatus() {
-        return wxStatus;
-    }
-
-    public void setWxStatus(Integer wxStatus) {
-        this.wxStatus = wxStatus;
-    }
-
-
-    public Integer getInPool() {
-        return inPool;
-    }
-
-    public void setInPool(Integer inPool) {
-        this.inPool = inPool;
-    }
-
-    public String getWxPassword() {
-        return wxPassword;
-    }
-
-    public void setWxPassword(String wxPassword) {
-        this.wxPassword = wxPassword;
-    }
-
-    public String getWxRealName() {
-        return wxRealName;
-    }
-
-    public void setWxRealName(String wxRealName) {
-        this.wxRealName = wxRealName;
-    }
-
-    public String getWxIdentityCardNo() {
-        return wxIdentityCardNo;
-    }
-
-    public void setWxIdentityCardNo(String wxIdentityCardNo) {
-        this.wxIdentityCardNo = wxIdentityCardNo;
-    }
-
-    public LocalDateTime getWxRegisterAt() {
-        return wxRegisterAt;
-    }
-
-    public void setWxRegisterAt(LocalDateTime wxRegisterAt) {
-        this.wxRegisterAt = wxRegisterAt;
-    }
-
-    public String getWxAppid() {
-        return wxAppid;
-    }
-
-    public void setWxAppid(String wxAppid) {
-        this.wxAppid = wxAppid;
-    }
-
-    public String getBankCardNo() {
-        return bankCardNo;
-    }
-
-    public void setBankCardNo(String bankCardNo) {
-        this.bankCardNo = bankCardNo;
-    }
-
-    public String getBankCardMobileNo() {
-        return bankCardMobileNo;
-    }
-
-    public void setBankCardMobileNo(String bankCardMobileNo) {
-        this.bankCardMobileNo = bankCardMobileNo;
-    }
-
-    public Integer getWorkWxCorpId() {
-        return workWxCorpId;
-    }
-
-    public void setWorkWxCorpId(Integer workWxCorpId) {
-        this.workWxCorpId = workWxCorpId;
-    }
-
-    public String getWorkWxCorp() {
-        return workWxCorp;
-    }
-
-    public void setWorkWxCorp(String workWxCorp) {
-        this.workWxCorp = workWxCorp;
-    }
-
-    public LocalDateTime getWorkWxRegisterAt() {
-        return workWxRegisterAt;
-    }
-
-    public void setWorkWxRegisterAt(LocalDateTime workWxRegisterAt) {
-        this.workWxRegisterAt = workWxRegisterAt;
-    }
-
-    public Integer getWorkWxStatus() {
-        return workWxStatus;
-    }
-
-    public void setWorkWxStatus(Integer workWxStatus) {
-        this.workWxStatus = workWxStatus;
-    }
-
-    public LocalDateTime getTaskStartAt() {
-        return taskStartAt;
-    }
-
-    public void setTaskStartAt(LocalDateTime taskStartAt) {
-        this.taskStartAt = taskStartAt;
-    }
-
-    public String getCodeUrl() {
-        return codeUrl;
-    }
-
-    public void setCodeUrl(String codeUrl) {
-        this.codeUrl = codeUrl;
-    }
-
-    public LocalDateTime getCreateAt() {
-        return createAt;
-    }
-
-    public void setCreateAt(LocalDateTime createAt) {
-        this.createAt = createAt;
-    }
-
-    public LocalDateTime getUpdateAt() {
-        return updateAt;
-    }
-
-    public void setUpdateAt(LocalDateTime updateAt) {
-        this.updateAt = updateAt;
-    }
-
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
-    }
-
-    @Override
-    public String toString() {
-        return "FosterwxMobile{" +
-                "id=" + id +
-                ", stationId=" + stationId +
-                ", mobileCode=" + mobileCode +
-                ", mobileUnioCode=" + mobileUnioCode +
-                ", mobileNo=" + mobileNo +
-                ", mobileOperator=" + mobileOperator +
-                ", mobileCreateAt=" + mobileCreateAt +
-                ", mobileAdvancePayAmt=" + mobileAdvancePayAmt +
-                ", mobileCombo=" + mobileCombo +
-                ", mobileComboFlow=" + mobileComboFlow +
-                ", mobileRealName=" + mobileRealName +
-                ", mobileIdentityCardNo=" + mobileIdentityCardNo +
-                ", status=" + status +
-                ", wxStatus=" + wxStatus +
-                ", wxPassword=" + wxPassword +
-                ", wxRealName=" + wxRealName +
-                ", wxIdentityCardNo=" + wxIdentityCardNo +
-                ", wxRegisterAt=" + wxRegisterAt +
-                ", wxAppid=" + wxAppid +
-                ", bankCardNo=" + bankCardNo +
-                ", bankCardMobileNo=" + bankCardMobileNo +
-                ", workWxCorpId=" + workWxCorpId +
-                ", workWxCorp=" + workWxCorp +
-                ", workWxRegisterAt=" + workWxRegisterAt +
-                ", workWxStatus=" + workWxStatus +
-                ", inPool=" + inPool +
-                ", taskStartAt=" + taskStartAt +
-                ", codeUrl=" + codeUrl +
-                ", createAt=" + createAt +
-                ", updateAt=" + updateAt +
-                "}";
-    }
 }

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

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

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

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

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

@@ -0,0 +1,20 @@
+package com.mokamrp.privates.service.pangu;
+
+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 java.util.List;
+import java.util.Map;
+/**
+ * <p>
+ * 盘古微信变现任务模版 服务类
+ * </p>
+ *
+ * @author leon
+ * @since 2021-10-08
+ */
+public interface FosterwxCashTaskTemplateService extends IService<FosterwxCashTaskTemplate> {
+    //.@leon 获取数据列表
+    public ResHandle<List<FosterwxCashTaskTemplate>> getList(PostBasePageHandle handle);
+}

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

@@ -28,4 +28,7 @@ public interface FosterwxMobileService extends IService<FosterwxMobile> {
     public VoltaHandle<Boolean> importData(List<Map<String,String>> row, User authUser) throws Exception;
 
     public List<FosterwxMobileVo> setWxFriend(List<FosterwxMobileVo> list);
+    //.@leon 批量加入变现账号
+    public Boolean addCashMobileList(List<Integer> mobileIds);
+
 }

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

@@ -55,12 +55,8 @@ public interface FosterwxTaskScheduleService extends IService<FosterwxTaskSchedu
      */
     public String getMobileCodeCombine(List<FosterwxTaskSchedule> fosterwxTaskScheduleList);
 
-    /**
-     * 根据站点 手机号获取账号任务详情
-     * @param stationId
-     * @param mobileCode
-     * @param date
-     * @param type (1:个微任务,2:企微任务)
-     */
+    //. 根据站点 手机号获取账号任务详情
     List<FosterwxTaskSchedule> getTaskListByMobileCode(Integer stationId, Integer mobileCode, String date, Integer type);
+
+    public void syncTaskToRedis(Integer stationId);
 }

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

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

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

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

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

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

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

@@ -59,6 +59,7 @@ public class FosterwxMobileServiceImpl extends ServiceImpl<FosterwxMobileMapper,
 
     /**
      * 获取数据列表 支持分页
+     *
      * @param handle
      * @return
      */
@@ -90,6 +91,7 @@ public class FosterwxMobileServiceImpl extends ServiceImpl<FosterwxMobileMapper,
 
     /**
      * 获取指定站点下账号列表
+     *
      * @param getForsterwxMobileHandle
      * @param stationId
      * @return
@@ -105,6 +107,7 @@ public class FosterwxMobileServiceImpl extends ServiceImpl<FosterwxMobileMapper,
 
     /**
      * 导入数据
+     *
      * @param row
      * @return
      */
@@ -247,6 +250,28 @@ public class FosterwxMobileServiceImpl extends ServiceImpl<FosterwxMobileMapper,
         return list;
     }
 
+    /**
+     * 批量加入变现账号
+     * @param mobileIds
+     * @return
+     */
+    public Boolean addCashMobileList(List<Integer> mobileIds) {
+        LocalDateTime now = LocalDateTime.now();
+        for (Integer id : mobileIds) {
+            FosterwxMobile fosterwxMobile = this.getOne(new QueryWrapper<FosterwxMobile>().eq("id", id));
+            if (fosterwxMobile != null) {
+                continue;
+            }
+            FosterwxCashMobile add = new FosterwxCashMobile();
+            add.setMobileId(fosterwxMobile.getId());
+            add.setStationId(fosterwxMobile.getStationId());
+            add.setCreateAt(now);
+            add.setUpdateAt(now);
+            this.save(fosterwxMobile);
+        }
+        return true;
+    }
+
     private Boolean checkWxFriendCnt(List<FosterwxMobileWxfriend> row, String wxName) {
         Integer findCnt = 0;
         for (FosterwxMobileWxfriend fosterwxMobileWxfriend : row) {

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

@@ -1,9 +1,11 @@
 package com.mokamrp.privates.service.pangu.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mokamrp.privates.constant.RedisKey;
 import com.mokamrp.privates.entity.ResHandle;
 import com.mokamrp.privates.entity.pangu.FosterwxTaskScheduleHandle;
 import com.mokamrp.privates.help.AjaxResult;
@@ -12,15 +14,21 @@ import com.mokamrp.privates.mapper.pangu.FosterwxTaskListMapper;
 import com.mokamrp.privates.mapper.pangu.FosterwxTaskScheduleMapper;
 import com.mokamrp.privates.mapper.pangu.pojo.*;
 import com.mokamrp.privates.mapper.pojo.User;
+import com.mokamrp.privates.service.pangu.FosterwxStationService;
+import com.mokamrp.privates.service.pangu.FosterwxTaskListService;
 import com.mokamrp.privates.service.pangu.FosterwxTaskScheduleService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -42,6 +50,15 @@ public class FosterwxTaskScheduleServiceImpl extends ServiceImpl<FosterwxTaskSch
     @Autowired
     private FosterwxTaskListMapper fosterwxTaskListMapper;
 
+    @Autowired
+    private FosterwxTaskListService fosterwxTaskListService;
+
+    @Autowired
+    private FosterwxStationService fosterwxStationService;
+
+    @Autowired
+    private StringRedisTemplate stringRedisTemplate;
+
     /**
      * 获取数据列表 支持分页
      * @param handle
@@ -297,4 +314,93 @@ public class FosterwxTaskScheduleServiceImpl extends ServiceImpl<FosterwxTaskSch
 
         return fosterwxTaskScheduleMapper.selectList(fosterwxTaskScheduleLambdaQueryWrapper);
     }
+
+    public void syncTaskToRedis(Integer stationId) {
+        System.out.println("[cronjob]:同步微信养号任务到REDIS");
+        List<LocalDateTime> dates = new ArrayList<>();
+        LocalDateTime yesterDay = LocalDateTime.now().plusDays(-1);
+        dates.add(LocalDateTime.of(yesterDay.toLocalDate(), LocalTime.MAX)); //.昨天
+        dates.add(LocalDateTime.now()); //.今天
+        List<FosterwxStation> fosterwxStationList = fosterwxStationService.list();
+        Map<String, List<FosterwxTaskSchedule>> saveWxRedis = new HashMap<>();  //.type 1
+        Map<String, List<FosterwxTaskSchedule>> saveWxworkRedis = new HashMap<>(); //. type 2
+        for (Integer i = 0; i < dates.size(); i++) {
+            LocalDateTime nowDate = dates.get(i);
+            LocalDateTime startTime = LocalDateTime.of(nowDate.toLocalDate(), LocalTime.MIN);
+            List<Integer> tasks = new ArrayList<>();
+            FosterwxTaskScheduleHandle fosterwxTaskScheduleHandle = new FosterwxTaskScheduleHandle();
+            fosterwxTaskScheduleHandle.setStationId(stationId);
+            fosterwxTaskScheduleHandle.setSendTime(nowDate);
+            fosterwxTaskScheduleHandle.setPage(1);
+            fosterwxTaskScheduleHandle.setPagesize(99999);
+            ResHandle<List<FosterwxTaskSchedule>> resHandle = this.getList(fosterwxTaskScheduleHandle);
+            System.out.println(resHandle);
+            List<FosterwxTaskSchedule> fosterwxTaskScheduleList = resHandle.getList();
+            for (FosterwxTaskSchedule fosterwxTaskSchedule : fosterwxTaskScheduleList) {
+                String sendDate = fosterwxTaskSchedule.getSendDate().toString();
+                FosterwxTaskScheduleHandle handle = new FosterwxTaskScheduleHandle();
+                handle.setTaskId(fosterwxTaskSchedule.getTaskId());
+                handle.setStationId(fosterwxTaskSchedule.getStationId());
+                handle.setSendDate(fosterwxTaskSchedule.getSendDate());
+                FosterwxTaskSchedule taskInfo = this.getInfo(handle);
+                if (taskInfo == null) {
+                    continue;
+                }
+                tasks.add(fosterwxTaskSchedule.getTaskId());
+                //.视频信息
+                FosterwxTaskList fosterwxTaskInfo = fosterwxTaskListService.getById(fosterwxTaskSchedule.getTaskId());
+                // 临时任务任务列表中无法获取信息
+                if (null != fosterwxTaskInfo) {
+                    fosterwxTaskSchedule.setVideoId(fosterwxTaskInfo.getVideoId());
+                }
+                //.任务详细信息
+                fosterwxTaskSchedule.setMobileCount(taskInfo.getMobileCount());
+                fosterwxTaskSchedule.setComment(taskInfo.getComment());
+                if (fosterwxTaskSchedule.getType() == 1) {
+                    //.个微任务
+                    List<FosterwxTaskSchedule> sendDateDetail = saveWxRedis.get(sendDate);
+                    if (sendDateDetail == null) {
+                        List<FosterwxTaskSchedule> firstAdd = new ArrayList<>();
+                        firstAdd.add(fosterwxTaskSchedule);
+                        saveWxRedis.put(sendDate, firstAdd);
+                    } else {
+                        sendDateDetail.add(fosterwxTaskSchedule);
+                        saveWxRedis.put(sendDate, sendDateDetail);
+                    }
+                } else if (fosterwxTaskSchedule.getType() == 2) {
+                    //.企微任务
+                    List<FosterwxTaskSchedule> sendDateDetail = saveWxworkRedis.get(sendDate);
+                    if (sendDateDetail == null) {
+                        List<FosterwxTaskSchedule> firstAdd = new ArrayList<>();
+                        firstAdd.add(fosterwxTaskSchedule);
+                        saveWxworkRedis.put(sendDate, firstAdd);
+                    } else {
+                        sendDateDetail.add(fosterwxTaskSchedule);
+                        saveWxworkRedis.put(sendDate, sendDateDetail);
+                    }
+                }
+            }
+            //.任务状态改为 已发送
+            if (tasks.size() > 0) {
+                FosterwxTaskSchedule save = new FosterwxTaskSchedule();
+                save.setTaskSendStatus(1);
+                this.update(save, new QueryWrapper<FosterwxTaskSchedule>()
+                        .eq("station_id", stationId)
+                        .in("task_id", tasks)
+                        .apply("UNIX_TIMESTAMP(send_time) >= UNIX_TIMESTAMP('" + startTime + "')")
+                        .apply("UNIX_TIMESTAMP(send_time) <= UNIX_TIMESTAMP('" + nowDate + "')")
+                );
+            }
+            tasks.clear();
+
+            for (Map.Entry<String, List<FosterwxTaskSchedule>> entry : saveWxRedis.entrySet()) {
+                stringRedisTemplate.opsForHash().put(RedisKey.PanWxfosterTask + stationId, entry.getKey(), JSON.toJSONString(entry.getValue()));
+            }
+            for (Map.Entry<String, List<FosterwxTaskSchedule>> entry : saveWxworkRedis.entrySet()) {
+                stringRedisTemplate.opsForHash().put(RedisKey.PanWxworkfosterTask + stationId, entry.getKey(), JSON.toJSONString(entry.getValue()));
+            }
+            saveWxRedis.clear();
+            saveWxworkRedis.clear();
+        }
+    }
 }

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

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