Ver Fonte

增加变现任务相关

leon há 4 anos atrás
pai
commit
17b2bd7825
23 ficheiros alterados com 705 adições e 9 exclusões
  1. 1 1
      src/main/java/com/mokamrp/privates/controller/pangu/FosterwxCashMobileController.java
  2. 55 0
      src/main/java/com/mokamrp/privates/controller/pangu/FosterwxCashMobileGroupController.java
  3. 55 0
      src/main/java/com/mokamrp/privates/controller/pangu/FosterwxCashOasBoxController.java
  4. 1 1
      src/main/java/com/mokamrp/privates/controller/pangu/FosterwxCashTaskListController.java
  5. 1 1
      src/main/java/com/mokamrp/privates/controller/pangu/FosterwxCashTaskTemplateController.java
  6. 2 0
      src/main/java/com/mokamrp/privates/entity/PostBasePageHandle.java
  7. 21 0
      src/main/java/com/mokamrp/privates/mapper/pangu/FosterwxCashMobileGroupMapper.java
  8. 26 0
      src/main/java/com/mokamrp/privates/mapper/pangu/FosterwxCashMobileGroupMapper.xml
  9. 2 1
      src/main/java/com/mokamrp/privates/mapper/pangu/FosterwxCashMobileMapper.java
  10. 10 1
      src/main/java/com/mokamrp/privates/mapper/pangu/FosterwxCashMobileMapper.xml
  11. 21 0
      src/main/java/com/mokamrp/privates/mapper/pangu/FosterwxCashOasBoxMapper.java
  12. 29 0
      src/main/java/com/mokamrp/privates/mapper/pangu/FosterwxCashOasBoxMapper.xml
  13. 13 0
      src/main/java/com/mokamrp/privates/mapper/pangu/pojo/FosterwxCashMobile.java
  14. 100 0
      src/main/java/com/mokamrp/privates/mapper/pangu/pojo/FosterwxCashMobileGroup.java
  15. 217 0
      src/main/java/com/mokamrp/privates/mapper/pangu/pojo/FosterwxCashOasBox.java
  16. 20 0
      src/main/java/com/mokamrp/privates/service/pangu/FosterwxCashMobileGroupService.java
  17. 20 0
      src/main/java/com/mokamrp/privates/service/pangu/FosterwxCashOasBoxService.java
  18. 3 0
      src/main/java/com/mokamrp/privates/service/pangu/FosterwxCashTaskTemplateService.java
  19. 43 0
      src/main/java/com/mokamrp/privates/service/pangu/impl/FosterwxCashMobileGroupServiceImpl.java
  20. 2 2
      src/main/java/com/mokamrp/privates/service/pangu/impl/FosterwxCashMobileServiceImpl.java
  21. 43 0
      src/main/java/com/mokamrp/privates/service/pangu/impl/FosterwxCashOasBoxServiceImpl.java
  22. 19 0
      src/main/java/com/mokamrp/privates/service/pangu/impl/FosterwxCashTaskTemplateServiceImpl.java
  23. 1 2
      src/test/java/com/mokamrp/AutoMPPangu.java

+ 1 - 1
src/main/java/com/mokamrp/privates/controller/pangu/FosterwxCashMobileController.java

@@ -30,7 +30,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2021-10-08
  */
 @RestController
-@RequestMapping("/fosterwxCashMobile")
+@RequestMapping("/pangu/fosterwxCashMobile")
 public class FosterwxCashMobileController extends BaseController<FosterwxCashMobile> {
 
     @Autowired

+ 55 - 0
src/main/java/com/mokamrp/privates/controller/pangu/FosterwxCashMobileGroupController.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.FosterwxCashMobileGroupService;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashMobileGroup;
+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-08
+ */
+@RestController
+@RequestMapping("/pangu/fosterwxCashMobileGroup")
+public class FosterwxCashMobileGroupController extends BaseController<FosterwxCashMobileGroup> {
+
+    @Autowired
+    public FosterwxCashMobileGroupService fosterwxCashMobileGroupService;
+
+    /*
+     * @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<FosterwxCashMobileGroup>> res = fosterwxCashMobileGroupService.getList(postBasePageHandle);
+        return AjaxResult.success(res);
+    }
+
+
+}
+

+ 55 - 0
src/main/java/com/mokamrp/privates/controller/pangu/FosterwxCashOasBoxController.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.FosterwxCashOasBoxService;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashOasBox;
+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-09
+ */
+@RestController
+@RequestMapping("/pangu/fosterwxCashOasBox")
+public class FosterwxCashOasBoxController extends BaseController<FosterwxCashOasBox> {
+
+    @Autowired
+    public FosterwxCashOasBoxService fosterwxCashOasBoxService;
+
+    /*
+     * @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<FosterwxCashOasBox>> res = fosterwxCashOasBoxService.getList(postBasePageHandle);
+        return AjaxResult.success(res);
+    }
+
+
+}
+

+ 1 - 1
src/main/java/com/mokamrp/privates/controller/pangu/FosterwxCashTaskListController.java

@@ -34,7 +34,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2021-10-08
  */
 @RestController
-@RequestMapping("/fosterwxCashTaskList")
+@RequestMapping("/pangu/fosterwxCashTaskList")
 public class FosterwxCashTaskListController extends BaseController<FosterwxCashTaskList> {
 
     @Autowired

+ 1 - 1
src/main/java/com/mokamrp/privates/controller/pangu/FosterwxCashTaskTemplateController.java

@@ -34,7 +34,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2021-10-08
  */
 @RestController
-@RequestMapping("/fosterwxCashTaskTemplate")
+@RequestMapping("/pangu/fosterwxCashTaskTemplate")
 public class FosterwxCashTaskTemplateController extends BaseController<FosterwxCashTaskTemplate> {
 
     @Autowired

+ 2 - 0
src/main/java/com/mokamrp/privates/entity/PostBasePageHandle.java

@@ -7,6 +7,8 @@ public class PostBasePageHandle {
     private Integer page;
     private Integer pagesize;
     private Integer id;
+    private Integer groupId;
+    private String name;
     public Integer getPage() {
         return page;
     }

+ 21 - 0
src/main/java/com/mokamrp/privates/mapper/pangu/FosterwxCashMobileGroupMapper.java

@@ -0,0 +1,21 @@
+package com.mokamrp.privates.mapper.pangu;
+
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashMobileGroup;
+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 FosterwxCashMobileGroupMapper extends BaseMapper<FosterwxCashMobileGroup> {
+    public List<FosterwxCashMobileGroup> getList(Page<FosterwxCashMobileGroup> pageObj);
+}

+ 26 - 0
src/main/java/com/mokamrp/privates/mapper/pangu/FosterwxCashMobileGroupMapper.xml

@@ -0,0 +1,26 @@
+<?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.FosterwxCashMobileGroupMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashMobileGroup">
+        <id column="id" property="id"/>
+        <result column="dept_id" property="deptId"/>
+        <result column="group_name" property="groupName"/>
+        <result column="create_at" property="createAt"/>
+        <result column="update_at" property="updateAt"/>
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id
+        , dept_id, group_name, create_at, update_at
+    </sql>
+    <select id="getList" resultType="com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashMobileGroup">
+        SELECT A.*, B.cnt, B.group_id
+        FROM pan_fosterwx_cash_mobile_group as A
+        LEFT JOIN (SELECT COUNT(id) AS cnt, group_id
+        from pan_fosterwx_cash_mobile
+        GROUP BY group_id) AS B ON A.id = B.group_id
+    </select>
+</mapper>

+ 2 - 1
src/main/java/com/mokamrp/privates/mapper/pangu/FosterwxCashMobileMapper.java

@@ -1,5 +1,6 @@
 package com.mokamrp.privates.mapper.pangu;
 
+import com.mokamrp.privates.entity.PostBasePageHandle;
 import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashMobile;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -17,5 +18,5 @@ import java.util.List;
  */
 @Component
 public interface FosterwxCashMobileMapper extends BaseMapper<FosterwxCashMobile> {
-    public List<FosterwxCashMobile> getList(Page<FosterwxCashMobile> pageObj);
+    public List<FosterwxCashMobile> getList(Page<FosterwxCashMobile> pageObj, @Param("params")PostBasePageHandle handle);
 }

+ 10 - 1
src/main/java/com/mokamrp/privates/mapper/pangu/FosterwxCashMobileMapper.xml

@@ -18,6 +18,15 @@
         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 A.*,
+               B.mobile_code,
+               B.mobile_unio_code,
+               C.station_name
+        FROM pan_fosterwx_cash_mobile as A
+        left join pan_fosterwx_mobile as B on A.mobile_id = B.id
+        left join pan_fosterwx_station as C on A.station_id = C.id
+        <where>
+            <if test="params.groupId != null">and group_id = #{params.groupId}</if>
+        </where>
     </select>
 </mapper>

+ 21 - 0
src/main/java/com/mokamrp/privates/mapper/pangu/FosterwxCashOasBoxMapper.java

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

+ 29 - 0
src/main/java/com/mokamrp/privates/mapper/pangu/FosterwxCashOasBoxMapper.xml

@@ -0,0 +1,29 @@
+<?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.FosterwxCashOasBoxMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashOasBox">
+        <id column="id" property="id" />
+        <result column="station_id" property="stationId" />
+        <result column="group_id" property="groupId" />
+        <result column="type" property="type" />
+        <result column="box_type" property="boxType" />
+        <result column="box_location" property="boxLocation" />
+        <result column="gh_id" property="ghId" />
+        <result column="name" property="name" />
+        <result column="scope" property="scope" />
+        <result column="remark" property="remark" />
+        <result column="upload_uid" property="uploadUid" />
+        <result column="create_at" property="createAt" />
+        <result column="update_at" property="updateAt" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, station_id, group_id, type, box_type, box_location, gh_id, name, scope, remark, upload_uid, create_at, update_at
+    </sql>
+    <select id="getList" resultType="com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashOasBox">
+        SELECT * FROM pan_fosterwx_cash_oas_box
+    </select>
+</mapper>

+ 13 - 0
src/main/java/com/mokamrp/privates/mapper/pangu/pojo/FosterwxCashMobile.java

@@ -1,9 +1,12 @@
 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.LocalDateTime;
 import java.io.Serializable;
 
@@ -15,6 +18,7 @@ import java.io.Serializable;
  * @author leon
  * @since 2021-10-08
  */
+@Data
 @TableName("pan_fosterwx_cash_mobile")
 public class FosterwxCashMobile extends Model<FosterwxCashMobile> {
 
@@ -46,6 +50,15 @@ public class FosterwxCashMobile extends Model<FosterwxCashMobile> {
      */
     private Integer domainId;
 
+    @TableField(exist = false)
+    private String stationName;
+
+    @TableField(exist = false)
+    private String mobileCode;
+
+    @TableField(exist = false)
+    private String mobileUnioCode;
+
     /**
      * 创建时间
      */

+ 100 - 0
src/main/java/com/mokamrp/privates/mapper/pangu/pojo/FosterwxCashMobileGroup.java

@@ -0,0 +1,100 @@
+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.LocalDateTime;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 盘古微信养号变现账号分组
+ * </p>
+ *
+ * @author leon
+ * @since 2021-10-08
+ */
+@Data
+@TableName("pan_fosterwx_cash_mobile_group")
+public class FosterwxCashMobileGroup extends Model<FosterwxCashMobileGroup> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @TableField(exist = false)
+    private Integer cnt;
+
+    /**
+     * 部门ID
+     */
+    private String deptId;
+
+    private String groupName;
+
+    private LocalDateTime createAt;
+
+    private LocalDateTime updateAt;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(String deptId) {
+        this.deptId = deptId;
+    }
+
+    public String getGroupName() {
+        return groupName;
+    }
+
+    public void setGroupName(String groupName) {
+        this.groupName = groupName;
+    }
+
+    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 "FosterwxCashMobileGroup{" +
+                "id=" + id +
+                ", deptId=" + deptId +
+                ", groupName=" + groupName +
+                ", createAt=" + createAt +
+                ", updateAt=" + updateAt +
+                "}";
+    }
+}

+ 217 - 0
src/main/java/com/mokamrp/privates/mapper/pangu/pojo/FosterwxCashOasBox.java

@@ -0,0 +1,217 @@
+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-09
+ */
+@TableName("pan_fosterwx_cash_oas_box")
+public class FosterwxCashOasBox extends Model<FosterwxCashOasBox> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+      @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 站点ID
+     */
+    private Integer stationId;
+
+    /**
+     * 分组ID
+     */
+    private Integer groupId;
+
+    /**
+     * 类型(1.小程序2.公众号)
+     */
+    private Integer type;
+
+    /**
+     * 小程序类型(对接珊瑚云类型)
+     */
+    private Integer boxType;
+
+    /**
+     * 小程序位置(1.发文小程序2.直跳小程序,单选)
+     */
+    private Integer boxLocation;
+
+    /**
+     * gh_id
+     */
+    private String ghId;
+
+    /**
+     * 小程序/公众号名称
+     */
+    private String name;
+
+    /**
+     * 使用场景
+     */
+    private String scope;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 上传人
+     */
+    private Integer uploadUid;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createAt;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateAt;
+
+
+    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 Integer getGroupId() {
+        return groupId;
+    }
+
+    public void setGroupId(Integer groupId) {
+        this.groupId = groupId;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public Integer getBoxType() {
+        return boxType;
+    }
+
+    public void setBoxType(Integer boxType) {
+        this.boxType = boxType;
+    }
+
+    public Integer getBoxLocation() {
+        return boxLocation;
+    }
+
+    public void setBoxLocation(Integer boxLocation) {
+        this.boxLocation = boxLocation;
+    }
+
+    public String getGhId() {
+        return ghId;
+    }
+
+    public void setGhId(String ghId) {
+        this.ghId = ghId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getScope() {
+        return scope;
+    }
+
+    public void setScope(String scope) {
+        this.scope = scope;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public Integer getUploadUid() {
+        return uploadUid;
+    }
+
+    public void setUploadUid(Integer uploadUid) {
+        this.uploadUid = uploadUid;
+    }
+
+    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 "FosterwxCashOasBox{" +
+        "id=" + id +
+        ", stationId=" + stationId +
+        ", groupId=" + groupId +
+        ", type=" + type +
+        ", boxType=" + boxType +
+        ", boxLocation=" + boxLocation +
+        ", ghId=" + ghId +
+        ", name=" + name +
+        ", scope=" + scope +
+        ", remark=" + remark +
+        ", uploadUid=" + uploadUid +
+        ", createAt=" + createAt +
+        ", updateAt=" + updateAt +
+        "}";
+    }
+}

+ 20 - 0
src/main/java/com/mokamrp/privates/service/pangu/FosterwxCashMobileGroupService.java

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

+ 20 - 0
src/main/java/com/mokamrp/privates/service/pangu/FosterwxCashOasBoxService.java

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

+ 3 - 0
src/main/java/com/mokamrp/privates/service/pangu/FosterwxCashTaskTemplateService.java

@@ -1,5 +1,6 @@
 package com.mokamrp.privates.service.pangu;
 
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashTaskList;
 import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashTaskTemplate;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.mokamrp.privates.entity.PostBasePageHandle;
@@ -17,4 +18,6 @@ import java.util.Map;
 public interface FosterwxCashTaskTemplateService extends IService<FosterwxCashTaskTemplate> {
     //.@leon 获取数据列表
     public ResHandle<List<FosterwxCashTaskTemplate>> getList(PostBasePageHandle handle);
+    //.@leon 通过模板ID获取模板内详细任务
+    public ResHandle<List<FosterwxCashTaskList>> getTaskByTemplateId(Integer id);
 }

+ 43 - 0
src/main/java/com/mokamrp/privates/service/pangu/impl/FosterwxCashMobileGroupServiceImpl.java

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

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

@@ -33,8 +33,8 @@ public class FosterwxCashMobileServiceImpl extends ServiceImpl<FosterwxCashMobil
     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);
+        Page<FosterwxCashMobile> pageObj = new Page<>(page, pagesize);
+        List<FosterwxCashMobile> list = fosterwxCashMobileMapper.getList(pageObj,handle);
         ResHandle<List<FosterwxCashMobile>> res = new ResHandle<>();
         res.setList(list);
         res.setTotal(pageObj.getTotal());

+ 43 - 0
src/main/java/com/mokamrp/privates/service/pangu/impl/FosterwxCashOasBoxServiceImpl.java

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

+ 19 - 0
src/main/java/com/mokamrp/privates/service/pangu/impl/FosterwxCashTaskTemplateServiceImpl.java

@@ -1,7 +1,10 @@
 package com.mokamrp.privates.service.pangu.impl;
 
+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.service.pangu.FosterwxCashTaskListService;
 import com.mokamrp.privates.service.pangu.FosterwxCashTaskTemplateService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
@@ -25,6 +28,9 @@ public class FosterwxCashTaskTemplateServiceImpl extends ServiceImpl<FosterwxCas
 
     @Autowired
     public FosterwxCashTaskTemplateMapper fosterwxCashTaskTemplateMapper;
+
+    @Autowired
+    public FosterwxCashTaskListService fosterwxCashTaskListService;
     /**
      * 获取数据列表 支持分页
      * @param handle
@@ -40,4 +46,17 @@ public class FosterwxCashTaskTemplateServiceImpl extends ServiceImpl<FosterwxCas
         res.setTotal(pageObj.getTotal());
         return res;
     }
+
+    /**
+     * 通过模板ID获取模板内详细任务
+     * @param id
+     * @return
+     */
+    public ResHandle<List<FosterwxCashTaskList>> getTaskByTemplateId(Integer id){
+        List<FosterwxCashTaskList> list = fosterwxCashTaskListService.list(new QueryWrapper<FosterwxCashTaskList>().eq("template_id",id));
+        ResHandle<List<FosterwxCashTaskList>> res = new ResHandle<>();
+        res.setList(list);
+        res.setTotal(Long.valueOf(1));
+        return res;
+    }
 }

+ 1 - 2
src/test/java/com/mokamrp/AutoMPPangu.java

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