fix(提交下载，异步下载修改成定时任务下载)

src/main/java/com/mokamrp/privates/config/RedisConfig.java

@@ -0,0 +1,117 @@
+package com.mokamrp.privates.config;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.cache.annotation.CachingConfigurerSupport;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.core.*;
+import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+
+/**
+ * redis配置类
+ * @program: springbootdemo
+ * @Date: 2021/04/23 15:20
+ * @Author: gy
+ * @Description:
+ */
+@Configuration
+@EnableCaching //开启注解
+public class RedisConfig extends CachingConfigurerSupport {
+
+    /**
+     * retemplate相关配置
+     * @param factory
+     * @return
+     */
+    @Bean
+    public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory factory) {
+
+        RedisTemplate<String, Object> template = new RedisTemplate<>();
+        // 配置连接工厂
+        template.setConnectionFactory(factory);
+
+        //使用Jackson2JsonRedisSerializer来序列化和反序列化redis的value值（默认使用JDK的序列化方式）
+        Jackson2JsonRedisSerializer jacksonSeial = new Jackson2JsonRedisSerializer(Object.class);
+
+        ObjectMapper om = new ObjectMapper();
+        // 指定要序列化的域，field,get和set,以及修饰符范围，ANY是都有包括private和public
+        om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
+        // 指定序列化输入的类型，类必须是非final修饰的，final修饰的类，比如String,Integer等会跑出异常
+        om.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL);
+        jacksonSeial.setObjectMapper(om);
+
+        // 值采用json序列化
+        template.setValueSerializer(jacksonSeial);
+        //使用StringRedisSerializer来序列化和反序列化redis的key值
+        template.setKeySerializer(new StringRedisSerializer());
+
+        // 设置hash key 和value序列化模式
+        template.setHashKeySerializer(new StringRedisSerializer());
+        template.setHashValueSerializer(jacksonSeial);
+        template.afterPropertiesSet();
+
+        return template;
+    }
+
+    /**
+     * 对hash类型的数据操作
+     *
+     * @param redisTemplate
+     * @return
+     */
+    @Bean
+    public HashOperations<String, String, Object> hashOperations(RedisTemplate<String, Object> redisTemplate) {
+        return redisTemplate.opsForHash();
+    }
+
+    /**
+     * 对redis字符串类型数据操作
+     *
+     * @param redisTemplate
+     * @return
+     */
+    @Bean
+    public ValueOperations<String, Object> valueOperations(RedisTemplate<String, Object> redisTemplate) {
+        return redisTemplate.opsForValue();
+    }
+
+    /**
+     * 对链表类型的数据操作
+     *
+     * @param redisTemplate
+     * @return
+     */
+    @Bean
+    public ListOperations<String, Object> listOperations(RedisTemplate<String, Object> redisTemplate) {
+        return redisTemplate.opsForList();
+    }
+
+    /**
+     * 对无序集合类型的数据操作
+     *
+     * @param redisTemplate
+     * @return
+     */
+    @Bean
+    public SetOperations<String, Object> setOperations(RedisTemplate<String, Object> redisTemplate) {
+        return redisTemplate.opsForSet();
+    }
+
+    /**
+     * 对有序集合类型的数据操作
+     *
+     * @param redisTemplate
+     * @return
+     */
+    @Bean
+    public ZSetOperations<String, Object> zSetOperations(RedisTemplate<String, Object> redisTemplate) {
+        return redisTemplate.opsForZSet();
+    }
+
+}
+

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

@@ -9,12 +9,20 @@ import com.aliyun.oss.model.PutObjectRequest;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.mokamrp.privates.config.OSSConfiguration;
+import com.mokamrp.privates.entity.JobRedis;
+import com.mokamrp.privates.entity.JobRoomJobRedis;
+import com.mokamrp.privates.entity.JobWorkContactEmployeeRedis;
 import com.mokamrp.privates.help.AjaxResult;
+import com.mokamrp.privates.interceptor.AuthUser;
+import com.mokamrp.privates.mapper.pojo.Downfile;
+import com.mokamrp.privates.mapper.pojo.User;
 import com.mokamrp.privates.mapper.pojo.WorkContactEmployee;
 import com.mokamrp.privates.mapper.pojo.WorkEmployee;
 import com.mokamrp.privates.mapper.vo.WorkContactEmployeeVo;
+import com.mokamrp.privates.service.DownfileService;
 import com.mokamrp.privates.service.WorkContactEmployeeService;
 import com.mokamrp.privates.utils.OssFile;
+import com.mokamrp.privates.utils.RedisUtil;
 import io.netty.handler.codec.json.JsonObjectDecoder;
 import lombok.extern.flogger.Flogger;
 import org.apache.ibatis.annotations.Param;
@@ -27,6 +35,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.constraints.Max;
 import java.io.ByteArrayInputStream;
@@ -43,16 +52,21 @@ import java.util.*;
  */
 @RestController
 @RequestMapping("/workContactEmployee")
-@EnableAsync
 public class WorkContactEmployeeController extends BaseController<WorkContactEmployee>{
 
     @Autowired
     private WorkContactEmployeeService WorkContactEmployeeService;
 
+    @Resource
+    private RedisUtil redisUtil;
+
+    @Autowired
+    private DownfileService downfileService;
 
     @RequestMapping("/list")
     @ResponseBody
     public Object getList(
+            @AuthUser User authUser,
             Integer gender, Integer status,
             Integer pagesize, Integer page, String name,
             Integer start_deleted_at, Integer end_deleted_at,
@@ -79,10 +93,32 @@ public class WorkContactEmployeeController extends BaseController<WorkContactEmp
             Integer group_id, Integer corp_id,@RequestParam List employee_id, @RequestParam List tag_id , Integer channel_code_id
     ){
 
-        WorkContactEmployeeService.export(gender, status,name,
-                start_deleted_at, end_deleted_at,
-                start_created_at, end_created_at,
-                group_id, corp_id, employee_id, tag_id, channel_code_id);//所有
+        Downfile downObj = new Downfile();
+        downObj.setMsg(Downfile.DEFAULT_MSG);
+        downObj.setTitle(Downfile.WORK_CONTACT_EMPLOYEE);
+        downfileService.insert(downObj);
+
+        /*推送一个简单下载任务*/
+        JobRedis realJob = new JobRedis();
+        JobWorkContactEmployeeRedis job = new JobWorkContactEmployeeRedis();
+        job.setGender(gender);
+        job.setStatus(status);
+        job.setName(name);
+        job.setStartCreatedAt(start_created_at);
+        job.setEndCreatedAt(end_created_at);
+        job.setStartDeletedAt(start_deleted_at);
+        job.setEndDeletedAt(end_deleted_at);
+        job.setGroupId(group_id);
+        job.setCorpId(corp_id);
+        job.setEmployeeId(employee_id);
+        job.setTagId(tag_id);
+        job.setChannelCodeId(channel_code_id);
+
+        realJob.setJobWorkContactEmployeeRedis(job);
+        realJob.setJobName(JobWorkContactEmployeeRedis.TASK_NAME);
+        realJob.setDownFile(downObj);
+
+        redisUtil.leftPush(JobRedis.QUEUE_KEY,realJob);
 
         return AjaxResult.success("正在异步生成请稍后");
 

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

@@ -1,20 +1,27 @@
 package com.mokamrp.privates.controller;
 
 
+import com.fasterxml.jackson.datatype.jdk8.Jdk8OptionalBeanPropertyWriter;
 import com.mokamrp.privates.constant.HttpStatus;
+import com.mokamrp.privates.entity.JobRedis;
+import com.mokamrp.privates.entity.JobRoomJobRedis;
 import com.mokamrp.privates.entity.WorkRoomBandTagHandle;
 import com.mokamrp.privates.help.AjaxResult;
+import com.mokamrp.privates.mapper.pojo.Downfile;
 import com.mokamrp.privates.mapper.pojo.WorkRoom;
+import com.mokamrp.privates.service.DownfileService;
 import com.mokamrp.privates.service.WorkContactEmployeeService;
 import com.mokamrp.privates.service.WorkRoomService;
+import com.mokamrp.privates.utils.RedisUtil;
+import com.sun.xml.internal.bind.v2.runtime.reflect.opt.Const;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import javax.validation.Valid;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * <p>
@@ -26,12 +33,18 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("/workRoom")
-@EnableAsync
 public class WorkRoomController extends BaseController<WorkRoom> {
 
+
     @Autowired
     private WorkRoomService workRoomService;
 
+    @Autowired
+    private DownfileService downfileService;
+
+    @Resource
+    private RedisUtil redisUtil;
+
     @RequestMapping("/list")
     @ResponseBody
     public Object getList(
@@ -59,8 +72,33 @@ public class WorkRoomController extends BaseController<WorkRoom> {
             @RequestParam List owner_id, @RequestParam List tag_id
     ) {
 
+        /*
+        使用定时任务调用
         workRoomService.export(name, corp_id, start_create_time, end_create_time,
-                wx_chat_id, corp_group_id, owner_id, tag_id);//所有
+                wx_chat_id, corp_group_id, owner_id, tag_id);
+         */
+        /*先生成下载记录*/
+        Downfile downObj = new Downfile();
+        downObj.setMsg(Downfile.DEFAULT_MSG);
+        downObj.setTitle(Downfile.WORM_ROOM);
+        downfileService.insert(downObj);
+
+        /*推送简单任务*/
+        JobRedis realJob = new JobRedis();
+        JobRoomJobRedis job = new JobRoomJobRedis();
+        job.setName(name);
+        job.setCorpId(corp_id);
+        job.setStartCreateTime(start_create_time);
+        job.setEndCreateTtime(end_create_time);
+        job.setWxChatId(wx_chat_id);
+        job.setCorpGroupId(corp_group_id);
+        job.setOwnerId(owner_id);
+        job.setTagId(tag_id);
+        realJob.setJobRoomJobRedis(job);
+        realJob.setDownFile(downObj);
+        realJob.setJobName(JobRoomJobRedis.TASK_NAME);
+
+        redisUtil.leftPush(JobRedis.QUEUE_KEY,realJob);
 
         return AjaxResult.success("正在异步生成请稍后");
     }

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

@@ -0,0 +1,55 @@
+package com.mokamrp.privates.entity;
+
+import com.mokamrp.privates.mapper.pojo.Downfile;
+import com.sun.xml.internal.ws.api.ha.StickyFeature;
+
+import java.io.Serializable;
+import java.util.Map;
+
+public class JobRedis implements Serializable {
+
+    public final static String QUEUE_KEY = "java:job:mochat";
+
+    private Downfile downFile;
+
+
+
+    private String jobName;
+
+    private JobWorkContactEmployeeRedis jobWorkContactEmployeeRedis;
+
+    private JobRoomJobRedis jobRoomJobRedis;
+
+    public JobWorkContactEmployeeRedis getJobWorkContactEmployeeRedis() {
+        return jobWorkContactEmployeeRedis;
+    }
+
+    public void setJobWorkContactEmployeeRedis(JobWorkContactEmployeeRedis jobWorkContactEmployeeRedis) {
+        this.jobWorkContactEmployeeRedis = jobWorkContactEmployeeRedis;
+    }
+
+    public JobRoomJobRedis getJobRoomJobRedis() {
+        return jobRoomJobRedis;
+    }
+
+    public void setJobRoomJobRedis(JobRoomJobRedis jobRoomJobRedis) {
+        this.jobRoomJobRedis = jobRoomJobRedis;
+    }
+
+    public String getJobName() {
+        return jobName;
+    }
+
+    public void setJobName(String jobName) {
+        this.jobName = jobName;
+    }
+
+    public Downfile getDownFile() {
+        return downFile;
+    }
+
+    public void setDownFile(Downfile downFile) {
+        this.downFile = downFile;
+    }
+
+}

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

@@ -0,0 +1,93 @@
+package com.mokamrp.privates.entity;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+public class JobRoomJobRedis implements Serializable {
+
+    public final static String TASK_NAME = "Room";
+
+    private String JobName;
+    private String name;
+    private Integer corpId;
+    private String endCreateTtime;
+    private String startCreateTime;
+    private String wxChatId;
+    private Integer corpGroupId;
+    private List ownerId;
+    private List tagId;
+
+    public Integer getCorpGroupId() {
+        return corpGroupId;
+    }
+
+    public void setCorpGroupId(Integer corpGroupId) {
+        this.corpGroupId = corpGroupId;
+    }
+
+    public String getStartCreateTime() {
+        return startCreateTime;
+    }
+
+    public void setStartCreateTime(String startCreateTime) {
+        this.startCreateTime = startCreateTime;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Integer getCorpId() {
+        return corpId;
+    }
+
+    public void setCorpId(Integer corpId) {
+        this.corpId = corpId;
+    }
+
+    public String getEndCreateTtime() {
+        return endCreateTtime;
+    }
+
+    public void setEndCreateTtime(String endCreateTtime) {
+        this.endCreateTtime = endCreateTtime;
+    }
+
+    public String getWxChatId() {
+        return wxChatId;
+    }
+
+    public void setWxChatId(String wxChatId) {
+        this.wxChatId = wxChatId;
+    }
+
+    public List getOwnerId() {
+        return ownerId;
+    }
+
+    public void setOwnerId(List ownerId) {
+        this.ownerId = ownerId;
+    }
+
+    public List getTagId() {
+        return tagId;
+    }
+
+    public void setTagId(List tagId) {
+        this.tagId = tagId;
+    }
+
+    public String getJobName() {
+        return JobName;
+    }
+
+    public void setJobName(String jobName) {
+        JobName = jobName;
+    }
+
+}

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

@@ -0,0 +1,119 @@
+package com.mokamrp.privates.entity;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+public class JobWorkContactEmployeeRedis{
+
+    public final static String TASK_NAME = "WorkContactEmployeeService";
+
+    private Integer gender;
+    private Integer status;
+    private String name;
+    private Integer startDeletedAt;
+    private Integer endDeletedAt;
+    private Integer startCreatedAt;
+    private Integer endCreatedAt;
+    private Integer groupId;
+    private Integer corpId;
+    private List employeeId;
+    private List tagId ;
+    private Integer channelCodeId;
+
+    public Integer getGender() {
+        return gender;
+    }
+
+    public void setGender(Integer gender) {
+        this.gender = gender;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Integer getStartDeletedAt() {
+        return startDeletedAt;
+    }
+
+    public void setStartDeletedAt(Integer startDeletedAt) {
+        this.startDeletedAt = startDeletedAt;
+    }
+
+    public Integer getEndDeletedAt() {
+        return endDeletedAt;
+    }
+
+    public void setEndDeletedAt(Integer endDeletedAt) {
+        this.endDeletedAt = endDeletedAt;
+    }
+
+    public Integer getStartCreatedAt() {
+        return startCreatedAt;
+    }
+
+    public void setStartCreatedAt(Integer startCreatedAt) {
+        this.startCreatedAt = startCreatedAt;
+    }
+
+    public Integer getEndCreatedAt() {
+        return endCreatedAt;
+    }
+
+    public void setEndCreatedAt(Integer endCreatedAt) {
+        this.endCreatedAt = endCreatedAt;
+    }
+
+    public Integer getGroupId() {
+        return groupId;
+    }
+
+    public void setGroupId(Integer groupId) {
+        this.groupId = groupId;
+    }
+
+    public Integer getCorpId() {
+        return corpId;
+    }
+
+    public void setCorpId(Integer corpId) {
+        this.corpId = corpId;
+    }
+
+    public List getEmployeeId() {
+        return employeeId;
+    }
+
+    public void setEmployeeId(List employeeId) {
+        this.employeeId = employeeId;
+    }
+
+    public List getTagId() {
+        return tagId;
+    }
+
+    public void setTagId(List tagId) {
+        this.tagId = tagId;
+    }
+
+    public Integer getChannelCodeId() {
+        return channelCodeId;
+    }
+
+    public void setChannelCodeId(Integer channelCodeId) {
+        this.channelCodeId = channelCodeId;
+    }
+}

src/main/java/com/mokamrp/privates/mapper/DownfileMapper.xml

@@ -9,7 +9,8 @@
     <resultMap id="BaseResultMap" type="com.mokamrp.privates.mapper.pojo.Downfile">
         <id column="id" property="id" />
         <result column="title" property="title" />
-        <result column="auth_name" property="authName" />
+        <result column="auth_id" property="auth_id" />
+        <result column="auth_name" property="auth_name" />
         <result column="createtime" property="createtime" />
         <result column="down_url" property="downUrl" />
         <result column="msg" property="msg" />
@@ -19,7 +20,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, title, auth_name, createtime, down_url, msg, filter_json, status
+        id, title, auth_id, createtime, down_url, msg, filter_json, status
     </sql>
 
 </mapper>

src/main/java/com/mokamrp/privates/mapper/pojo/Downfile.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.annotations.TableName;
 import org.apache.tomcat.util.bcel.Const;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -21,10 +22,11 @@ import java.io.Serializable;
 @TableName("private_downfile")
 public class Downfile extends Model<Downfile> {
 
-
     public static final String WORK_CONTACT_EMPLOYEE = "客服信息下载.csv";
     public static final String WORM_ROOM = "群数据下载.csv";
 
+    public static final String DEFAULT_MSG = "群数据下载中";
+
     private static final long serialVersionUID = 1L;
 
     @TableId(value = "id", type = IdType.AUTO)
@@ -36,11 +38,15 @@ public class Downfile extends Model<Downfile> {
     /**
      * 下载人名称
      */
+    private Integer authId;
+    /**
+     * 下载人名称
+     */
     private String authName;
     /**
      * 创建时间
      */
-    private Integer createtime;
+    private String createtime;
     /**
      * 下载链接
      */
@@ -72,19 +78,19 @@ public class Downfile extends Model<Downfile> {
         this.title = title;
     }
 
-    public String getAuthName() {
-        return authName;
+    public Integer getAuthId() {
+        return authId;
     }
 
-    public void setAuthName(String authName) {
-        this.authName = authName;
+    public void setAuthId(Integer authId) {
+        this.authId = authId;
     }
 
-    public Integer getCreatetime() {
+    public String getCreatetime() {
         return createtime;
     }
 
-    public void setCreatetime(Integer createtime) {
+    public void setCreatetime(String createtime) {
         this.createtime = createtime;
     }
 
@@ -120,6 +126,14 @@ public class Downfile extends Model<Downfile> {
         this.status = status;
     }
 
+    public String getAuthName() {
+        return authName;
+    }
+
+    public void setAuthName(String authName) {
+        this.authName = authName;
+    }
+
     @Override
     protected Serializable pkVal() {
         return this.id;
@@ -130,7 +144,7 @@ public class Downfile extends Model<Downfile> {
         return "Downfile{" +
         ", id=" + id +
         ", title=" + title +
-        ", authName=" + authName +
+        ", authName=" + authId +
         ", createtime=" + createtime +
         ", downUrl=" + downUrl +
         ", msg=" + msg +

src/main/java/com/mokamrp/privates/service/WorkContactEmployeeService.java

@@ -2,6 +2,7 @@ package com.mokamrp.privates.service;
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
+import com.mokamrp.privates.mapper.pojo.Downfile;
 import com.mokamrp.privates.mapper.pojo.WorkContactEmployee;
 import com.baomidou.mybatisplus.service.IService;
 import com.mokamrp.privates.mapper.vo.WorkContactEmployeeVo;
@@ -30,9 +31,9 @@ public interface WorkContactEmployeeService extends IService<WorkContactEmployee
                                     Integer group_id,
                                     Integer corp_id, List employee_id, List tag_id, Integer channel_code_id);
 
-    void export(Integer gender, Integer status, String name,
-                                    Integer start_deleted_at, Integer end_deleted_at,
-                                    Integer start_created_at, Integer end_created_at,
-                                    Integer group_id,
-                                    Integer corp_id, List employee_id,List tag_id , Integer channel_code_id);
+    void export(Downfile downFile,Integer gender, Integer status, String name,
+                Integer start_deleted_at, Integer end_deleted_at,
+                Integer start_created_at, Integer end_created_at,
+                Integer group_id,
+                Integer corp_id, List employee_id, List tag_id , Integer channel_code_id);
 }

src/main/java/com/mokamrp/privates/service/WorkRoomService.java

@@ -1,5 +1,6 @@
 package com.mokamrp.privates.service;
 
+import com.mokamrp.privates.mapper.pojo.Downfile;
 import com.mokamrp.privates.mapper.pojo.WorkRoom;
 import com.baomidou.mybatisplus.service.IService;
 
@@ -15,13 +16,16 @@ import java.util.Map;
  * @since 2021-04-21
  */
 public interface WorkRoomService extends IService<WorkRoom> {
+
+    //final public String TASK_NAME ="Room";
+
     public Map<String, Object> getPageList(Integer pagesize, Integer page,
                                            String name, Integer corp_id,
                                            String start_create_time, String end_create_time,
                                            String wx_chat_id, Integer corp_group_id,
                                            List owner_id, List tag_id);
 
-    public void export(String name, Integer corp_id, String start_create_time, String end_create_time,
+    public void export(Downfile downFile, String name, Integer corp_id, String start_create_time, String end_create_time,
                        String wx_chat_id, Integer corp_group_id, List owner_id, List tag_id);
 
     public Object bangTagIds(Integer[] ids, Integer[] tagIds);

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

@@ -109,15 +109,13 @@ public class WorkContactEmployeeServiceImpl extends ServiceImpl<WorkContactEmplo
         return resMap;
     }
 
-    @Async
     @Override
-    public void export(Integer gender, Integer status, String name,
+    public void export(Downfile downFile,Integer gender, Integer status, String name,
                                            Integer start_deleted_at, Integer end_deleted_at,
                                            Integer start_created_at, Integer end_created_at,
                                            Integer group_id,
                                            Integer corp_id, List employee_id, List tag_id , Integer channel_code_id){
 
-        Downfile file = new Downfile();
         EntityWrapper<WorkContactEmployee> obj = new EntityWrapper<WorkContactEmployee>();
         List<Object> tempObj;
 
@@ -191,20 +189,17 @@ public class WorkContactEmployeeServiceImpl extends ServiceImpl<WorkContactEmplo
         StringBuffer content = OssFile.createCSV(resList);
 
         /*上传到oss*/
-        file.setTitle(Downfile.WORK_CONTACT_EMPLOYEE);
-        file.setStatus(0);
-        downfileMapper.insert(file);
-
         Date currentTime = new Date();
         SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
         String dateString = formatter.format(currentTime);
-        String filePath = OSSConfiguration.DOWN_DIR+dateString+"/"+file.getId().toString()+"_"+Downfile.WORK_CONTACT_EMPLOYEE;
+        String filePath = OSSConfiguration.DOWN_DIR+dateString+"/"+downFile.getId().toString()+"_"+Downfile.WORK_CONTACT_EMPLOYEE;
 
         PutObjectRequest putObjectRequest = new PutObjectRequest(ossConfiguration.getBucketName(), filePath, new ByteArrayInputStream(content.toString().getBytes()));
         ossClient.putObject(putObjectRequest);
 
-        file.setDownUrl(ossConfiguration.getHost()+filePath);
-        downfileMapper.updateById(file);
+        downFile.setDownUrl(ossConfiguration.getHost()+filePath);
+        downFile.setStatus(1);
+        downfileMapper.updateById(downFile);
 
         return;
     }

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

@@ -93,24 +93,20 @@ public class WorkRoomServiceImpl extends ServiceImpl<WorkRoomMapper, WorkRoom> i
      * @param tag_id
      */
     @Override
-    @Async
-    public void export(String name, Integer corp_id, String start_create_time, String end_create_time,
+    public void export(Downfile downFile,String name, Integer corp_id, String start_create_time, String end_create_time,
                                       String wx_chat_id, Integer corp_group_id, List owner_id, List tag_id) {
 
         List<Object> tempObj;
-        Downfile file = new Downfile();
+        List<List<Object>> resList = new ArrayList<List<Object>>();
+        Object[] head = { "id","群id", "群名称", "群主","所属主体","客服","群标签","群人数","当日入群","当日退群","创建时间" };
+        List<Object> headList = Arrays.asList(head);
+        Date currentTime = new Date();
 
         EntityWrapper<WorkRoom> obj = getWrapper(name, corp_id, start_create_time, end_create_time, wx_chat_id, corp_group_id, owner_id, tag_id);
         Integer total = mapperObj.getVoListTotal(obj);
         Page<WorkRoom> pageObj = new Page<>(1, total);
         List<WorkRoomVo> list =  getCommonList(pageObj,obj);
 
-        //实现下载
-        //群名称，群主 所属主体，主体分组 客服 群标签 群人数 当日入群 当日退群 创建时间 群id
-        List<List<Object>> resList = new ArrayList<List<Object>>();
-        //Object[] head = { "id","群id", "群名称", "群主","所属主体","主体分组","客服","群标签","群人数","当日入群","当日退群","创建时间" };
-        Object[] head = { "id","群id", "群名称", "群主","所属主体","客服","群标签","群人数","当日入群","当日退群","创建时间" };
-        List<Object> headList = Arrays.asList(head);
         resList.add(headList);
 
         if(list.size() >=1){
@@ -135,22 +131,17 @@ public class WorkRoomServiceImpl extends ServiceImpl<WorkRoomMapper, WorkRoom> i
 
         StringBuffer content = OssFile.createCSV(resList);
 
-        /*上传到oss*/
-        file.setTitle(Downfile.WORK_CONTACT_EMPLOYEE);
-        file.setStatus(0);
-        downfileMapper.insert(file);
-
-        Date currentTime = new Date();
         SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
         String dateString = formatter.format(currentTime);
-        String filePath = OSSConfiguration.DOWN_DIR+dateString+"/"+file.getId().toString()+"_"+Downfile.WORM_ROOM;
+        String filePath = OSSConfiguration.DOWN_DIR+dateString+"/"+downFile.getId().toString()+"_"+Downfile.WORM_ROOM;
 
-        PutObjectRequest putObjectRequest = new PutObjectRequest(ossConfiguration.getBucketName(), filePath, new ByteArrayInputStream(content.toString().getBytes()));
+        PutObjectRequest putObjectRequest = new PutObjectRequest(ossConfiguration.getBucketName(), filePath,
+                new ByteArrayInputStream(content.toString().getBytes()));
         ossClient.putObject(putObjectRequest);
 
-        file.setDownUrl(ossConfiguration.getHost()+filePath);
-        file.setStatus(1);
-        downfileMapper.updateById(file);
+        downFile.setDownUrl(ossConfiguration.getHost()+filePath);
+        downFile.setStatus(1);
+        downfileMapper.updateById(downFile);
 
         return;
     }
@@ -237,7 +228,6 @@ public class WorkRoomServiceImpl extends ServiceImpl<WorkRoomMapper, WorkRoom> i
         }
 
         //3-绑定插入但是要检测已经存在的
-        //roomTagMapperObj.
 
         EntityWrapper<RoomTag> obj = new EntityWrapper<RoomTag>();
         obj.in("id", ids);

src/main/java/com/mokamrp/privates/tast/ExportJobTask.java

@@ -0,0 +1,72 @@
+package com.mokamrp.privates.tast;
+
+import com.mokamrp.privates.entity.JobRedis;
+import com.mokamrp.privates.entity.JobRoomJobRedis;
+import com.mokamrp.privates.entity.JobWorkContactEmployeeRedis;
+import com.mokamrp.privates.mapper.pojo.Downfile;
+import com.mokamrp.privates.service.WorkContactEmployeeService;
+import com.mokamrp.privates.service.WorkRoomService;
+import com.mokamrp.privates.utils.RedisUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.Date;
+
+@Component
+public class ExportJobTask {
+
+    @Resource
+    private RedisUtil redisUtil;
+
+    @Autowired
+    private WorkRoomService workRoomService;
+
+
+    @Autowired
+    private WorkContactEmployeeService workContactEmployeeService;
+
+    /**
+     * 导出任务，单进程
+     */
+    @Scheduled(fixedDelay = 20000)
+    public void execute() {
+
+        System.out.println("下载任务执行中,当前时间"+(new Date())+",当前长度"+redisUtil.lGetListSize("java:job:mochat"));
+
+        while (redisUtil.lGetListSize("java:job:mochat") >=1){
+            JobRedis out = (JobRedis)redisUtil.rightPop(JobRedis.QUEUE_KEY);
+            Downfile downFile = out.getDownFile();
+
+            if(downFile.getId() == null || downFile.getId() <= 0){
+                continue;
+            }
+
+            switch(out.getJobName()){
+                case "Room":
+                    JobRoomJobRedis job= out.getJobRoomJobRedis();
+                    workRoomService.export(downFile,job.getName(),job.getCorpGroupId(),job.getStartCreateTime(),job.getEndCreateTtime(),
+                            job.getWxChatId(),job.getCorpGroupId(),job.getOwnerId(),job.getTagId());
+                    break; //可选
+                case "WorkContactEmployeeService":
+                    JobWorkContactEmployeeRedis eJob= out.getJobWorkContactEmployeeRedis();
+                    System.out.println("=======WorkContactEmployeeService======");
+                    System.out.println(eJob.getName());
+
+                    workContactEmployeeService.export(downFile,eJob.getGender(),eJob.getStatus(),eJob.getName(),
+                            eJob.getStartDeletedAt(),eJob.getEndDeletedAt(),
+                            eJob.getStartCreatedAt(), eJob.getEndCreatedAt(),
+                            eJob.getGroupId(),eJob.getCorpId(),eJob.getEmployeeId(), eJob.getTagId(), eJob.getChannelCodeId()
+                    );
+
+                    //语句
+                    break; //可选
+                default : //可选
+            }
+        }
+
+    }
+
+}

src/main/java/com/mokamrp/privates/utils/RedisUtil.java

@@ -0,0 +1,568 @@
+package com.mokamrp.privates.utils;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * redisTemplate封装
+ *  @author gy
+ */
+@Component
+public class RedisUtil {
+
+    @Autowired
+    private RedisTemplate<String, Object> redisTemplate;
+
+    public RedisUtil(RedisTemplate<String, Object> redisTemplate) {
+        this.redisTemplate = redisTemplate;
+    }
+
+    /**
+     * 指定缓存失效时间
+     * @param key 键
+     * @param time 时间(秒)
+     * @return
+     */
+    public boolean expire(String key,long time){
+        try {
+            if(time>0){
+                redisTemplate.expire(key, time, TimeUnit.SECONDS);
+            }
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    /**
+     * 根据key 获取过期时间
+     * @param key 键 不能为null
+     * @return 时间(秒) 返回0代表为永久有效
+     */
+    public long getExpire(String key){
+        return redisTemplate.getExpire(key,TimeUnit.SECONDS);
+    }
+
+    /**
+     * 判断key是否存在
+     * @param key 键
+     * @return true 存在 false不存在
+     */
+    public boolean hasKey(String key){
+        try {
+            return redisTemplate.hasKey(key);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    /**
+     * 删除缓存
+     * @param key 可以传一个值 或多个
+     */
+    @SuppressWarnings("unchecked")
+    public void del(String ... key){
+        if(key!=null&&key.length>0){
+            if(key.length==1){
+                redisTemplate.delete(key[0]);
+            }else{
+                redisTemplate.delete(CollectionUtils.arrayToList(key));
+            }
+        }
+    }
+
+    //============================String=============================
+    /**
+     * 普通缓存获取
+     * @param key 键
+     * @return 值
+     */
+    public Object get(String key){
+        return key==null?null:redisTemplate.opsForValue().get(key);
+    }
+
+    /**
+     * 普通缓存放入
+     * @param key 键
+     * @param value 值
+     * @return true成功 false失败
+     */
+    public boolean set(String key,Object value) {
+        try {
+            redisTemplate.opsForValue().set(key, value);
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    /**
+     * 普通缓存放入并设置时间
+     * @param key 键
+     * @param value 值
+     * @param time 时间(秒) time要大于0 如果time小于等于0 将设置无限期
+     * @return true成功 false 失败
+     */
+    public boolean set(String key,Object value,long time){
+        try {
+            if(time>0){
+                redisTemplate.opsForValue().set(key, value, time, TimeUnit.SECONDS);
+            }else{
+                set(key, value);
+            }
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    /**
+     * 递增
+     * @param key 键
+     * @param delta 要增加几(大于0)
+     * @return
+     */
+    public long incr(String key, long delta){
+        if(delta<0){
+            throw new RuntimeException("递增因子必须大于0");
+        }
+        return redisTemplate.opsForValue().increment(key, delta);
+    }
+
+    /**
+     * 递减
+     * @param key 键
+     * @param delta 要减少几(小于0)
+     * @return
+     */
+    public long decr(String key, long delta){
+        if(delta<0){
+            throw new RuntimeException("递减因子必须大于0");
+        }
+        return redisTemplate.opsForValue().increment(key, -delta);
+    }
+
+    //================================Map=================================
+    /**
+     * HashGet
+     * @param key 键 不能为null
+     * @param item 项 不能为null
+     * @return 值
+     */
+    public Object hget(String key,String item){
+        return redisTemplate.opsForHash().get(key, item);
+    }
+
+    /**
+     * 获取hashKey对应的所有键值
+     * @param key 键
+     * @return 对应的多个键值
+     */
+    public Map<Object,Object> hmget(String key){
+        return redisTemplate.opsForHash().entries(key);
+    }
+
+    /**
+     * HashSet
+     * @param key 键
+     * @param map 对应多个键值
+     * @return true 成功 false 失败
+     */
+    public boolean hmset(String key, Map<String,Object> map){
+        try {
+            redisTemplate.opsForHash().putAll(key, map);
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    /**
+     * HashSet 并设置时间
+     * @param key 键
+     * @param map 对应多个键值
+     * @param time 时间(秒)
+     * @return true成功 false失败
+     */
+    public boolean hmset(String key, Map<String,Object> map, long time){
+        try {
+            redisTemplate.opsForHash().putAll(key, map);
+            if(time>0){
+                expire(key, time);
+            }
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    /**
+     * 向一张hash表中放入数据,如果不存在将创建
+     * @param key 键
+     * @param item 项
+     * @param value 值
+     * @return true 成功 false失败
+     */
+    public boolean hset(String key,String item,Object value) {
+        try {
+            redisTemplate.opsForHash().put(key, item, value);
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    /**
+     * 向一张hash表中放入数据,如果不存在将创建
+     * @param key 键
+     * @param item 项
+     * @param value 值
+     * @param time 时间(秒)  注意:如果已存在的hash表有时间,这里将会替换原有的时间
+     * @return true 成功 false失败
+     */
+    public boolean hset(String key,String item,Object value,long time) {
+        try {
+            redisTemplate.opsForHash().put(key, item, value);
+            if(time>0){
+                expire(key, time);
+            }
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    /**
+     * 删除hash表中的值
+     * @param key 键 不能为null
+     * @param item 项 可以使多个 不能为null
+     */
+    public void hdel(String key, Object... item){
+        redisTemplate.opsForHash().delete(key,item);
+    }
+
+    /**
+     * 判断hash表中是否有该项的值
+     * @param key 键 不能为null
+     * @param item 项 不能为null
+     * @return true 存在 false不存在
+     */
+    public boolean hHasKey(String key, String item){
+        return redisTemplate.opsForHash().hasKey(key, item);
+    }
+
+    /**
+     * hash递增 如果不存在,就会创建一个 并把新增后的值返回
+     * @param key 键
+     * @param item 项
+     * @param by 要增加几(大于0)
+     * @return
+     */
+    public double hincr(String key, String item,double by){
+        return redisTemplate.opsForHash().increment(key, item, by);
+    }
+
+    /**
+     * hash递减
+     * @param key 键
+     * @param item 项
+     * @param by 要减少记(小于0)
+     * @return
+     */
+    public double hdecr(String key, String item,double by){
+        return redisTemplate.opsForHash().increment(key, item,-by);
+    }
+
+    //============================set=============================
+    /**
+     * 根据key获取Set中的所有值
+     * @param key 键
+     * @return
+     */
+    public Set<Object> sGet(String key){
+        try {
+            return redisTemplate.opsForSet().members(key);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    /**
+     * 根据value从一个set中查询,是否存在
+     * @param key 键
+     * @param value 值
+     * @return true 存在 false不存在
+     */
+    public boolean sHasKey(String key,Object value){
+        try {
+            return redisTemplate.opsForSet().isMember(key, value);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    /**
+     * 将数据放入set缓存
+     * @param key 键
+     * @param values 值 可以是多个
+     * @return 成功个数
+     */
+    public long sSet(String key, Object...values) {
+        try {
+            return redisTemplate.opsForSet().add(key, values);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return 0;
+        }
+    }
+
+    /**
+     * 将set数据放入缓存
+     * @param key 键
+     * @param time 时间(秒)
+     * @param values 值 可以是多个
+     * @return 成功个数
+     */
+    public long sSetAndTime(String key,long time,Object...values) {
+        try {
+            Long count = redisTemplate.opsForSet().add(key, values);
+            if(time>0) {
+                expire(key, time);
+            }
+            return count;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return 0;
+        }
+    }
+
+    /**
+     * 获取set缓存的长度
+     * @param key 键
+     * @return
+     */
+    public long sGetSetSize(String key){
+        try {
+            return redisTemplate.opsForSet().size(key);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return 0;
+        }
+    }
+
+    /**
+     * 移除值为value的
+     * @param key 键
+     * @param values 值 可以是多个
+     * @return 移除的个数
+     */
+    public long setRemove(String key, Object ...values) {
+        try {
+            Long count = redisTemplate.opsForSet().remove(key, values);
+            return count;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return 0;
+        }
+    }
+    //===============================list=================================
+
+    /**
+     * 获取list缓存的内容
+     * @param key 键
+     * @param start 开始
+     * @param end 结束  0 到 -1代表所有值
+     * @return
+     */
+    public List<Object> lGet(String key, long start, long end){
+        try {
+            return redisTemplate.opsForList().range(key, start, end);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    /**
+     * 获取list缓存的长度
+     * @param key 键
+     * @return
+     */
+    public long lGetListSize(String key){
+        try {
+            return redisTemplate.opsForList().size(key);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return 0;
+        }
+    }
+
+    /**
+     * 通过索引 获取list中的值
+     * @param key 键
+     * @param index 索引  index>=0时， 0 表头，1 第二个元素，依次类推；index<0时，-1，表尾，-2倒数第二个元素，依次类推
+     * @return
+     */
+    public Object lGetIndex(String key,long index){
+        try {
+            return redisTemplate.opsForList().index(key, index);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    /**
+     * 将list放入缓存
+     * @param key 键
+     * @return
+     */
+    public Object rightPop(String key) {
+        try {
+            return redisTemplate.opsForList().rightPop(key);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    /**
+     * 将list放入缓存
+     * @param key 键
+     * @param value 值
+     * @return
+     */
+    public boolean leftPush(String key, Object value) {
+        try {
+            redisTemplate.opsForList().leftPush(key, value);
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    /**
+     * 将list放入缓存
+     * @param key 键
+     * @param value 值
+     * @return
+     */
+    public boolean lSet(String key, Object value) {
+        try {
+            redisTemplate.opsForList().rightPush(key, value);
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    /**
+     * 将list放入缓存
+     * @param key 键
+     * @param value 值
+     * @param time 时间(秒)
+     * @return
+     */
+    public boolean lSet(String key, Object value, long time) {
+        try {
+            redisTemplate.opsForList().rightPush(key, value);
+            if (time > 0) {
+                expire(key, time);
+            }
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    /**
+     * 将list放入缓存
+     * @param key 键
+     * @param value 值
+     * @return
+     */
+    public boolean lSet(String key, List<Object> value) {
+        try {
+            redisTemplate.opsForList().rightPushAll(key, value);
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    /**
+     * 将list放入缓存
+     * @param key 键
+     * @param value 值
+     * @param time 时间(秒)
+     * @return
+     */
+    public boolean lSet(String key, List<Object> value, long time) {
+        try {
+            redisTemplate.opsForList().rightPushAll(key, value);
+            if (time > 0) {
+                expire(key, time);
+            }
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    /**
+     * 根据索引修改list中的某条数据
+     * @param key 键
+     * @param index 索引
+     * @param value 值
+     * @return
+     */
+    public boolean lUpdateIndex(String key, long index,Object value) {
+        try {
+            redisTemplate.opsForList().set(key, index, value);
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    /**
+     * 移除N个值为value
+     * @param key 键
+     * @param count 移除多少个
+     * @param value 值
+     * @return 移除的个数
+     */
+    public long lRemove(String key,long count,Object value) {
+        try {
+            Long remove = redisTemplate.opsForList().remove(key, count, value);
+            return remove;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return 0;
+        }
+    }
+
+}
+