add 站内信

zhongzheng-admin/src/main/java/com/zhongzheng/controller/inform/InformSysUserController.java

@@ -0,0 +1,99 @@
+package com.zhongzheng.controller.inform;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.zhongzheng.common.core.domain.model.LoginUser;
+import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.framework.web.service.TokenService;
+import com.zhongzheng.modules.inform.bo.InformSysUserAddBo;
+import com.zhongzheng.modules.inform.bo.InformSysUserEditBo;
+import com.zhongzheng.modules.inform.bo.InformSysUserQueryBo;
+import com.zhongzheng.modules.inform.service.IInformSysUserService;
+import com.zhongzheng.modules.inform.vo.InformSysUserVo;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 通知绑定系统用户Controller
+ *
+ * @author hjl
+ * @date 2022-08-04
+ */
+@Api(value = "通知绑定系统用户控制器", tags = {"通知绑定系统用户管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/inform/sys_user")
+public class InformSysUserController extends BaseController {
+
+    private final IInformSysUserService iInformSysUserService;
+
+    private final TokenService tokenService;
+
+    /**
+     * 查询通知绑定系统用户列表
+     */
+    @ApiOperation("查询通知绑定系统用户列表")
+    @PreAuthorize("@ss.hasPermi('system:user:list')")
+    @GetMapping("/list")
+    public TableDataInfo<InformSysUserVo> list(InformSysUserQueryBo bo) {
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setUserId(loginUser.getUser().getUserId());
+        startPage();
+        List<InformSysUserVo> list = iInformSysUserService.queryList(bo);
+        return getDataTable(list);
+    }
+
+
+
+    /**
+     * 获取通知绑定系统用户详细信息
+     */
+    @ApiOperation("获取通知绑定系统用户详细信息")
+    @PreAuthorize("@ss.hasPermi('system:user:query')")
+    @GetMapping("/{id}")
+    public AjaxResult<InformSysUserVo> getInfo(@PathVariable("id" ) Long id) {
+        return AjaxResult.success(iInformSysUserService.queryById(id));
+    }
+
+    /**
+     * 新增通知绑定系统用户
+     */
+    @ApiOperation("新增通知绑定系统用户")
+    @PreAuthorize("@ss.hasPermi('system:user:add')")
+    @Log(title = "通知绑定系统用户", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody InformSysUserAddBo bo) {
+        return toAjax(iInformSysUserService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改通知绑定系统用户
+     */
+    @ApiOperation("修改通知绑定系统用户")
+    @PreAuthorize("@ss.hasPermi('system:user:edit')")
+    @Log(title = "通知绑定系统用户", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult<Void> edit(@RequestBody InformSysUserEditBo bo) {
+        return toAjax(iInformSysUserService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+
+}

zhongzheng-admin/src/main/java/com/zhongzheng/controller/schedule/ScheduleController.java

@@ -2,10 +2,15 @@ package com.zhongzheng.controller.schedule;
 
 import com.zhongzheng.common.core.controller.BaseController;
 import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.framework.web.service.AsyncService;
+import com.zhongzheng.framework.web.service.WxLoginService;
 import com.zhongzheng.modules.polyv.bo.PolyvLiveQueryBo;
 import com.zhongzheng.modules.polyv.service.IPolyvLiveService;
 import com.zhongzheng.modules.schedule.service.IScheduleService;
 import com.zhongzheng.modules.user.bo.UserQueryBo;
+import com.zhongzheng.modules.user.bo.UserWxFollowQueryBo;
+import com.zhongzheng.modules.user.service.IUserWxFollowService;
+import com.zhongzheng.modules.wx.bo.WxLoginBody;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -31,7 +36,9 @@ public class ScheduleController extends BaseController {
 
     private final IPolyvLiveService iPolyvLiveService;
 
+    private final AsyncService asyncService;
 
+    private final WxLoginService wxLoginService;
 
     /**
      * 商品购买发送消息
@@ -222,12 +229,21 @@ public class ScheduleController extends BaseController {
         return AjaxResult.success();
     }
 
-   /* @ApiOperation("测试")
-    @GetMapping("/syncToReplay")
-    public AjaxResult syncToReplay(UserQueryBo bo) throws Exception {
-        iScheduleService.syncToReplay(bo);
+    @ApiOperation("获取关注列表")
+    @GetMapping("/syncFollowList")
+    public AjaxResult syncFollowList(){
+        WxLoginBody loginBody = new WxLoginBody();
+        wxLoginService.getWxGzhUserList(loginBody.getNextOpenid());
         return AjaxResult.success();
     }
-*/
+
+    @ApiOperation("同步union")
+    @GetMapping("/syncUnion")
+    public AjaxResult syncUnion(){
+        UserWxFollowQueryBo bo = new UserWxFollowQueryBo();
+        asyncService.executeAsync(bo,0);
+        return AjaxResult.success();
+    }
+
 
 }

zhongzheng-admin/src/main/resources/application-dev.yml

@@ -6,7 +6,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://192.168.1.222:3306/zz_edu_saas?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+                url: jdbc:mysql://192.168.1.222:3306/zz_edu_saas?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
                 username: root
                 password:  zhongzheng2021
             # 从库数据源

zhongzheng-api/src/main/java/com/zhongzheng/controller/wx/WxLoginController.java

@@ -53,10 +53,10 @@ public class WxLoginController
     @PostMapping("/testLogin")
     public AjaxResult testLogin(@RequestBody WxLoginBody loginBody)
     {
-        wxLoginService.getWxGzhUserList();
-        String token = wxLoginService.getWxGzhUserCgiInfo("o3oVj0cih3KpmFhXV9PEfDNMfHs8");
+        String token = wxLoginService.getWxGzhAccessToken();
+        System.out.println(token);
         Map<String,String> map = new HashMap<>();
-        return AjaxResult.success(map);
+        return AjaxResult.success(null);
     }
 
     /**

zhongzheng-api/src/main/resources/application-dev.yml

@@ -102,8 +102,8 @@ wx:
         appid: wxd3c8ae80cf43a305
         appsecret: 193a001ebfd46f227008a21e9d13e750
     gzh:
-        appid: wx505d3a592bc28a42
-        appsecret: 1311d2e3036f4ced5acb8269c82c98e3
+        appid: wx6f48f721d18244eb
+        appsecret: 2f8b2b4ff66e2f6adfb9f08ae22d7474
     wepay:
         mchid: 1342013901
         key: GdXyPxYjZx1234123yJzXgDxYpXyjpx9

zhongzheng-common/src/main/java/com/zhongzheng/common/utils/ServletUtils.java

@@ -18,6 +18,7 @@ import java.io.IOException;
  */
 public class ServletUtils
 {
+    public static HttpServletRequest httpServletRequest;
     /**
      * 获取模块编码参数
      */
@@ -69,7 +70,12 @@ public class ServletUtils
      */
     public static HttpServletRequest getRequest()
     {
-        return getRequestAttributes().getRequest();
+        if(getRequestAttributes()!=null){
+            return getRequestAttributes().getRequest();
+        }else{
+            return httpServletRequest;
+        }
+
     }
 
     /**

zhongzheng-common/src/main/java/com/zhongzheng/common/utils/ToolsUtils.java

@@ -9,7 +9,9 @@ import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Random;
 
 public class ToolsUtils {
@@ -151,4 +153,30 @@ public class ToolsUtils {
         return valSb.toString();
     }
 
+    public static <T> List<List<T>> splitListBycapacity(List<T> source, int capacity){
+        List<List<T>> result=new ArrayList<List<T>>();
+        if (source != null){
+            int size = source.size();
+            if (size > 0 ){
+                for (int i = 0; i < size;) {
+                    List<T> value = null;
+                    int end = i+capacity;
+                    if (end > size){
+                        end = size;
+                    }
+                    value = source.subList(i,end);
+                    i = end;
+
+                    result.add(value);
+                }
+
+            }else {
+                result = null;
+            }
+        }else {
+            result = null;
+        }
+        return result;
+    }
+
 }

zhongzheng-common/src/main/java/com/zhongzheng/common/utils/http/HttpUtils.java

@@ -86,7 +86,7 @@ public class HttpUtils
             {
                 result.append(line);
             }
-            log.info("recv - {}", result);
+        //    log.info("recv - {}", result);
         }
         catch (ConnectException e)
         {

zhongzheng-framework/src/main/java/com/zhongzheng/framework/config/ThreadPoolConfig.java

@@ -1,13 +1,20 @@
 package com.zhongzheng.framework.config;
 
+import java.util.concurrent.Executor;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.ThreadPoolExecutor;
 import org.apache.commons.lang3.concurrent.BasicThreadFactory;
+import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.AsyncConfigurer;
+import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import com.zhongzheng.common.utils.Threads;
+import org.springframework.security.task.DelegatingSecurityContextAsyncTaskExecutor;
 
 /**
  * 线程池配置
@@ -15,7 +22,9 @@ import com.zhongzheng.common.utils.Threads;
  * @author zhongzheng
  **/
 @Configuration
-public class ThreadPoolConfig
+@ComponentScan("com.zhongzheng.modules.schedule.service.impl")
+@EnableAsync
+public class ThreadPoolConfig implements AsyncConfigurer
 {
     // 核心线程池大小
     private int corePoolSize = 50;
@@ -42,6 +51,8 @@ public class ThreadPoolConfig
         return executor;
     }
 
+
+
     /**
      * 执行周期性或定时任务
      */
@@ -59,4 +70,5 @@ public class ThreadPoolConfig
             }
         };
     }
+
 }

zhongzheng-framework/src/main/java/com/zhongzheng/framework/config/VisiableThreadPoolTaskExecutor.java

@@ -0,0 +1,63 @@
+package com.zhongzheng.framework.config;
+
+import lombok.extern.slf4j.Slf4j;
+import org.mybatis.logging.Logger;
+import org.mybatis.logging.LoggerFactory;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+import org.springframework.stereotype.Component;
+import org.springframework.util.concurrent.ListenableFuture;
+
+import java.util.concurrent.Callable;
+import java.util.concurrent.Future;
+import java.util.concurrent.ThreadPoolExecutor;
+
+public class VisiableThreadPoolTaskExecutor extends ThreadPoolTaskExecutor {
+
+
+    private static final Logger logger = LoggerFactory.getLogger(VisiableThreadPoolTaskExecutor.class);
+
+    private void showThreadPoolInfo(String prefix) {
+        ThreadPoolExecutor threadPoolExecutor = getThreadPoolExecutor();
+
+        if (null == threadPoolExecutor) {
+            return;
+        }
+
+    }
+
+    @Override
+    public void execute(Runnable task) {
+        showThreadPoolInfo("1. do execute");
+        super.execute(task);
+    }
+
+    @Override
+    public void execute(Runnable task, long startTimeout) {
+        showThreadPoolInfo("2. do execute");
+        super.execute(task, startTimeout);
+    }
+
+    @Override
+    public Future<?> submit(Runnable task) {
+        showThreadPoolInfo("1. do submit");
+        return super.submit(task);
+    }
+
+    @Override
+    public <T> Future<T> submit(Callable<T> task) {
+        showThreadPoolInfo("2. do submit");
+        return super.submit(task);
+    }
+
+    @Override
+    public ListenableFuture<?> submitListenable(Runnable task) {
+        showThreadPoolInfo("1. do submitListenable");
+        return super.submitListenable(task);
+    }
+
+    @Override
+    public <T> ListenableFuture<T> submitListenable(Callable<T> task) {
+        showThreadPoolInfo("2. do submitListenable");
+        return super.submitListenable(task);
+    }
+}

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/AsyncService.java

@@ -0,0 +1,64 @@
+package com.zhongzheng.framework.web.service;
+
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.zhongzheng.common.core.domain.entity.SysDept;
+import com.zhongzheng.common.core.domain.entity.SysDictType;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.common.utils.spring.SpringUtils;
+import com.zhongzheng.framework.manager.AsyncManager;
+import com.zhongzheng.modules.system.domain.SysLogininfor;
+import com.zhongzheng.modules.system.domain.SysOperLog;
+import com.zhongzheng.modules.system.service.ISysDeptService;
+import com.zhongzheng.modules.system.service.ISysDictTypeService;
+import com.zhongzheng.modules.system.service.ISysLogininforService;
+import com.zhongzheng.modules.system.service.ISysOperLogService;
+import com.zhongzheng.modules.user.bo.UserWxFollowQueryBo;
+import com.zhongzheng.modules.user.domain.UserPlan;
+import com.zhongzheng.modules.user.domain.UserWxFollow;
+import com.zhongzheng.modules.user.service.IUserPlanService;
+import com.zhongzheng.modules.user.service.IUserWxFollowService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.TimerTask;
+import java.util.concurrent.CountDownLatch;
+
+
+@Component
+public class AsyncService {
+
+    @Autowired
+    private IUserWxFollowService iUserWxFollowService;
+
+    @Autowired
+    private WxLoginService wxLoginService;
+
+    public void executeAsync(UserWxFollowQueryBo bo,int index) {
+        List<UserWxFollow> list = iUserWxFollowService.getBatchList(bo);
+        if(list.size()==0||index>50){
+            return;
+        }
+        ServletUtils.httpServletRequest = ServletUtils.getRequest();
+        for (UserWxFollow userWxFollow:list) {
+            AsyncManager.me().execute(new TimerTask() {
+                @Override
+                public void run() {
+                    String unionId = wxLoginService.getWxGzhUserCgiInfo(userWxFollow.getGzhOpenId());
+                    LambdaUpdateWrapper<UserWxFollow> objectLambdaUpdateWrapper = Wrappers.lambdaUpdate();
+                    objectLambdaUpdateWrapper.eq(UserWxFollow::getId, userWxFollow.getId());
+                    objectLambdaUpdateWrapper.set(UserWxFollow::getUnionId, unionId);
+                    objectLambdaUpdateWrapper.set(UserWxFollow::getUpdateTime, DateUtils.getNowTime());
+                    iUserWxFollowService.update(null,objectLambdaUpdateWrapper);
+                }
+            });
+        }
+        bo.setId(list.get(list.size()-1).getId());
+        index++;
+        executeAsync(bo,index);
+    }
+}

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/WxLoginService.java

@@ -3,6 +3,7 @@ package com.zhongzheng.framework.web.service;
 
 import cn.hutool.core.lang.Validator;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -28,10 +29,14 @@ import com.zhongzheng.modules.user.domain.UserSchoolInfo;
 import com.zhongzheng.modules.user.entity.ClientLoginUser;
 import com.zhongzheng.modules.user.mapper.UserMapper;
 import com.zhongzheng.modules.user.mapper.UserSchoolInfoMapper;
+import com.zhongzheng.modules.user.mapper.UserWxFollowMapper;
 import com.zhongzheng.modules.user.service.IUserService;
+import com.zhongzheng.modules.user.service.IUserWxFollowService;
 import com.zhongzheng.modules.user.vo.UserVo;
 import com.zhongzheng.modules.wx.bo.WxLoginBody;
 import org.apache.commons.codec.binary.Base64;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
@@ -41,7 +46,9 @@ import javax.annotation.Resource;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -52,6 +59,8 @@ import java.util.concurrent.TimeUnit;
 @Component
 public class WxLoginService
 {
+    private static final Logger log = LoggerFactory.getLogger(WxLoginService.class);
+
     @Autowired
     private WxTokenService wxTokenService;
 
@@ -61,7 +70,6 @@ public class WxLoginService
     @Value("${wx.small.appsecret}")
     private String appsrcret;
 
-
     private String wxAuthUrl = "https://api.weixin.qq.com/sns/jscode2session";
 
     private String wxAuthParam = "appid=%s&secret=%s&js_code=%s&grant_type=authorization_code";
@@ -108,7 +116,8 @@ public class WxLoginService
     private RedisCache redisCache;
 
     @Autowired
-    private UserSchoolInfoMapper userSchoolInfoMapper;
+    private IUserWxFollowService iUserWxFollowService;
+
 
     public Map<String,String> test_login() {
         String unionId = "oQ2yp56PgQ-PfwN4vxTZhR5eTpzk";
@@ -342,37 +351,69 @@ public class WxLoginService
     public String getWxGzhAccessToken() {
         String key = "WX_GZH_ACCESS_TOKEN";
         String accessToken = redisCache.getCacheObject(key);
-    //    if(Validator.isEmpty(accessToken)){
+        if(Validator.isEmpty(accessToken)||accessToken.equals("null")){
             String param = String.format(gzh_wxTokenParam, gzh_appid, gzh_appsrcret);
             String resultString  = HttpUtils.sendGet(gzh_wxTokenUrl,param);
             //解析json
             JSONObject jsonObject = (JSONObject) JSONObject.parse(resultString);
             accessToken = String.valueOf(jsonObject.get("access_token"));
-            if(Validator.isNotEmpty(accessToken)){
+            if(Validator.isNotEmpty(accessToken)&&!accessToken.equals("null")){
                 redisCache.setCacheObject(key, accessToken,7100, TimeUnit.SECONDS);//7200有效期
             }
-   //     }
+        }
         return accessToken;
     }
 
-    public String getWxGzhUserList() {
+    public String getWxGzhUserList(String nextOpenid) {
         String accessToken = getWxGzhAccessToken();
-        String nextOpenid = null;
+        if(Validator.isEmpty(accessToken)){
+            throw new CustomException("accessToken 错误");
+        }
         String param = String.format(gzh_wxUserListParam, accessToken);
         if(Validator.isNotEmpty(nextOpenid)){
             param += "&next_openid="+nextOpenid;
+        }else{
+            iUserWxFollowService.cleanAllData();
         }
         String resultString  = HttpUtils.sendGet(gzh_wxUserListUrl,param);
-        System.out.println(resultString);
+        if(Validator.isNotEmpty(resultString)){
+            JSONObject userInfoJSON = null;
+            userInfoJSON = JSON.parseObject(resultString);
+            if(userInfoJSON.containsKey("total")){
+                Integer total = Integer.valueOf(String.valueOf(userInfoJSON.get("total")));
+                Integer count = Integer.valueOf(String.valueOf(userInfoJSON.get("count")));
+                String nextOpenidBack = String.valueOf(userInfoJSON.get("next_openid"));
+                if(Validator.isNotEmpty(nextOpenidBack)&&!nextOpenidBack.equals("")){
+                    getWxGzhUserList(nextOpenidBack);
+                }
+                if(userInfoJSON.containsKey("data")){
+                    List<String> openIdList = JSONArray.parseArray(userInfoJSON.getJSONObject("data").getJSONArray("openid").toJSONString(),String.class);
+                    List<List<String>> lists = ToolsUtils.splitListBycapacity(openIdList, 1000);
+                    for (List<String> listSub:lists) {
+                        iUserWxFollowService.insertByBatchAddBo(listSub);
+                    }
+                }
+            }
+        }
+    //    System.out.println(resultString);
         return resultString;
     }
 
     public String getWxGzhUserCgiInfo(String openid) {
         String accessToken = getWxGzhAccessToken();
+        if(Validator.isEmpty(accessToken)){
+            throw new CustomException("accessToken 错误");
+        }
         String param = String.format(gzh_wxUserCgiInfoParam, accessToken,openid);
         String resultString  = HttpUtils.sendGet(gzh_wxUserCgiInfoUrl,param);
-        System.out.println(resultString);
-        return resultString;
+        if(Validator.isNotEmpty(resultString)){
+            JSONObject userInfoJSON = null;
+            userInfoJSON = JSON.parseObject(resultString);
+            if(userInfoJSON.containsKey("unionid")){
+                return String.valueOf(userInfoJSON.get("unionid"));
+            }
+        }
+        return null;
     }
 
     //公众号获取用户信息

zhongzheng-system/pom.xml

@@ -52,4 +52,4 @@
         </dependency>
     </dependencies>
 
-</project>
+</project>

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeUserQueryBo.java

@@ -255,5 +255,12 @@ public class ClassGradeUserQueryBo extends BaseEntity {
 	@ApiModelProperty("有接口标识")
 	private Integer hasInterface;
 
+	@ApiModelProperty("公司名称")
+	private String companyName;
 
+	@ApiModelProperty("是否绑定微信 1是 0不是")
+	private Integer hasBindWx;
+
+	@ApiModelProperty("是否关注公众号 1是 0不是")
+	private Integer hasFollowWx;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassGradeStudentVo.java

@@ -201,4 +201,11 @@ public class ClassGradeStudentVo {
 	@Excel(name = "项目名")
 	@ApiModelProperty("项目名")
 	private String projectName;
+
+	@ApiModelProperty("用户是否绑定微信")
+	private Integer userBindWx;
+	@ApiModelProperty("用户是否关注微信")
+	private Integer userFollowWx;
+	@ApiModelProperty("用户学习时长（秒）")
+	private Integer userStudyDuration;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/bo/InformRemindAddBo.java

@@ -45,4 +45,10 @@ public class InformRemindAddBo {
     @Excel(name = "业务是否有关联 1是全部 2是部分关联")
     @ApiModelProperty("业务是否有关联 1是全部 2是部分关联")
     private Integer serviceStatus;
+    /** 公众号模板消息 1启用 0未启用 */
+    @ApiModelProperty("公众号模板消息 1启用 0未启用")
+    private Integer gzhTpStatus;
+    /** 1学员 2教务 */
+    @ApiModelProperty("1学员 2教务")
+    private Integer userType;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/bo/InformRemindEditBo.java

@@ -53,6 +53,11 @@ public class InformRemindEditBo {
     /** 业务ID */
     @ApiModelProperty("业务ID")
     private Long[] businessId;
-
+    /** 公众号模板消息 1启用 0未启用 */
+    @ApiModelProperty("公众号模板消息 1启用 0未启用")
+    private Integer gzhTpStatus;
+    /** 1学员 2教务 */
+    @ApiModelProperty("1学员 2教务")
+    private Integer userType;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/bo/InformRemindQueryBo.java

@@ -58,4 +58,10 @@ public class InformRemindQueryBo extends BaseEntity {
 	/** 站内信 1启用 0未启用 */
 	@ApiModelProperty("站内信 1启用 0未启用")
 	private Integer wayStatus;
+	/** 公众号模板消息 1启用 0未启用 */
+	@ApiModelProperty("公众号模板消息 1启用 0未启用")
+	private Integer gzhTpStatus;
+	/** 1学员 2教务 */
+	@ApiModelProperty("1学员 2教务")
+	private Integer userType;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/bo/InformSysUserAddBo.java

@@ -0,0 +1,69 @@
+package com.zhongzheng.modules.inform.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 通知绑定系统用户添加对象 inform_sys_user
+ *
+ * @author hjl
+ * @date 2022-08-04
+ */
+@Data
+@ApiModel("通知绑定系统用户添加对象")
+public class InformSysUserAddBo {
+
+    /** 系统用户id */
+    @ApiModelProperty("系统用户id")
+    private Long userId;
+    /** 发送时间 */
+    @ApiModelProperty("发送时间")
+    private Long sendTime;
+    /** 发送状态 1成功 0失败 2草稿 */
+    @ApiModelProperty("发送状态 1成功 0失败 2草稿")
+    private Integer sendStatus;
+    /** 已读回执 1已读 0未读 */
+    @ApiModelProperty("已读回执 1已读 0未读")
+    private Integer receiptStatus;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long updateTime;
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long informId;
+    /** 1系统通知 2教务通知 3短信通知 */
+    @ApiModelProperty("1系统通知 2教务通知 3短信通知")
+    private Integer systemStatus;
+    /** 绑定系统通知内容 */
+    @ApiModelProperty("绑定系统通知内容")
+    private Long remindId;
+    /** 系统通知内容 */
+    @ApiModelProperty("系统通知内容")
+    private String text;
+    /** 提醒项 */
+    @ApiModelProperty("提醒项")
+    private String remind;
+    /** 绑定商品ID */
+    @ApiModelProperty("绑定商品ID")
+    private Long goodsId;
+    /** 计划ID */
+    @ApiModelProperty("计划ID")
+    private Long planId;
+    /** 班级ID */
+    @ApiModelProperty("班级ID")
+    private Long gradeId;
+    /** 订单商品ID */
+    @ApiModelProperty("订单商品ID")
+    private Long orderGoodsId;
+    /** 状态 1有效 0无效 */
+    @ApiModelProperty("状态 1有效 0无效")
+    private Integer status;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/bo/InformSysUserEditBo.java

@@ -0,0 +1,85 @@
+package com.zhongzheng.modules.inform.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 通知绑定系统用户编辑对象 inform_sys_user
+ *
+ * @author hjl
+ * @date 2022-08-04
+ */
+@Data
+@ApiModel("通知绑定系统用户编辑对象")
+public class InformSysUserEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+    /** 系统用户id */
+    @ApiModelProperty("系统用户id")
+    private Long userId;
+
+    /** 发送时间 */
+    @ApiModelProperty("发送时间")
+    private Long sendTime;
+
+    /** 发送状态 1成功 0失败 2草稿 */
+    @ApiModelProperty("发送状态 1成功 0失败 2草稿")
+    private Integer sendStatus;
+
+    /** 已读回执 1已读 0未读 */
+    @ApiModelProperty("已读回执 1已读 0未读")
+    private Integer receiptStatus;
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long updateTime;
+
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long informId;
+
+    /** 1系统通知 2教务通知 3短信通知 */
+    @ApiModelProperty("1系统通知 2教务通知 3短信通知")
+    private Integer systemStatus;
+
+    /** 绑定系统通知内容 */
+    @ApiModelProperty("绑定系统通知内容")
+    private Long remindId;
+
+    /** 系统通知内容 */
+    @ApiModelProperty("系统通知内容")
+    private String text;
+
+    /** 提醒项 */
+    @ApiModelProperty("提醒项")
+    private String remind;
+
+    /** 绑定商品ID */
+    @ApiModelProperty("绑定商品ID")
+    private Long goodsId;
+
+    /** 计划ID */
+    @ApiModelProperty("计划ID")
+    private Long planId;
+
+    /** 班级ID */
+    @ApiModelProperty("班级ID")
+    private Long gradeId;
+
+    /** 订单商品ID */
+    @ApiModelProperty("订单商品ID")
+    private Long orderGoodsId;
+
+    /** 状态 1有效 0无效 */
+    @ApiModelProperty("状态 1有效 0无效")
+    private Integer status;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/bo/InformSysUserQueryBo.java

@@ -0,0 +1,81 @@
+package com.zhongzheng.modules.inform.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 通知绑定系统用户分页查询对象 inform_sys_user
+ *
+ * @author hjl
+ * @date 2022-08-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("通知绑定系统用户分页查询对象")
+public class InformSysUserQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 系统用户id */
+	@ApiModelProperty("系统用户id")
+	private Long userId;
+	/** 发送时间 */
+	@ApiModelProperty("发送时间")
+	private Long sendTime;
+	/** 发送状态 1成功 0失败 2草稿 */
+	@ApiModelProperty("发送状态 1成功 0失败 2草稿")
+	private Integer sendStatus;
+	/** 已读回执 1已读 0未读 */
+	@ApiModelProperty("已读回执 1已读 0未读")
+	private Integer receiptStatus;
+	/** $column.columnComment */
+	@ApiModelProperty("$column.columnComment")
+	private Long informId;
+	/** 1系统通知 2教务通知 3短信通知 */
+	@ApiModelProperty("1系统通知 2教务通知 3短信通知")
+	private Integer systemStatus;
+	/** 绑定系统通知内容 */
+	@ApiModelProperty("绑定系统通知内容")
+	private Long remindId;
+	/** 系统通知内容 */
+	@ApiModelProperty("系统通知内容")
+	private String text;
+	/** 提醒项 */
+	@ApiModelProperty("提醒项")
+	private String remind;
+	/** 绑定商品ID */
+	@ApiModelProperty("绑定商品ID")
+	private Long goodsId;
+	/** 计划ID */
+	@ApiModelProperty("计划ID")
+	private Long planId;
+	/** 班级ID */
+	@ApiModelProperty("班级ID")
+	private Long gradeId;
+	/** 订单商品ID */
+	@ApiModelProperty("订单商品ID")
+	private Long orderGoodsId;
+	/** 状态 1有效 0无效 */
+	@ApiModelProperty("状态 1有效 0无效")
+	private Integer status;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/domain/InformRemind.java

@@ -46,4 +46,8 @@ private static final long serialVersionUID=1L;
 
     /** 业务是否有关联 1是全部 2是部分关联 */
     private Integer serviceStatus;
+    /** 公众号模板消息 1启用 0未启用 */
+    private Integer gzhTpStatus;
+    /** 1学员 2教务 */
+    private Integer userType;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/domain/InformSysUser.java

@@ -0,0 +1,63 @@
+package com.zhongzheng.modules.inform.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.zhongzheng.common.annotation.Excel;
+
+/**
+ * 通知绑定系统用户对象 inform_sys_user
+ *
+ * @author hjl
+ * @date 2022-08-04
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("inform_sys_user")
+public class InformSysUser implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+    /** 系统用户id */
+    private Long userId;
+    /** 发送时间 */
+    private Long sendTime;
+    /** 发送状态 1成功 0失败 2草稿 */
+    private Integer sendStatus;
+    /** 已读回执 1已读 0未读 */
+    private Integer receiptStatus;
+    /** 创建时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** $column.columnComment */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+    /** $column.columnComment */
+    private Long informId;
+    /** 1系统通知 2教务通知 3短信通知 */
+    private Integer systemStatus;
+    /** 绑定系统通知内容 */
+    private Long remindId;
+    /** 系统通知内容 */
+    private String text;
+    /** 提醒项 */
+    private String remind;
+    /** 绑定商品ID */
+    private Long goodsId;
+    /** 计划ID */
+    private Long planId;
+    /** 班级ID */
+    private Long gradeId;
+    /** 订单商品ID */
+    private Long orderGoodsId;
+    /** 状态 1有效 0无效 */
+    private Integer status;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/mapper/InformSysUserMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.inform.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.inform.domain.InformSysUser;
+
+/**
+ * 通知绑定系统用户Mapper接口
+ *
+ * @author hjl
+ * @date 2022-08-04
+ */
+public interface InformSysUserMapper extends BaseMapper<InformSysUser> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/service/IInformSysUserService.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.inform.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.inform.bo.InformSysUserAddBo;
+import com.zhongzheng.modules.inform.bo.InformSysUserEditBo;
+import com.zhongzheng.modules.inform.bo.InformSysUserQueryBo;
+import com.zhongzheng.modules.inform.domain.InformSysUser;
+import com.zhongzheng.modules.inform.vo.InformSysUserVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 通知绑定系统用户Service接口
+ *
+ * @author hjl
+ * @date 2022-08-04
+ */
+public interface IInformSysUserService extends IService<InformSysUser> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	InformSysUserVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<InformSysUserVo> queryList(InformSysUserQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入通知绑定系统用户
+	 * @param bo 通知绑定系统用户新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(InformSysUserAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改通知绑定系统用户
+	 * @param bo 通知绑定系统用户编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(InformSysUserEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/service/impl/InformSysUserServiceImpl.java

@@ -0,0 +1,112 @@
+package com.zhongzheng.modules.inform.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.inform.bo.InformSysUserAddBo;
+import com.zhongzheng.modules.inform.bo.InformSysUserEditBo;
+import com.zhongzheng.modules.inform.bo.InformSysUserQueryBo;
+import com.zhongzheng.modules.inform.domain.InformSysUser;
+import com.zhongzheng.modules.inform.mapper.InformSysUserMapper;
+import com.zhongzheng.modules.inform.service.IInformSysUserService;
+import com.zhongzheng.modules.inform.vo.InformSysUserVo;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.Page;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 通知绑定系统用户Service业务层处理
+ *
+ * @author hjl
+ * @date 2022-08-04
+ */
+@Service
+public class InformSysUserServiceImpl extends ServiceImpl<InformSysUserMapper, InformSysUser> implements IInformSysUserService {
+
+    @Override
+    public InformSysUserVo queryById(Long id){
+        InformSysUser db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, InformSysUserVo.class);
+    }
+
+    @Override
+    public List<InformSysUserVo> queryList(InformSysUserQueryBo bo) {
+        LambdaQueryWrapper<InformSysUser> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getUserId() != null, InformSysUser::getUserId, bo.getUserId());
+        lqw.eq(bo.getSendTime() != null, InformSysUser::getSendTime, bo.getSendTime());
+        lqw.eq(bo.getSendStatus() != null, InformSysUser::getSendStatus, bo.getSendStatus());
+        lqw.eq(bo.getReceiptStatus() != null, InformSysUser::getReceiptStatus, bo.getReceiptStatus());
+        lqw.eq(bo.getInformId() != null, InformSysUser::getInformId, bo.getInformId());
+        lqw.eq(bo.getSystemStatus() != null, InformSysUser::getSystemStatus, bo.getSystemStatus());
+        lqw.eq(bo.getRemindId() != null, InformSysUser::getRemindId, bo.getRemindId());
+        lqw.eq(StrUtil.isNotBlank(bo.getText()), InformSysUser::getText, bo.getText());
+        lqw.eq(StrUtil.isNotBlank(bo.getRemind()), InformSysUser::getRemind, bo.getRemind());
+        lqw.eq(bo.getGoodsId() != null, InformSysUser::getGoodsId, bo.getGoodsId());
+        lqw.eq(bo.getPlanId() != null, InformSysUser::getPlanId, bo.getPlanId());
+        lqw.eq(bo.getGradeId() != null, InformSysUser::getGradeId, bo.getGradeId());
+        lqw.eq(bo.getOrderGoodsId() != null, InformSysUser::getOrderGoodsId, bo.getOrderGoodsId());
+        lqw.eq(bo.getStatus() != null, InformSysUser::getStatus, bo.getStatus());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<InformSysUserVo> entity2Vo(Collection<InformSysUser> collection) {
+        List<InformSysUserVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, InformSysUserVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<InformSysUser> page = (Page<InformSysUser>)collection;
+            Page<InformSysUserVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(InformSysUserAddBo bo) {
+        InformSysUser add = BeanUtil.toBean(bo, InformSysUser.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(InformSysUserEditBo bo) {
+        InformSysUser update = BeanUtil.toBean(bo, InformSysUser.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(InformSysUser entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/vo/InformRemindVo.java

@@ -54,4 +54,12 @@ public class InformRemindVo {
 	@Excel(name = "绑定业务")
 	@ApiModelProperty("绑定业务")
 	private List<InformRemindBusinessVo> informRemindBusiness;
+	/** 公众号模板消息 1启用 0未启用 */
+	@Excel(name = "公众号模板消息 1启用 0未启用")
+	@ApiModelProperty("公众号模板消息 1启用 0未启用")
+	private Integer gzhTpStatus;
+	/** 1学员 2教务 */
+	@Excel(name = "1学员 2教务")
+	@ApiModelProperty("1学员 2教务")
+	private Integer userType;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/vo/InformSysUserVo.java

@@ -0,0 +1,83 @@
+package com.zhongzheng.modules.inform.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 通知绑定系统用户视图对象 mall_package
+ *
+ * @author hjl
+ * @date 2022-08-04
+ */
+@Data
+@ApiModel("通知绑定系统用户视图对象")
+public class InformSysUserVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** 系统用户id */
+	@Excel(name = "系统用户id")
+	@ApiModelProperty("系统用户id")
+	private Long userId;
+	/** 发送时间 */
+	@Excel(name = "发送时间")
+	@ApiModelProperty("发送时间")
+	private Long sendTime;
+	/** 发送状态 1成功 0失败 2草稿 */
+	@Excel(name = "发送状态 1成功 0失败 2草稿")
+	@ApiModelProperty("发送状态 1成功 0失败 2草稿")
+	private Integer sendStatus;
+	/** 已读回执 1已读 0未读 */
+	@Excel(name = "已读回执 1已读 0未读")
+	@ApiModelProperty("已读回执 1已读 0未读")
+	private Integer receiptStatus;
+	/** $column.columnComment */
+	@Excel(name = "已读回执 1已读 0未读")
+	@ApiModelProperty("$column.columnComment")
+	private Long informId;
+	/** 1系统通知 2教务通知 3短信通知 */
+	@Excel(name = "1系统通知 2教务通知 3短信通知")
+	@ApiModelProperty("1系统通知 2教务通知 3短信通知")
+	private Integer systemStatus;
+	/** 绑定系统通知内容 */
+	@Excel(name = "绑定系统通知内容")
+	@ApiModelProperty("绑定系统通知内容")
+	private Long remindId;
+	/** 系统通知内容 */
+	@Excel(name = "系统通知内容")
+	@ApiModelProperty("系统通知内容")
+	private String text;
+	/** 提醒项 */
+	@Excel(name = "提醒项")
+	@ApiModelProperty("提醒项")
+	private String remind;
+	/** 绑定商品ID */
+	@Excel(name = "绑定商品ID")
+	@ApiModelProperty("绑定商品ID")
+	private Long goodsId;
+	/** 计划ID */
+	@Excel(name = "计划ID")
+	@ApiModelProperty("计划ID")
+	private Long planId;
+	/** 班级ID */
+	@Excel(name = "班级ID")
+	@ApiModelProperty("班级ID")
+	private Long gradeId;
+	/** 订单商品ID */
+	@Excel(name = "订单商品ID")
+	@ApiModelProperty("订单商品ID")
+	private Long orderGoodsId;
+	/** 状态 1有效 0无效 */
+	@Excel(name = "状态 1有效 0无效")
+	@ApiModelProperty("状态 1有效 0无效")
+	private Integer status;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserWxFollowAddBo.java

@@ -0,0 +1,36 @@
+package com.zhongzheng.modules.user.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 微信用户关注列添加对象 user_wx_follow
+ *
+ * @author hjl
+ * @date 2022-08-03
+ */
+@Data
+@ApiModel("微信用户关注列添加对象")
+public class UserWxFollowAddBo {
+
+    /** 微信unionId */
+    @ApiModelProperty("微信unionId")
+    private String unionId;
+    /** 微信公众号openid */
+    @ApiModelProperty("微信公众号openid")
+    private String gzhOpenId;
+    /** 状态 1正常 0关闭 */
+    @ApiModelProperty("状态 1正常 0关闭")
+    private Integer status;
+    /** 添加时间 */
+    @ApiModelProperty("添加时间")
+    private Long createTime;
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserWxFollowEditBo.java

@@ -0,0 +1,39 @@
+package com.zhongzheng.modules.user.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 微信用户关注列编辑对象 user_wx_follow
+ *
+ * @author hjl
+ * @date 2022-08-03
+ */
+@Data
+@ApiModel("微信用户关注列编辑对象")
+public class UserWxFollowEditBo {
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+    /** 微信unionId */
+    @ApiModelProperty("微信unionId")
+    private String unionId;
+
+    /** 微信公众号openid */
+    @ApiModelProperty("微信公众号openid")
+    private String gzhOpenId;
+
+    /** 状态 1正常 0关闭 */
+    @ApiModelProperty("状态 1正常 0关闭")
+    private Integer status;
+
+
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserWxFollowQueryBo.java

@@ -0,0 +1,50 @@
+package com.zhongzheng.modules.user.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 微信用户关注列分页查询对象 user_wx_follow
+ *
+ * @author hjl
+ * @date 2022-08-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("微信用户关注列分页查询对象")
+public class UserWxFollowQueryBo extends BaseEntity {
+	/** $column.columnComment */
+	@ApiModelProperty("$column.columnComment")
+	private Long id;
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 微信unionId */
+	@ApiModelProperty("微信unionId")
+	private String unionId;
+	/** 微信公众号openid */
+	@ApiModelProperty("微信公众号openid")
+	private String gzhOpenId;
+	/** 状态 1正常 0关闭 */
+	@ApiModelProperty("状态 1正常 0关闭")
+	private Integer status;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/User.java

@@ -195,4 +195,9 @@ private static final long serialVersionUID=1L;
 
     @TableField(exist = false)
     private Long goodsLiveNum;
+
+    @TableField(exist = false)
+    private Integer userBindWx;
+    @TableField(exist = false)
+    private Integer userFollowWx;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/UserWxFollow.java

@@ -0,0 +1,41 @@
+package com.zhongzheng.modules.user.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.zhongzheng.common.annotation.Excel;
+
+/**
+ * 微信用户关注列对象 user_wx_follow
+ *
+ * @author hjl
+ * @date 2022-08-03
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("user_wx_follow")
+public class UserWxFollow implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+    /** 微信unionId */
+    private String unionId;
+    /** 微信公众号openid */
+    private String gzhOpenId;
+    /** 状态 1正常 0关闭 */
+    private Integer status;
+    /** 添加时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 修改时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/UserWxFollowMapper.java

@@ -0,0 +1,20 @@
+package com.zhongzheng.modules.user.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.user.bo.UserWxFollowQueryBo;
+import com.zhongzheng.modules.user.domain.UserWxFollow;
+import com.zhongzheng.modules.user.vo.UserWxFollowVo;
+
+import java.util.List;
+
+/**
+ * 微信用户关注列Mapper接口
+ *
+ * @author hjl
+ * @date 2022-08-03
+ */
+public interface UserWxFollowMapper extends BaseMapper<UserWxFollow> {
+    List<UserWxFollow> getBatchList(UserWxFollowQueryBo bo);
+    void truncateTable();
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/IUserWxFollowService.java

@@ -0,0 +1,64 @@
+package com.zhongzheng.modules.user.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.system.domain.SysLogininfor;
+import com.zhongzheng.modules.user.bo.UserWxFollowAddBo;
+import com.zhongzheng.modules.user.bo.UserWxFollowEditBo;
+import com.zhongzheng.modules.user.bo.UserWxFollowQueryBo;
+import com.zhongzheng.modules.user.domain.UserWxFollow;
+import com.zhongzheng.modules.user.mapper.UserWxFollowMapper;
+import com.zhongzheng.modules.user.vo.UserWxFollowVo;
+import org.springframework.scheduling.annotation.Async;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+
+/**
+ * 微信用户关注列Service接口
+ *
+ * @author hjl
+ * @date 2022-08-03
+ */
+public interface IUserWxFollowService extends IService<UserWxFollow> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	UserWxFollowVo queryById(String unionId);
+
+	/**
+	 * 查询列表
+	 */
+	List<UserWxFollowVo> queryList(UserWxFollowQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入微信用户关注列
+	 * @param bo 微信用户关注列新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(UserWxFollowAddBo bo);
+
+	void insertByBatchAddBo(List<String> openIdList);
+
+	void cleanAllData();
+
+	List<UserWxFollow> getBatchList(UserWxFollowQueryBo bo);
+
+	/**
+	 * 根据编辑业务对象修改微信用户关注列
+	 * @param bo 微信用户关注列编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(UserWxFollowEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+	public void updateInfofor(UserWxFollow userWxFollow);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserWxFollowServiceImpl.java

@@ -0,0 +1,156 @@
+package com.zhongzheng.modules.user.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.user.bo.UserWxFollowAddBo;
+import com.zhongzheng.modules.user.bo.UserWxFollowEditBo;
+import com.zhongzheng.modules.user.bo.UserWxFollowQueryBo;
+import com.zhongzheng.modules.user.domain.UserWxFollow;
+import com.zhongzheng.modules.user.mapper.UserWxFollowMapper;
+import com.zhongzheng.modules.user.service.IUserWxFollowService;
+import com.zhongzheng.modules.user.vo.UserWxFollowVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.Page;
+
+import java.util.*;
+import java.util.concurrent.CountDownLatch;
+import java.util.stream.Collectors;
+
+/**
+ * 微信用户关注列Service业务层处理
+ *
+ * @author hjl
+ * @date 2022-08-03
+ */
+@Service
+public class UserWxFollowServiceImpl extends ServiceImpl<UserWxFollowMapper, UserWxFollow> implements IUserWxFollowService {
+
+
+
+    @Override
+    public UserWxFollowVo queryById(String unionId){
+        UserWxFollow db = this.baseMapper.selectById(unionId);
+        return BeanUtil.toBean(db, UserWxFollowVo.class);
+    }
+
+    @Override
+    public List<UserWxFollowVo> queryList(UserWxFollowQueryBo bo) {
+        LambdaQueryWrapper<UserWxFollow> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StrUtil.isNotBlank(bo.getUnionId()), UserWxFollow::getUnionId, bo.getUnionId());
+        lqw.eq(StrUtil.isNotBlank(bo.getGzhOpenId()), UserWxFollow::getGzhOpenId, bo.getGzhOpenId());
+        lqw.eq(bo.getStatus() != null, UserWxFollow::getStatus, bo.getStatus());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<UserWxFollowVo> entity2Vo(Collection<UserWxFollow> collection) {
+        List<UserWxFollowVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, UserWxFollowVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<UserWxFollow> page = (Page<UserWxFollow>)collection;
+            Page<UserWxFollowVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(UserWxFollowAddBo bo) {
+        UserWxFollow add = BeanUtil.toBean(bo, UserWxFollow.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public void insertByBatchAddBo(List<String> openIdList) {
+        Collection<UserWxFollow> coll = new HashSet<>();
+        for(String openId : openIdList){
+            UserWxFollow addItem = new UserWxFollow();
+            Calendar cal = Calendar.getInstance();
+            cal.set(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH), cal.get(Calendar.DAY_OF_MONTH), 0, 0, 0);
+            Long todZero = cal.getTimeInMillis() / 1000;  //今天凌晨
+            addItem.setGzhOpenId(openId);
+            addItem.setCreateTime(todZero);
+            addItem.setUpdateTime(todZero);
+            coll.add(addItem);
+        }
+        saveBatch(coll);
+    }
+
+    @Override
+    public void cleanAllData() {
+        baseMapper.truncateTable();
+    }
+
+    @Override
+    public List<UserWxFollow> getBatchList(UserWxFollowQueryBo bo) {
+        List<UserWxFollow> list = baseMapper.getBatchList(bo);
+        CountDownLatch countDownLatch = new CountDownLatch(list.size());
+        IUserWxFollowService context = this;
+        for (UserWxFollow userWxFollow:list) {
+           /* RsyncManager.me().execute(new TimerTask() {
+                @Override
+                public void run() {
+                    LambdaUpdateWrapper<UserWxFollow> objectLambdaUpdateWrapper = Wrappers.lambdaUpdate();
+                    objectLambdaUpdateWrapper.eq(UserWxFollow::getId, userWxFollow.getId());
+                    objectLambdaUpdateWrapper.set(UserWxFollow::getUnionId, userWxFollow.getUnionId());
+                    objectLambdaUpdateWrapper.set(UserWxFollow::getUpdateTime, DateUtils.getNowTime());
+                    context.update(null,objectLambdaUpdateWrapper);
+                }
+            });*/
+        //    asyncService.executeAsync(userWxFollow, countDownLatch,this);
+        }
+        update();
+        return list;
+    }
+
+
+    @Override
+    public Boolean updateByEditBo(UserWxFollowEditBo bo) {
+        UserWxFollow update = BeanUtil.toBean(bo, UserWxFollow.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(UserWxFollow entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+
+    @Override
+    public void updateInfofor(UserWxFollow userWxFollow) {
+        userWxFollow.setUpdateTime(DateUtils.getNowTime());
+        updateById(userWxFollow);
+    }
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserVo.java

@@ -248,6 +248,11 @@ public class UserVo {
 	@ApiModelProperty("导入编号")
 	private String importNo;
 
+	@ApiModelProperty("用户是否绑定微信")
+	private Integer userBindWx;
+	@ApiModelProperty("用户是否关注微信")
+	private Integer userFollowWx;
+
 	/** 1在职 0离职 */
 	@Excel(name = "班級")
 	@ApiModelProperty("班級")

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserWxFollowVo.java

@@ -0,0 +1,38 @@
+package com.zhongzheng.modules.user.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 微信用户关注列视图对象 mall_package
+ *
+ * @author hjl
+ * @date 2022-08-03
+ */
+@Data
+@ApiModel("微信用户关注列视图对象")
+public class UserWxFollowVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+	/** 微信unionId */
+	@Excel(name = "微信unionId")
+	@ApiModelProperty("微信unionId")
+	private String unionId;
+	/** 微信公众号openid */
+	@Excel(name = "微信公众号openid")
+	@ApiModelProperty("微信公众号openid")
+	private String gzhOpenId;
+	/** 状态 1正常 0关闭 */
+	@Excel(name = "状态 1正常 0关闭")
+	@ApiModelProperty("状态 1正常 0关闭")
+	private Integer status;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/wx/bo/WxLoginBody.java

@@ -40,5 +40,7 @@ public class WxLoginBody {
     @ApiModelProperty("扫码标识码")
     private String scanCode;
 
+    private String nextOpenid;
+
 
 }

zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeMapper.xml

@@ -168,6 +168,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="reason" column="reason"/>
         <result property="projectName" column="project_name"/>
         <result property="businessName" column="business_name"/>
+
+        <result property="userBindWx" column="user_bind_wx"/>
+        <result property="userFollowWx" column="user_follow_wx"/>
+        <result property="userStudyDuration" column="user_study_duration"/>
     </resultMap>
 
 
@@ -401,7 +405,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         u.province,
         cgu.reason,
         cb.business_name,
-        cpt.project_name
+        cpt.project_name,
+        (case WHEN u.union_id is null then 0 ELSE 1 end) as user_bind_wx,
+        (case WHEN uwf.gzh_open_id is null then 0 ELSE 1 end) as user_follow_wx,
+        (SELECT IFNULL(SUM(usr.study_duration),0) from user_study_record usr where usr.user_id = cgu.user_id and usr.grade_id = cgu.grade_id) as user_study_duration
         FROM
         class_grade_user cgu
         LEFT JOIN class_grade cg ON cgu.grade_id = cg.grade_id
@@ -411,6 +418,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN major m ON g.major_id = m.id
         LEFT JOIN course_business cb ON g.business_id = cb.id
         LEFT JOIN course_project_type cpt ON g.project_id = cpt.id
+        LEFT JOIN user_wx_follow uwf ON u.union_id = uwf.union_id
         where 1=1
 
         <if test="gradeId != null and gradeId !='' ">
@@ -438,6 +446,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="realname != null and realname != ''">
             AND u.realname like concat('%', #{realname}, '%')
         </if>
+        <if test="companyName != null and companyName != ''">
+            AND u.company_name like concat('%', #{companyName}, '%')
+        </if>
         <if test="idCard != null and idCard != ''">
             AND u.id_card = #{idCard}
         </if>
@@ -486,6 +497,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="hasInterface != null and hasInterface == 2">
             AND cg.no_interface_account_id is not null
         </if>
+        <if test="hasBindWx != null and hasBindWx == 1 ">
+            AND u.union_id is not null
+        </if>
+        <if test="hasBindWx != null and hasBindWx == 0 ">
+            AND u.union_id is null
+        </if>
+        <if test="hasFollowWx != null and hasFollowWx == 1 ">
+            AND uwf.gzh_open_id is not null
+        </if>
+        <if test="hasFollowWx != null and hasFollowWx == 0 ">
+            AND uwf.gzh_open_id is null
+        </if>
         order by user_info_status desc ,user_status desc ,cgu.id desc
     </select>
 

zhongzheng-system/src/main/resources/mapper/modules/inform/InformRemindMapper.xml

@@ -13,6 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="wayStatus" column="way_status"/>
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
+        <result property="gzhTpStatus" column="gzh_tp_status"/>
     </resultMap>
 
 

zhongzheng-system/src/main/resources/mapper/modules/inform/InformSysUserMapper.xml

@@ -0,0 +1,28 @@
+<?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.zhongzheng.modules.inform.mapper.InformSysUserMapper">
+
+    <resultMap type="com.zhongzheng.modules.inform.domain.InformSysUser" id="InformSysUserResult">
+        <result property="id" column="id"/>
+        <result property="userId" column="user_id"/>
+        <result property="sendTime" column="send_time"/>
+        <result property="sendStatus" column="send_status"/>
+        <result property="receiptStatus" column="receipt_status"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="informId" column="inform_id"/>
+        <result property="systemStatus" column="system_status"/>
+        <result property="remindId" column="remind_id"/>
+        <result property="text" column="text"/>
+        <result property="remind" column="remind"/>
+        <result property="goodsId" column="goods_id"/>
+        <result property="planId" column="plan_id"/>
+        <result property="gradeId" column="grade_id"/>
+        <result property="orderGoodsId" column="order_goods_id"/>
+        <result property="status" column="status"/>
+    </resultMap>
+
+
+</mapper>

zhongzheng-system/src/main/resources/mapper/modules/user/UserMapper.xml

@@ -51,6 +51,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="goodsBankNum" column="goods_bank_num"/>
         <result property="importNo" column="import_no"/>
         <result property="goodsLiveNum" column="goods_live_num"/>
+        <result property="userBindWx" column="user_bind_wx"/>
+        <result property="userFollowWx" column="user_follow_wx"/>
     </resultMap>
 
 
@@ -139,12 +141,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectList" parameterType="com.zhongzheng.modules.user.bo.UserQueryBo" resultMap="UserResult">
         SELECT DISTINCT
-        u.*
+        u.*,
+        (case WHEN u.union_id is null then 0 ELSE 1 end) as user_bind_wx,
+        (case WHEN uwf.gzh_open_id is null then 0 ELSE 1 end) as user_follow_wx
         <if test="getOrderNum != null and getOrderNum == 1" >
         ,ou.goods_course_num,ou.goods_bank_num,ou.goods_live_num
         </if>
         FROM
         `user` u
+        LEFT JOIN user_wx_follow uwf ON u.union_id = uwf.union_id
         <if test="getOrderNum != null and getOrderNum == 1" >
             LEFT JOIN (
             SELECT

zhongzheng-system/src/main/resources/mapper/modules/user/UserWxFollowMapper.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.zhongzheng.modules.user.mapper.UserWxFollowMapper">
+
+    <resultMap type="com.zhongzheng.modules.user.domain.UserWxFollow" id="UserWxFollowResult">
+        <result property="id" column="id"/>
+        <result property="unionId" column="union_id"/>
+        <result property="gzhOpenId" column="gzh_open_id"/>
+        <result property="status" column="status"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+    <select id="getBatchList" parameterType="com.zhongzheng.modules.user.bo.UserWxFollowQueryBo" resultMap="UserWxFollowResult">
+        SELECT
+            *
+        FROM
+            user_wx_follow
+        WHERE
+           union_id IS NULL
+        <if test="id != null">
+            AND id > #{id}
+        </if>
+        ORDER BY
+            id
+            LIMIT 1000
+    </select>
+
+    <update id="truncateTable" >
+        TRUNCATE TABLE user_wx_follow
+    </update>
+
+</mapper>