leon 4 лет назад
Родитель
Сommit
c955b7bde8
20 измененных файлов с 486 добавлено и 15 удалено
  1. 111 8
      src/main/java/com/mokamrp/privates/controller/pangu/FosterwxCashOasBoxController.java
  2. 57 0
      src/main/java/com/mokamrp/privates/controller/pangu/FosterwxCashOasBoxMobileGroupController.java
  3. 18 0
      src/main/java/com/mokamrp/privates/controller/pangu/FosterwxCashTaskListController.java
  4. 3 2
      src/main/java/com/mokamrp/privates/controller/pangu/FosterwxDomainController.java
  5. 14 0
      src/main/java/com/mokamrp/privates/entity/SetIdssHandle.java
  6. 12 0
      src/main/java/com/mokamrp/privates/entity/pangu/GetForsterCashDomainHandle.java
  7. 15 0
      src/main/java/com/mokamrp/privates/entity/pangu/GetFosterwxCashOasBoxMobileGroupHandle.java
  8. 22 0
      src/main/java/com/mokamrp/privates/mapper/pangu/FosterwxCashOasBoxMobileGroupMapper.java
  9. 26 0
      src/main/java/com/mokamrp/privates/mapper/pangu/FosterwxCashOasBoxMobileGroupMapper.xml
  10. 2 1
      src/main/java/com/mokamrp/privates/mapper/pangu/FosterwxDomainMapper.java
  11. 3 0
      src/main/java/com/mokamrp/privates/mapper/pangu/FosterwxDomainMapper.xml
  12. 8 0
      src/main/java/com/mokamrp/privates/mapper/pangu/pojo/FosterwxCashOasBox.java
  13. 112 0
      src/main/java/com/mokamrp/privates/mapper/pangu/pojo/FosterwxCashOasBoxMobileGroup.java
  14. 4 0
      src/main/java/com/mokamrp/privates/mapper/pangu/pojo/FosterwxCashTaskList.java
  15. 8 0
      src/main/java/com/mokamrp/privates/mapper/pangu/pojo/FosterwxDomain.java
  16. 21 0
      src/main/java/com/mokamrp/privates/service/pangu/FosterwxCashOasBoxMobileGroupService.java
  17. 2 1
      src/main/java/com/mokamrp/privates/service/pangu/FosterwxDomainService.java
  18. 44 0
      src/main/java/com/mokamrp/privates/service/pangu/impl/FosterwxCashOasBoxMobileGroupServiceImpl.java
  19. 3 2
      src/main/java/com/mokamrp/privates/service/pangu/impl/FosterwxDomainServiceImpl.java
  20. 1 1
      src/test/java/com/mokamrp/AutoMPPangu.java

+ 111 - 8
src/main/java/com/mokamrp/privates/controller/pangu/FosterwxCashOasBoxController.java

@@ -1,24 +1,33 @@
 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.PostBasePageHandle;
+import com.mokamrp.privates.entity.*;
+import com.mokamrp.privates.entity.pangu.GetFosterwxCashOasBoxMobileGroupHandle;
 import com.mokamrp.privates.help.AjaxResult;
-import com.mokamrp.privates.entity.ResHandle;
+import com.mokamrp.privates.mapper.pangu.pojo.Custservice;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashMobileGroup;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashOasBoxMobileGroup;
+import com.mokamrp.privates.service.pangu.FosterwxCashMobileGroupService;
+import com.mokamrp.privates.service.pangu.FosterwxCashOasBoxMobileGroupService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.SwaggerDefinition;
+import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;
 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.time.LocalDateTime;
 import java.util.Map;
 import java.util.List;
 
-import org.springframework.web.bind.annotation.RestController;
-
 
 /**
  * <p>
@@ -29,12 +38,16 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2021-10-09
  */
 @RestController
+@Api(tags = "公众号/小程序模块")
 @RequestMapping("/pangu/fosterwxCashOasBox")
 public class FosterwxCashOasBoxController extends BaseController<FosterwxCashOasBox> {
 
     @Autowired
     public FosterwxCashOasBoxService fosterwxCashOasBoxService;
 
+    @Autowired
+    public FosterwxCashOasBoxMobileGroupService fosterwxCashOasBoxMobileGroupService;
+
     /*
      * @fast
      * 默认生成的控制器所继承的父类中有index/add/edit/del四个基础方法,均为post json请求
@@ -42,7 +55,7 @@ public class FosterwxCashOasBoxController extends BaseController<FosterwxCashOas
      */
 
     @PostMapping("/list")
-    public Object list(@Valid @RequestBody PostBasePageHandle postBasePageHandle, BindingResult bindingResult){
+    public Object list(@Valid @RequestBody PostBasePageHandle postBasePageHandle, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
         }
@@ -50,7 +63,97 @@ public class FosterwxCashOasBoxController extends BaseController<FosterwxCashOas
         return AjaxResult.success(res);
     }
 
+    @PostMapping("/edit")
+    public Object edit(@Valid @RequestBody EditHandle<FosterwxCashOasBox> editHandle, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
+        }
+        this.onUpdate(editHandle);
+        if (editHandle.getRaw().getMobileGroupIds() != null || editHandle.getRaw().getMobileGroupIds().size() > 0){
+            fosterwxCashOasBoxMobileGroupService.remove(new QueryWrapper<FosterwxCashOasBoxMobileGroup>().eq("oas_box_id",editHandle.getIds()));
+            for (Integer groupId: editHandle.getRaw().getMobileGroupIds()){
+                FosterwxCashOasBoxMobileGroup add = new FosterwxCashOasBoxMobileGroup();
+                add.setOasBoxId(Integer.parseInt(editHandle.getIds()));
+                add.setCashMobileGroupId(groupId);
+                add.setUpdateAt(LocalDateTime.now());
+                add.setCreateAt(LocalDateTime.now());
+                fosterwxCashOasBoxMobileGroupService.save(add);
+            }
+        }
+        service.update(editHandle.getRaw(), new QueryWrapper<FosterwxCashOasBox>().in("id", editHandle.getIds()));
+        return AjaxResult.success(Constants.SUCCESS, true);
+    }
+
+    @ApiOperation(value = "批量设置分组")
+    @PostMapping("/setGroup")
+    public Object setGroup(@Valid @RequestBody SetGroupHandle setGroupHandle, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
+        }
+        FosterwxCashOasBox save = new FosterwxCashOasBox();
+        save.setGroupId(setGroupHandle.getGroupId());
+        save.setUpdateAt(LocalDateTime.now());
+        service.update(save, new QueryWrapper<FosterwxCashOasBox>().in("id", setGroupHandle.getIds()));
+//        this.sync();
+        return AjaxResult.success(Constants.SUCCESS, true);
+    }
 
+    @ApiOperation(value = "批量设置账号分组")
+    @PostMapping("/setMobileGroup")
+    public Object setMobileGroup(@Valid @RequestBody SetIdssHandle handle, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
+        }
+        //.遍历公众号小程序ID
+        for (Integer localId : handle.getLocalIds()) {
+            //.遍历账号分组ID
+            for (Integer id : handle.getIds()) {
+                Integer has = fosterwxCashOasBoxMobileGroupService.count(new QueryWrapper<FosterwxCashOasBoxMobileGroup>()
+                        .eq("oas_box_id", localId)
+                        .eq("cash_mobile_group_id", id));
+                if (has > 0) {
+                    continue;
+                }
+                FosterwxCashOasBoxMobileGroup add = new FosterwxCashOasBoxMobileGroup();
+                add.setCashMobileGroupId(id);
+                add.setOasBoxId(localId);
+                add.setCreateAt(LocalDateTime.now());
+                add.setUpdateAt(LocalDateTime.now());
+                fosterwxCashOasBoxMobileGroupService.save(add);
+            }
+        }
+        return AjaxResult.success(Constants.SUCCESS, true);
+    }
+
+    @GetMapping("/info")
+    public Object info(@RequestParam(name = "ids") String ids) {
+        if (ids == null || ids.isEmpty()) {
+            return AjaxResult.error("ids null");
+        }
+        FosterwxCashOasBox res = service.getOne(new QueryWrapper<FosterwxCashOasBox>().eq("id", ids));
+        GetFosterwxCashOasBoxMobileGroupHandle handle = new GetFosterwxCashOasBoxMobileGroupHandle();
+        handle.setOasBoxId(res.getId());
+        handle.setPage(1);
+        handle.setPagesize(999999);
+        ResHandle<List<FosterwxCashOasBoxMobileGroup>> list =  fosterwxCashOasBoxMobileGroupService.getList(handle);
+        res.setMobileGroups(list.getList());
+        return AjaxResult.success(Constants.SUCCESS, res);
+    }
+
+
+    @ApiOperation(value = "批量设置小程序类型")
+    @PostMapping("/setBoxLocation")
+    public Object setBoxLocation(@Valid @RequestBody SetIdsHandle handle, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
+        }
+        FosterwxCashOasBox save = new FosterwxCashOasBox();
+        save.setBoxLocation(handle.getId());
+        save.setUpdateAt(LocalDateTime.now());
+        service.update(save, new QueryWrapper<FosterwxCashOasBox>().in("id", handle.getIds()));
+//        this.sync();
+        return AjaxResult.success(Constants.SUCCESS, true);
+    }
 
 
 }

+ 57 - 0
src/main/java/com/mokamrp/privates/controller/pangu/FosterwxCashOasBoxMobileGroupController.java

@@ -0,0 +1,57 @@
+package com.mokamrp.privates.controller.pangu;
+
+import com.mokamrp.privates.constant.HttpStatus;
+import com.mokamrp.privates.entity.PostBasePageHandle;
+import com.mokamrp.privates.entity.pangu.GetFosterwxCashOasBoxMobileGroupHandle;
+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.FosterwxCashOasBoxMobileGroupService;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashOasBoxMobileGroup;
+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-15
+ */
+@RestController
+@RequestMapping("/fosterwxCashOasBoxMobileGroup")
+public class FosterwxCashOasBoxMobileGroupController extends BaseController<FosterwxCashOasBoxMobileGroup> {
+
+    @Autowired
+    public FosterwxCashOasBoxMobileGroupService fosterwxCashOasBoxMobileGroupService;
+
+    /*
+     * @fast
+     * 默认生成的控制器所继承的父类中有index/add/edit/del四个基础方法,均为post json请求
+     * 如果需要定制化,需要将BaseController中对应的方法复制到当前控制器,然后进行修改
+     */
+
+    @PostMapping("/list")
+    public Object list(@Valid @RequestBody GetFosterwxCashOasBoxMobileGroupHandle handle, BindingResult bindingResult){
+        if (bindingResult.hasErrors()) {
+            return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
+        }
+        ResHandle<List<FosterwxCashOasBoxMobileGroup>> res = fosterwxCashOasBoxMobileGroupService.getList(handle);
+
+        return AjaxResult.success(res);
+    }
+
+
+}
+

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

@@ -9,7 +9,9 @@ import com.mokamrp.privates.entity.PostBasePageHandle;
 import com.mokamrp.privates.entity.pangu.FosterwxCashTaskListHandle;
 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.FosterwxCashTaskTemplate;
+import com.mokamrp.privates.mapper.pojo.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -57,6 +59,22 @@ public class FosterwxCashTaskListController extends BaseController<FosterwxCashT
         return AjaxResult.success(res);
     }
 
+    @PostMapping("/addPro")
+    public Object addPro(@Valid @RequestBody AddHandle<FosterwxCashTaskList> addHandle, BindingResult bindingResult, @AuthUser User authUser) {
+        if (bindingResult.hasErrors()) {
+            return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
+        }
+        this.onInsert(addHandle.getRaw());
+        addHandle.getRaw().setUpdateUid(authUser.getId());
+        addHandle.getRaw().setCreateUid(authUser.getId());
+        Boolean res = service.save(addHandle.getRaw());
+        if (res) {
+            return AjaxResult.success(Constants.SUCCESS, res);
+        } else {
+            return AjaxResult.error("新增失败", res);
+        }
+    }
+
     /**
      * 软删除
      * @param delHandle

+ 3 - 2
src/main/java/com/mokamrp/privates/controller/pangu/FosterwxDomainController.java

@@ -2,6 +2,7 @@ package com.mokamrp.privates.controller.pangu;
 
 import com.mokamrp.privates.constant.HttpStatus;
 import com.mokamrp.privates.entity.PostBasePageHandle;
+import com.mokamrp.privates.entity.pangu.GetForsterCashDomainHandle;
 import com.mokamrp.privates.help.AjaxResult;
 import com.mokamrp.privates.entity.ResHandle;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -42,11 +43,11 @@ public class FosterwxDomainController extends BaseController<FosterwxDomain> {
      */
 
     @PostMapping("/list")
-    public Object list(@Valid @RequestBody PostBasePageHandle postBasePageHandle, BindingResult bindingResult){
+    public Object list(@Valid @RequestBody GetForsterCashDomainHandle handle, BindingResult bindingResult){
         if (bindingResult.hasErrors()) {
             return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
         }
-        ResHandle<List<FosterwxDomain>> res = fosterwxDomainService.getList(postBasePageHandle);
+        ResHandle<List<FosterwxDomain>> res = fosterwxDomainService.getList(handle);
         return AjaxResult.success(res);
     }
 

+ 14 - 0
src/main/java/com/mokamrp/privates/entity/SetIdssHandle.java

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

+ 12 - 0
src/main/java/com/mokamrp/privates/entity/pangu/GetForsterCashDomainHandle.java

@@ -0,0 +1,12 @@
+package com.mokamrp.privates.entity.pangu;
+
+import lombok.Data;
+
+@Data
+public class GetForsterCashDomainHandle {
+    private Integer page;
+    private Integer pagesize;
+    private Integer id;
+    private Integer stationId;
+
+}

+ 15 - 0
src/main/java/com/mokamrp/privates/entity/pangu/GetFosterwxCashOasBoxMobileGroupHandle.java

@@ -0,0 +1,15 @@
+package com.mokamrp.privates.entity.pangu;
+
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+@Data
+public class GetFosterwxCashOasBoxMobileGroupHandle {
+    private Integer page;
+    private Integer pagesize;
+    private Integer id;
+    private Integer oasBoxId;
+    private Integer cashMobileGroupId;
+}

+ 22 - 0
src/main/java/com/mokamrp/privates/mapper/pangu/FosterwxCashOasBoxMobileGroupMapper.java

@@ -0,0 +1,22 @@
+package com.mokamrp.privates.mapper.pangu;
+
+import com.mokamrp.privates.entity.pangu.GetFosterwxCashOasBoxMobileGroupHandle;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashOasBoxMobileGroup;
+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-15
+ */
+@Component
+public interface FosterwxCashOasBoxMobileGroupMapper extends BaseMapper<FosterwxCashOasBoxMobileGroup> {
+    public List<FosterwxCashOasBoxMobileGroup> getList(Page<FosterwxCashOasBoxMobileGroup> pageObj, @Param("params") GetFosterwxCashOasBoxMobileGroupHandle handle);
+}

+ 26 - 0
src/main/java/com/mokamrp/privates/mapper/pangu/FosterwxCashOasBoxMobileGroupMapper.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.FosterwxCashOasBoxMobileGroupMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashOasBoxMobileGroup">
+        <id column="id" property="id" />
+        <result column="oas_box_id" property="oasBoxId" />
+        <result column="cash_mobile_group_id" property="cashMobileGroupId" />
+        <result column="create_at" property="createAt" />
+        <result column="update_at" property="updateAt" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, oas_box_id, cash_mobile_group_id, create_at, update_at
+    </sql>
+    <select id="getList" resultType="com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashOasBoxMobileGroup">
+        SELECT A.*,B.group_name as cash_mobile_group_name FROM pan_fosterwx_cash_oas_box_mobile_group as A
+        left join pan_fosterwx_cash_mobile_group as B on A.cash_mobile_group_id = B.id
+        <where>
+            <if test="params.oasBoxId">and A.oas_box_id = #{params.oasBoxId}</if>
+
+        </where>
+    </select>
+</mapper>

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

@@ -1,5 +1,6 @@
 package com.mokamrp.privates.mapper.pangu;
 
+import com.mokamrp.privates.entity.pangu.GetForsterCashDomainHandle;
 import com.mokamrp.privates.mapper.pangu.pojo.FosterwxDomain;
 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 FosterwxDomainMapper extends BaseMapper<FosterwxDomain> {
-    public List<FosterwxDomain> getList(Page<FosterwxDomain> pageObj);
+    public List<FosterwxDomain> getList(Page<FosterwxDomain> pageObj, @Param("params")GetForsterCashDomainHandle handle);
 }

+ 3 - 0
src/main/java/com/mokamrp/privates/mapper/pangu/FosterwxDomainMapper.xml

@@ -20,5 +20,8 @@
     </sql>
     <select id="getList" resultType="com.mokamrp.privates.mapper.pangu.pojo.FosterwxDomain">
         SELECT * FROM pan_fosterwx_domain
+        <where>
+            <if test="params.stationId != null">and station_id = #{params.stationId}</if>
+        </where>
     </select>
 </mapper>

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

@@ -1,5 +1,6 @@
 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;
@@ -8,6 +9,7 @@ import lombok.Data;
 
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -73,6 +75,12 @@ public class FosterwxCashOasBox extends Model<FosterwxCashOasBox> {
 
     private Integer sendTextCnt;
 
+    @TableField(exist = false)
+    private List<FosterwxCashOasBoxMobileGroup> mobileGroups;
+
+    @TableField(exist = false)
+    private List<Integer> mobileGroupIds;
+
     /**
      * 备注
      */

+ 112 - 0
src/main/java/com/mokamrp/privates/mapper/pangu/pojo/FosterwxCashOasBoxMobileGroup.java

@@ -0,0 +1,112 @@
+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-15
+ */
+@Data
+@TableName("pan_fosterwx_cash_oas_box_mobile_group")
+public class FosterwxCashOasBoxMobileGroup extends Model<FosterwxCashOasBoxMobileGroup> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+      @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 变现小程序/公众号表id
+     */
+    private Integer oasBoxId;
+
+    /**
+     * 变现账号分组id
+     */
+    private Integer cashMobileGroupId;
+
+    @TableField(exist = false)
+    private String cashMobileGroupName;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createAt;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateAt;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getOasBoxId() {
+        return oasBoxId;
+    }
+
+    public void setOasBoxId(Integer oasBoxId) {
+        this.oasBoxId = oasBoxId;
+    }
+
+    public Integer getCashMobileGroupId() {
+        return cashMobileGroupId;
+    }
+
+    public void setCashMobileGroupId(Integer cashMobileGroupId) {
+        this.cashMobileGroupId = cashMobileGroupId;
+    }
+
+    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 "FosterwxCashOasBoxMobileGroup{" +
+        "id=" + id +
+        ", oasBoxId=" + oasBoxId +
+        ", cashMobileGroupId=" + cashMobileGroupId +
+        ", createAt=" + createAt +
+        ", updateAt=" + updateAt +
+        "}";
+    }
+}

+ 4 - 0
src/main/java/com/mokamrp/privates/mapper/pangu/pojo/FosterwxCashTaskList.java

@@ -86,6 +86,10 @@ public class FosterwxCashTaskList extends Model<FosterwxCashTaskList> {
      */
     private String richTxtBody;
 
+    private Integer isTxtCenterAds;
+
+    private Integer isOriginal;
+
     /**
      * 任务描述
      */

+ 8 - 0
src/main/java/com/mokamrp/privates/mapper/pangu/pojo/FosterwxDomain.java

@@ -4,6 +4,8 @@ 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 +17,7 @@ import java.io.Serializable;
  * @author leon
  * @since 2021-10-15
  */
+@Data
 @TableName("pan_fosterwx_domain")
 public class FosterwxDomain extends Model<FosterwxDomain> {
 
@@ -32,6 +35,11 @@ public class FosterwxDomain extends Model<FosterwxDomain> {
     private String deptId;
 
     /**
+     * 站点ID
+     */
+    private Integer stationId;
+
+    /**
      * 域名
      */
     private String domain;

+ 21 - 0
src/main/java/com/mokamrp/privates/service/pangu/FosterwxCashOasBoxMobileGroupService.java

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

+ 2 - 1
src/main/java/com/mokamrp/privates/service/pangu/FosterwxDomainService.java

@@ -1,5 +1,6 @@
 package com.mokamrp.privates.service.pangu;
 
+import com.mokamrp.privates.entity.pangu.GetForsterCashDomainHandle;
 import com.mokamrp.privates.mapper.pangu.pojo.FosterwxDomain;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.mokamrp.privates.entity.PostBasePageHandle;
@@ -16,5 +17,5 @@ import java.util.Map;
  */
 public interface FosterwxDomainService extends IService<FosterwxDomain> {
     //.@leon 获取数据列表
-    public ResHandle<List<FosterwxDomain>> getList(PostBasePageHandle handle);
+    public ResHandle<List<FosterwxDomain>> getList(GetForsterCashDomainHandle handle);
 }

+ 44 - 0
src/main/java/com/mokamrp/privates/service/pangu/impl/FosterwxCashOasBoxMobileGroupServiceImpl.java

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

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

@@ -1,5 +1,6 @@
 package com.mokamrp.privates.service.pangu.impl;
 
+import com.mokamrp.privates.entity.pangu.GetForsterCashDomainHandle;
 import com.mokamrp.privates.mapper.pangu.pojo.FosterwxDomain;
 import com.mokamrp.privates.mapper.pangu.FosterwxDomainMapper;
 import com.mokamrp.privates.service.pangu.FosterwxDomainService;
@@ -30,11 +31,11 @@ public class FosterwxDomainServiceImpl extends ServiceImpl<FosterwxDomainMapper,
      * @param handle
      * @return
      */
-    public ResHandle<List<FosterwxDomain>> getList(PostBasePageHandle handle) {
+    public ResHandle<List<FosterwxDomain>> getList(GetForsterCashDomainHandle handle) {
         Integer pagesize = handle.getPagesize();
         Integer page = handle.getPage();
         Page<FosterwxDomain> pageObj = new Page<FosterwxDomain>(page, pagesize);
-        List<FosterwxDomain> list = fosterwxDomainMapper.getList(pageObj);
+        List<FosterwxDomain> list = fosterwxDomainMapper.getList(pageObj,handle);
         ResHandle<List<FosterwxDomain>> res = new ResHandle<>();
         res.setList(list);
         res.setTotal(pageObj.getTotal());

+ 1 - 1
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_fosterwx_domain");
+				.setInclude("pan_fosterwx_cash_oas_box_mobile_group");
 		//4. 包名策略配置
 		PackageConfig pkConfig = new PackageConfig();
 		pkConfig.setParent("com.mokamrp.privates")