增加游戏活码日志

src/main/java/com/mokamrp/privates/constant/RedisKey.java

@@ -19,6 +19,10 @@ public class RedisKey {
     public static final String PanCustServiceInfo = "pan_custservice_info";
     //.盘古活码二级域名列表 SET
     public static final String PanSecondDomainList = "pan_second_domain_list:";
+    //.盘古活码全部上限记录
+    public static final String PanPromoteMaxRecord = "pan_promote_max_record:";
+    //.盘古活码上限/非上线标记
+    public static final String PanPromoteMaxStamp = "pan_promote_max_stamp:";
     //.盘古活码详细信息
     public static final String PanPromoteCodeInfo = "pan_promote_code_info";
     //.检测微信环境域名状态第三方登录token

src/main/java/com/mokamrp/privates/controller/pangu/PromoteMaxRecordController.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.pangu.GetPromoteCodeMaxRecordHandle;
+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.*;
+import com.mokamrp.privates.service.pangu.PromoteMaxRecordService;
+import com.mokamrp.privates.mapper.pangu.pojo.PromoteMaxRecord;
+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;
+
+
+/**
+ * <p>
+ * 活码阈值上限记录 前端控制器
+ * </p>
+ *
+ * @author leon
+ * @since 2021-09-27
+ */
+@RestController
+@RequestMapping("/pangu/promoteMaxRecord")
+public class PromoteMaxRecordController extends BaseController<PromoteMaxRecord> {
+
+    @Autowired
+    public PromoteMaxRecordService promoteMaxRecordService;
+
+    /*
+     * @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<PromoteMaxRecord>> res = promoteMaxRecordService.getList(postBasePageHandle);
+        return AjaxResult.success(res);
+    }
+
+    @PostMapping("/getPromoteCodeMaxRecord")
+    public Object getPromoteCodeMaxRecord(@Valid @RequestBody GetPromoteCodeMaxRecordHandle handle, BindingResult bindingResult){
+        if (bindingResult.hasErrors()) {
+            return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<PromoteMaxRecord> list = promoteMaxRecordService.list(
+                new QueryWrapper<PromoteMaxRecord>()
+                .between("datetime",handle.getStartDate(),handle.getEndDate())
+                .eq("status",handle.getStatus())
+            );
+        return AjaxResult.success(list);
+    }
+
+
+}
+

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

@@ -0,0 +1,18 @@
+package com.mokamrp.privates.entity.pangu;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.time.LocalDateTime;
+
+@Data
+public class GetPromoteCodeMaxRecordHandle {
+    @NotNull(message = "status不可为空")
+    private Integer status;
+    @NotNull(message = "开始时间不可为空")
+    private LocalDateTime startDate;
+    @NotNull(message = "结束时间不可为空")
+    private LocalDateTime endDate;
+}

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

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

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

@@ -0,0 +1,22 @@
+<?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.PromoteMaxRecordMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.mokamrp.privates.mapper.pangu.pojo.PromoteMaxRecord">
+        <result column="id" property="id" />
+        <result column="status" property="status" />
+        <result column="msg" property="msg" />
+        <result column="datetime" property="datetime" />
+        <result column="create_at" property="createAt" />
+        <result column="update_at" property="updateAt" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, status, msg, datetime, create_at, update_at
+    </sql>
+    <select id="getList" resultType="com.mokamrp.privates.mapper.pangu.pojo.PromoteMaxRecord">
+        SELECT * FROM pan_promote_max_record
+    </select>
+</mapper>

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

@@ -0,0 +1,119 @@
+package com.mokamrp.privates.mapper.pangu.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 活码阈值上限记录
+ * </p>
+ *
+ * @author leon
+ * @since 2021-09-27
+ */
+@TableName("pan_promote_max_record")
+public class PromoteMaxRecord extends Model<PromoteMaxRecord> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 活码状态(1.阈值正常2.阈值上限)
+     */
+    private Integer status;
+
+    /**
+     * 消息
+     */
+    private String msg;
+
+    /**
+     * 发现时间
+     */
+    private LocalDateTime datetime;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createAt;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateAt;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    public LocalDateTime getDatetime() {
+        return datetime;
+    }
+
+    public void setDatetime(LocalDateTime datetime) {
+        this.datetime = datetime;
+    }
+
+    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 null;
+    }
+
+    @Override
+    public String toString() {
+        return "PromoteMaxRecord{" +
+        "id=" + id +
+        ", status=" + status +
+        ", msg=" + msg +
+        ", datetime=" + datetime +
+        ", createAt=" + createAt +
+        ", updateAt=" + updateAt +
+        "}";
+    }
+}

src/main/java/com/mokamrp/privates/service/impl/WorkEmployeeServiceImpl.java

@@ -197,7 +197,6 @@ public class WorkEmployeeServiceImpl extends ServiceImpl<WorkEmployeeMapper, Wor
         downFile.setDownUrl(ossConfiguration.getHost() + filePath);
         downFile.setStatus(1);
         downfileMapper.updateById(downFile);
-
         return;
     }
 
@@ -233,8 +232,8 @@ public class WorkEmployeeServiceImpl extends ServiceImpl<WorkEmployeeMapper, Wor
         if (authCorpIds != null || authCorpIds.size() >= 1) {
             obj.in("A.corp_id", authCorpIds);
         }
-        if (privateFrobbidenStatus != null){
-            obj.eq("A.private_forbbiden_status",privateFrobbidenStatus);
+        if (privateFrobbidenStatus != null) {
+            obj.eq("A.private_forbbiden_status", privateFrobbidenStatus);
         }
 
         return obj;
@@ -315,10 +314,11 @@ public class WorkEmployeeServiceImpl extends ServiceImpl<WorkEmployeeMapper, Wor
 
     /**
      * 设置封禁状态/时间
+     *
      * @param setForbbidenHandle
      * @return
      */
-    public boolean setForbbiden(SetForbbidenHandle setForbbidenHandle){
+    public boolean setForbbiden(SetForbbidenHandle setForbbidenHandle) {
         Date nowDate = new Date();
         Date forbbidenStartAt = setForbbidenHandle.getForbbidenStartAt();
         Date forbbidenEndAt = setForbbidenHandle.getForbbidenEndAt();
@@ -327,13 +327,13 @@ public class WorkEmployeeServiceImpl extends ServiceImpl<WorkEmployeeMapper, Wor
         //.更新封禁信息
         WorkEmployee workEmployee = new WorkEmployee();
         workEmployee.setPrivateForbbidenStatus(setForbbidenHandle.getForbbidenStatus());
-        if (forbbidenStatus == 2){
+        if (forbbidenStatus == 2) {
             workEmployee.setForbbidenStartAt(forbbidenStartAt);
             workEmployee.setForbbidenEndAt(forbbidenEndAt);
         }
-        this.update(workEmployee,new UpdateWrapper<WorkEmployee>().eq("id",id));
+        this.update(workEmployee, new UpdateWrapper<WorkEmployee>().eq("id", id));
         //.记录封禁历史
-        if (forbbidenStatus == 2){
+        if (forbbidenStatus == 2) {
             WorkEmployeeForbbidenRecord workEmployeeForbbidenRecord = new WorkEmployeeForbbidenRecord();
             workEmployeeForbbidenRecord.setEmployeeId(id);
             workEmployeeForbbidenRecord.setForbbidenStartAt(forbbidenStartAt);

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

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

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

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

src/main/java/com/mokamrp/privates/task/pangu/PromoteCodeMaxRecord.java

@@ -0,0 +1,92 @@
+package com.mokamrp.privates.task.pangu;
+
+import com.aliyun.oss.internal.SignUtils;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.mokamrp.privates.constant.RedisKey;
+import com.mokamrp.privates.mapper.pangu.pojo.PromoteCode;
+import com.mokamrp.privates.mapper.pangu.pojo.PromoteMaxRecord;
+import com.mokamrp.privates.service.pangu.FosterwxStationService;
+import com.mokamrp.privates.service.pangu.FosterwxTaskScheduleService;
+import com.mokamrp.privates.service.pangu.PromoteCodeService;
+import com.mokamrp.privates.service.pangu.PromoteMaxRecordService;
+import com.mokamrp.privates.utils.sign.Md5Utils;
+import net.javacrumbs.shedlock.core.SchedulerLock;
+import org.joda.time.DateTime;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.cache.CacheProperties;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.text.DateFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+@Component
+public class PromoteCodeMaxRecord {
+
+    @Autowired
+    public PromoteCodeService promoteCodeService;
+
+    @Autowired
+    public PromoteMaxRecordService promoteMaxRecordService;
+
+    @Autowired
+    public StringRedisTemplate stringRedisTemplate;
+
+    @Scheduled(cron = "0 */1 * * * ?")
+    @SchedulerLock(name = "pangu:PromoteCodeMaxRecord", lockAtLeastForString = "PT5S", lockAtMostForString = "PT15M")
+    public void execute() {
+        List<PromoteCode> list = promoteCodeService.list(new QueryWrapper<PromoteCode>().eq("promote_type", 2).eq("status", 1));
+        int maxCnt = 0;
+        Boolean isMax = false;
+        for (PromoteCode promoteCode : list) {
+            Set<String> hourScores = stringRedisTemplate.opsForZSet().rangeByScore(RedisKey.PanCustServiceIdView + promoteCode.getId(),0,promoteCode.getHourUvMax()-1);
+            Set<String> dayScores = stringRedisTemplate.opsForZSet().rangeByScore(RedisKey.PanCustServiceIdDayView + promoteCode.getId(), 0,promoteCode.getDayUvMax()-1);
+            if ((hourScores == null || hourScores.size() <= 0) || (dayScores == null || dayScores.size() <= 0)) {
+                maxCnt++;
+            }
+        }
+        if (maxCnt >= list.size()){
+            isMax = true;
+        }
+        String key = RedisKey.PanPromoteMaxStamp;
+        if (isMax.equals(true)) {
+            //.如果所有活码都满了
+            //.检查是否重复记录
+            if (stringRedisTemplate.opsForHyperLogLog().size(key + "max") <= 0) {
+                //.增加已上限标记
+                stringRedisTemplate.opsForHyperLogLog().add(key + "max", "1");
+                stringRedisTemplate.expire(key + "max", 3700, TimeUnit.SECONDS);
+                //.增加日志
+                this.addRecord(2,"所有活码阈值上限");
+            }
+        } else {
+            //.活码还有访问空位
+            //.如果之前标记是已满，则需要改变标记
+            if (stringRedisTemplate.opsForHyperLogLog().size(key + "max") > 0) {
+                //.删除已上限标记
+                stringRedisTemplate.opsForHyperLogLog().delete(key + "max");
+                //.增加日志
+                this.addRecord(1,"活码阈值恢复正常");
+            }
+        }
+    }
+    //.增加日志
+    private Boolean addRecord(Integer status,String msg){
+        LocalDateTime dateTime = LocalDateTime.now();
+        PromoteMaxRecord add = new PromoteMaxRecord();
+        add.setStatus(status);
+        add.setDatetime(dateTime);
+        add.setCreateAt(dateTime);
+        add.setUpdateAt(dateTime);
+        add.setMsg(msg);
+        promoteMaxRecordService.save(add);
+        return true;
+    }
+}

src/main/resources/application-local.properties

@@ -64,7 +64,8 @@ xxl-sso.excluded.paths=/healthy,\
   /pangu/fosterwxFlowList/changeStatus,\
   /pangu/fosterwxFlowList/list,\
   /pangu/fosterwxStation/login,\
-  /pangu/fosterwxMobilePool/getOutOfServerList
+  /pangu/fosterwxMobilePool/getOutOfServerList,\
+  /pangu/promoteMaxRecord/getPromoteCodeMaxRecord
 #xxl.sso.redis.address=redis://xxl-sso:Jch9shshl@r-uf633f3f27aa2174pd.redis.rds.aliyuncs.com:6379/0
 xxl.sso.redis.address=redis://xxl-sso:MokaSapce666$%25_RediS@r-uf6727zrr24ioihy72pd.redis.rds.aliyuncs.com:23563/0
 menu.host=http://space-server.mokamrp.com/space/menu/getMenuInterface?sysCode=1006&userId=

src/main/resources/application-prod.properties

@@ -59,7 +59,8 @@ xxl-sso.excluded.paths=/healthy,\
   /pangu/fosterwxFlowList/changeStatus,\
   /pangu/fosterwxFlowList/list,\
   /pangu/fosterwxStation/login,\
-  /pangu/fosterwxMobilePool/getOutOfServerList
+  /pangu/fosterwxMobilePool/getOutOfServerList,\
+  /pangu/promoteMaxRecord/getPromoteCodeMaxRecord
 xxl.sso.redis.address=redis://xxl-sso:MokaSapce666$%25_RediS@r-uf6727zrr24ioihy72.redis.rds.aliyuncs.com:6379/0
 menu.host=http://space-server-in-svc/space/menu/getMenuInterface?sysCode=1006&userId=
 datahub.endpoint=https://dh-cn-shanghai.aliyuncs.com

src/main/resources/application-test.properties

@@ -58,7 +58,8 @@ xxl-sso.excluded.paths=/healthy,\
 /pangu/fosterwxFlowList/changeStatus,\
 /pangu/fosterwxFlowList/list,\
 /pangu/fosterwxStation/login,\
-/pangu/fosterwxMobilePool/getOutOfServerList
+/pangu/fosterwxMobilePool/getOutOfServerList,\
+/pangu/promoteMaxRecord/getPromoteCodeMaxRecord
 #xxl.sso.redis.address=redis://xxl-sso:Jch9shshl@r-uf633f3f27aa2174pd.redis.rds.aliyuncs.com:6379/0
 xxl.sso.redis.address=redis://xxl-sso:MokaSapce666$%25_RediS@r-uf6727zrr24ioihy72pd.redis.rds.aliyuncs.com:23563/0
 menu.host=http://space-server-in-svc/space/menu/getMenuInterface?sysCode=1006&userId=
@@ -69,15 +70,12 @@ datahub.accessSecret=p9tVmeDeeEENKhfsBsSeYc0F0ggH5b
 datahub.topic=s_hera_api_external_user_test
 datahub.corpTopic=ods_hera_msv_corp_data
 datahub.project=hera
-
 es.host=es-cn-4591gc2fx0001549q.public.elasticsearch.aliyuncs.com
 es.username=elastic
 es.password=moka6_3moka
 es.port=9200
-
 #typer接口
 typer.url=https://test.typer.mokamrp.com/api
-
 #定时任务全局开关，线上环境需要开启
 cronjob.power=false
 

src/main/resources/template/controller.java.vm

@@ -3,6 +3,7 @@ package ${package.Controller};
 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;
@@ -63,7 +64,7 @@ public class ${table.controllerName} {
         if (bindingResult.hasErrors()) {
             return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
         }
-        ResHandle<List<${table.entityPath}>> res = ${table.entityPath}Service.getList(postBasePageHandle);
+        ResHandle<List<${entity}>> res = ${table.entityPath}Service.getList(postBasePageHandle);
         return AjaxResult.success(res);
     }
 

src/main/resources/template/service.java.vm

@@ -3,6 +3,8 @@ package ${package.Service};
 import ${package.Entity}.${entity};
 import ${superServiceClassPackage};
 import com.mokamrp.privates.entity.PostBasePageHandle;
+import com.mokamrp.privates.entity.ResHandle;
+import java.util.List;
 import java.util.Map;
 /**
  * <p>
@@ -17,6 +19,6 @@ interface ${table.serviceName} : ${superServiceClass}<${entity}>
 #else
 public interface ${table.serviceName} extends ${superServiceClass}<${entity}> {
     //.@leon 获取数据列表
-    public ResHandle<List<${table.entityPath}>> getList(PostBasePageHandle handle);
+    public ResHandle<List<${entity}>> getList(PostBasePageHandle handle);
 }
 #end

src/main/resources/template/serviceImpl.java.vm

@@ -35,15 +35,15 @@ public class ${table.serviceImplName} extends ${superServiceImplClass}<${table.m
      * @param handle
      * @return
      */
-    public Map<String, Object> getList(PostBasePageHandle handle) {
+    public ResHandle<List<${entity}>> getList(PostBasePageHandle handle) {
         Integer pagesize = handle.getPagesize();
         Integer page = handle.getPage();
         Page<${entity}> pageObj = new Page<${entity}>(page, pagesize);
         List<${entity}> list = ${table.entityPath}Mapper.getList(pageObj);
-        ResHandle<List<FosterwxMobile>> resHandle = new ResHandle<>();
-        resHandle.setList(list);
-        resHandle.setTotal(pageObj.getTotal());
-        return resMap;
+        ResHandle<List<${entity}>> res = new ResHandle<>();
+        res.setList(list);
+        res.setTotal(pageObj.getTotal());
+        return res;
     }
 }
 #end

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

@@ -20,7 +20,7 @@ public class AutoMPPangu {
 	public void testGenerator() {
 
 		//1. 全局配置
-		String outPutDir = "/Users/luqiucheng/Desktop/test";
+		String outPutDir = "D://project/moka-private/src/main/java";
 		GlobalConfig config = new GlobalConfig();
 		config.setActiveRecord(true) // 是否支持AR模式
 				.setAuthor("leon") // 作者
@@ -48,7 +48,7 @@ public class AutoMPPangu {
 				.setColumnNaming(NamingStrategy.underline_to_camel)
 				.setNaming(NamingStrategy.underline_to_camel) // 数据库表映射到实体的命名策略，下划线转驼峰命名
 				.setTablePrefix("pan_") //表名前缀
-				.setInclude("pan_fosterwx_task_schedule");  //生成的表
+				.setInclude("pan_promote_max_record");  //生成的表
 
 		//4. 包名策略配置
 		PackageConfig pkConfig = new PackageConfig();