Merge branch 'LeoN'

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

@@ -8,6 +8,7 @@ import com.mokamrp.privates.constant.Constants;
 import com.mokamrp.privates.constant.HttpStatus;
 import com.mokamrp.privates.entity.*;
 import com.mokamrp.privates.help.AjaxResult;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashWorkwxTaskCatalog;
 import com.mokamrp.privates.mapper.pangu.pojo.PromoteCode;
 import com.mokamrp.privates.mapper.pangu.pojo.PromoteQrcodePool;
 import com.mokamrp.privates.utils.StringUtils;
@@ -22,6 +23,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import javax.validation.Valid;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
+import java.lang.reflect.ParameterizedType;
 import java.time.LocalDateTime;
 import java.util.*;
 
@@ -50,6 +52,35 @@ public class BaseController<T> {
         return AjaxResult.success(Constants.SUCCESS, res);
     }
 
+    @PostMapping("/softdel")
+    public Object softDelete(@Valid @RequestBody DelHandle<T> delHandle, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
+        }
+        QueryWrapper<T> QueryWrapper = new QueryWrapper<>();
+        String[] ids = delHandle.getIds().split(",");
+        QueryWrapper.in("id", ids);
+        T save;
+        try {
+            // 通过反射获取model的真实类型
+            ParameterizedType pt = (ParameterizedType) this.getClass().getGenericSuperclass();
+            Class<T> clazz = (Class<T>) pt.getActualTypeArguments()[0];
+            // 通过反射创建model的实例
+            save = clazz.newInstance();
+            Class<? extends Object> clazzUpdate = save.getClass();
+            Method setDelFlg = clazzUpdate.getMethod("setDelFlg", Integer.class);
+            setDelFlg.invoke(save,0);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        boolean res = service.update(save,QueryWrapper);
+        if (!res) {
+            return AjaxResult.error("删除失败");
+        }
+        return AjaxResult.success(Constants.SUCCESS, res);
+    }
+
+
     @PostMapping("/add")
     public Object add(@Valid @RequestBody AddHandle<T> addHandle, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {

src/main/java/com/mokamrp/privates/controller/pangu/FosterwxCashScheduleTaskListController.java

@@ -1,5 +1,6 @@
 package com.mokamrp.privates.controller.pangu;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.mokamrp.privates.constant.HttpStatus;
 import com.mokamrp.privates.controller.BaseController;
 import com.mokamrp.privates.entity.ResHandle;
@@ -58,9 +59,18 @@ public class FosterwxCashScheduleTaskListController extends BaseController<Foste
     }
 
     @PostMapping("/cancelTask")
-    @ApiOperation(value = "取消任务按钮")
+    @ApiOperation(value = "取消任务按钮 企微的情况新增type传输")
     public Object cancelTask(@RequestBody FosterwxCashScheduleTaskListHandle handle, @AuthUser User user) {
-        Arrays.asList(handle.getIds().split(REGEX)).forEach(id -> fosterwxCashScheduleTaskListService.cancelTask(Integer.valueOf(id), user.getId()));
+        if (handle.getType() == 1) {
+            Arrays.asList(handle.getIds().split(REGEX)).forEach(id -> fosterwxCashScheduleTaskListService.cancelTask(Integer.valueOf(id), user.getId()));
+        } else {
+            Arrays.asList(handle.getIds().split(REGEX)).forEach(id -> {
+                FosterwxCashScheduleTaskList fosterwxCashScheduleTaskList = fosterwxCashScheduleTaskListService.getById(id);
+                List<FosterwxCashScheduleTaskList> fosterwxCashScheduleTaskListList = fosterwxCashScheduleTaskListService.list(new LambdaQueryWrapper<FosterwxCashScheduleTaskList>().eq(FosterwxCashScheduleTaskList::getTaskId, fosterwxCashScheduleTaskList.getTaskId()));
+
+                fosterwxCashScheduleTaskListList.forEach(detail -> fosterwxCashScheduleTaskListService.cancelTask(detail.getId(), user.getId()));
+            });
+        }
 
         return AjaxResult.success("取消任务成功");
     }

src/main/java/com/mokamrp/privates/controller/pangu/FosterwxCashTaskTemplateController.java

@@ -18,8 +18,8 @@ import com.mokamrp.privates.service.pangu.FosterwxCashWorkwxTaskCatalogService;
 import com.mokamrp.privates.service.pangu.FosterwxCashWorkwxTaskListService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.tomcat.jni.Local;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cglib.core.Local;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -30,7 +30,9 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import com.mokamrp.privates.controller.BaseController;
 import javax.validation.Valid;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.util.Map;
 import java.util.List;
 
@@ -73,6 +75,7 @@ public class FosterwxCashTaskTemplateController extends BaseController<FosterwxC
         if (bindingResult.hasErrors()) {
             return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
         }
+        LocalDateTime now = LocalDateTime.of(LocalDate.now(), LocalTime.MIN);
         ResHandle<List<FosterwxCashTaskTemplate>> res = fosterwxCashTaskTemplateService.getList(postBasePageHandle);
         return AjaxResult.success(res);
     }
@@ -98,7 +101,8 @@ public class FosterwxCashTaskTemplateController extends BaseController<FosterwxC
         }else{
             //.企微
             for (FosterwxCashTaskTemplate fosterwxCashTaskTemplate : res.getList()){
-                List<FosterwxCashWorkwxTaskList> taskList =  fosterwxCashWorkwxTaskCatalogService.getTaskByTemplateId(fosterwxCashTaskTemplate.getId());
+                postBasePageHandle.setTemplateId(fosterwxCashTaskTemplate.getId());
+                List<FosterwxCashWorkwxTaskList> taskList =  fosterwxCashWorkwxTaskCatalogService.getTaskList(postBasePageHandle);
                 fosterwxCashTaskTemplate.setWorkwxTaskList(taskList);
             }
         }
@@ -155,7 +159,7 @@ public class FosterwxCashTaskTemplateController extends BaseController<FosterwxC
             for (FosterwxCashWorkwxTaskList fosterwxCashWorkwxTaskList : fosterwxCashWorkwxTaskCatalog.getTaskList()){
                 //.保存任务目录内任务列表
                 fosterwxCashWorkwxTaskList.setTemplateId(add.getId());
-                fosterwxCashWorkwxTaskList.setCatalogId(fosterwxCashWorkwxTaskList.getId());
+                fosterwxCashWorkwxTaskList.setCatalogId(fosterwxCashWorkwxTaskCatalog.getId());
                 fosterwxCashWorkwxTaskList.setCreateAt(LocalDateTime.now());
                 fosterwxCashWorkwxTaskList.setUpdateAt(LocalDateTime.now());
                 fosterwxCashWorkwxTaskList.setCreateUid(authUser.getId());

src/main/java/com/mokamrp/privates/controller/pangu/FosterwxCashWorkClientController.java

@@ -0,0 +1,221 @@
+package com.mokamrp.privates.controller.pangu;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.mokamrp.privates.entity.pangu.FosterwxCashBoxClientInfo;
+import com.mokamrp.privates.entity.pangu.FosterwxWorkServeHandle;
+import com.mokamrp.privates.help.AjaxResult;
+import com.mokamrp.privates.mapper.pangu.pojo.*;
+import com.mokamrp.privates.mapper.pojo.Corp;
+import com.mokamrp.privates.service.CorpService;
+import com.mokamrp.privates.service.pangu.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Classname FosterwxCashWorkClientController
+ * @Description TODO
+ * @Date 2021/10/26 9:41 上午
+ * @Created by luqiucheng
+ */
+@RestController
+@RequestMapping("/pangu/server")
+@Api(tags = "供客户端调用接口")
+@Slf4j
+public class FosterwxCashWorkClientController {
+    @Autowired
+    private FosterwxCashScheduleTaskListService fosterwxCashScheduleTaskListService;
+
+    @Autowired
+    private CorpService corpService;
+
+    @Autowired
+    private FosterwxMobileService fosterwxMobileService;
+
+    @Autowired
+    private FosterwxCashMobileService fosterwxCashMobileService;
+
+    @Autowired
+    private FosterwxCashWorkBoxClientInfoService fosterwxCashWorkBoxClientInfoService;
+
+    @Autowired
+    private FosterwxCashWorkwxTaskListService fosterwxCashWorkwxTaskListService;
+
+
+    @PostMapping(value = "/getTaskInfo", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
+    @ApiOperation(value = "返回凌晨到当前时间的未发送的数据,主体 昵称/团队id 昵称 两两一组必须有数据")
+    public Object getTaskInfo(FosterwxWorkServeHandle handle) {
+        log.info("客户端请求的信息:{}", handle);
+
+        String errInfo = checkParam(handle);
+
+        // 报错的的情况返回报错信息
+        if (null != errInfo && !errInfo.isEmpty()) return AjaxResult.error(errInfo);
+
+        // 根据参数获取账号信息
+        FosterwxMobile fosterwxMobile = getAccountInfo(handle);
+
+        if (null == fosterwxMobile) return AjaxResult.error("根据参数无法获取所属账号");
+
+        // 根据手机id 获取分组id
+        FosterwxCashMobile fosterwxCashMobile = fosterwxCashMobileService.getOne(new LambdaQueryWrapper<FosterwxCashMobile>().eq(FosterwxCashMobile::getMobileId, fosterwxMobile.getId()).last("LIMIT 1"));
+
+        if (null == fosterwxCashMobile) return AjaxResult.error("该账号未划入变现分组");
+
+        LocalDate now = LocalDate.now();
+        LocalDateTime firstDateTime = LocalDateTime.of(now, LocalTime.MIN);
+        LocalDateTime lastDateTime = LocalDateTime.now();
+
+        LambdaQueryWrapper<FosterwxCashScheduleTaskList> fosterwxCashScheduleTaskListLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        // 企微任务
+        fosterwxCashScheduleTaskListLambdaQueryWrapper.eq(FosterwxCashScheduleTaskList::getType, 2);
+        // 分组id
+        fosterwxCashScheduleTaskListLambdaQueryWrapper.eq(FosterwxCashScheduleTaskList::getGroupId, fosterwxCashMobile.getGroupId());
+        // 已生成的任务 待发送的任务
+        fosterwxCashScheduleTaskListLambdaQueryWrapper.in(FosterwxCashScheduleTaskList::getStatus, 2, 4);
+
+        fosterwxCashScheduleTaskListLambdaQueryWrapper.between(FosterwxCashScheduleTaskList::getSendTime, firstDateTime, lastDateTime);
+
+        List<FosterwxCashScheduleTaskList> fosterwxCashScheduleTaskListList = fosterwxCashScheduleTaskListService.list(fosterwxCashScheduleTaskListLambdaQueryWrapper);
+
+        List<FosterwxCashBoxClientInfo> fosterwxCashBoxClientInfoList = new ArrayList<>();
+        fosterwxCashScheduleTaskListList.forEach(fosterwxCashScheduleTaskList -> {
+            fosterwxCashScheduleTaskListService.updateById(new FosterwxCashScheduleTaskList() {{
+                setId(fosterwxCashScheduleTaskList.getId());
+                setStatus(5);
+                setUpdateAt(LocalDateTime.now());
+            }});
+
+            // 获取任务详情
+            FosterwxCashWorkwxTaskList fosterwxCashWorkwxTaskList = fosterwxCashWorkwxTaskListService.getOne(new LambdaQueryWrapper<FosterwxCashWorkwxTaskList>().
+                    eq(FosterwxCashWorkwxTaskList::getTemplateId, fosterwxCashScheduleTaskList.getTemplateId()).
+                    eq(FosterwxCashWorkwxTaskList::getCatalogId, fosterwxCashScheduleTaskList.getTaskId()).
+                    eq(FosterwxCashWorkwxTaskList::getId, fosterwxCashScheduleTaskList.getChildTaskId()).
+                    last("LIMIT 1"));
+            FosterwxCashBoxClientInfo fosterwxCashBoxClientInfo = new FosterwxCashBoxClientInfo();
+            if (1 == fosterwxCashScheduleTaskList.getTaskType() || 3 == fosterwxCashScheduleTaskList.getTaskType()) {
+                FosterwxCashWorkBoxClientInfo fosterwxCashWorkBoxClientInfo = fosterwxCashWorkBoxClientInfoService.getOne(new LambdaQueryWrapper<FosterwxCashWorkBoxClientInfo>().like(FosterwxCashWorkBoxClientInfo::getGhid, fosterwxCashScheduleTaskList.getBoxGhid()));
+                FosterwxCashBoxClientInfo.BoxInfo boxInfo = fosterwxCashBoxClientInfo.new BoxInfo();
+                boxInfo.setGhid(fosterwxCashWorkBoxClientInfo.getGhid());
+                boxInfo.setWxid(fosterwxCashWorkBoxClientInfo.getWxid());
+                boxInfo.setName(fosterwxCashWorkBoxClientInfo.getName());
+                boxInfo.setTitle(fosterwxCashWorkwxTaskList.getTitle());
+                boxInfo.setEnterpoint(fosterwxCashScheduleTaskList.getBoxUrl());
+                boxInfo.setHeadimg(fosterwxCashWorkBoxClientInfo.getHeadimg());
+                boxInfo.setImage_key1(fosterwxCashWorkBoxClientInfo.getImageKey1());
+                boxInfo.setImage_key2(fosterwxCashWorkBoxClientInfo.getImageKey2());
+                boxInfo.setImage_key3(fosterwxCashWorkBoxClientInfo.getImageKey3());
+                boxInfo.setImageSize(fosterwxCashWorkBoxClientInfo.getImageSize());
+                boxInfo.setAppType(fosterwxCashWorkBoxClientInfo.getAppType());
+                boxInfo.setDesc(fosterwxCashWorkBoxClientInfo.getDesc());
+
+                fosterwxCashBoxClientInfo.setBoxInfo(boxInfo);
+            } else if (2 == fosterwxCashScheduleTaskList.getTaskType()) {
+                FosterwxCashBoxClientInfo.UrlInfo urlInfo = fosterwxCashBoxClientInfo.new UrlInfo();
+                urlInfo.setTitle(fosterwxCashWorkwxTaskList.getUrlTitle());
+                urlInfo.setDesc(fosterwxCashWorkwxTaskList.getUrlDesc());
+                urlInfo.setUrl(fosterwxCashScheduleTaskList.getSendUrl());
+                urlInfo.setImage_url(fosterwxCashWorkwxTaskList.getUrlImage());
+
+                fosterwxCashBoxClientInfo.setUrlInfo(urlInfo);
+            }
+
+            fosterwxCashBoxClientInfoList.add(fosterwxCashBoxClientInfo);
+        });
+
+        return AjaxResult.success(fosterwxCashScheduleTaskListList);
+    }
+
+    /**
+     * 根据参数获取账号信息
+     * @since: 1.18.1
+     * @param: [handle]
+     * @return: com.mokamrp.privates.mapper.pangu.pojo.FosterwxMobile
+     * @author: lqc
+     * @date: 2021/10/26
+     */
+    private FosterwxMobile getAccountInfo(FosterwxWorkServeHandle handle) {
+        FosterwxMobile fosterwxMobile = new FosterwxMobile();
+
+        // 主体 手机号 组
+        if (null != handle.getCorpName() && !handle.getCorpName().isEmpty()) {
+            // 获取主题信息
+            Corp corp = corpService.getOne(new LambdaQueryWrapper<Corp>().eq(Corp::getName, handle.getCorpName()).last("LIMIT 1"));
+            if (null != handle.getMobileNo() && !handle.getMobileNo().isEmpty()) {
+                if (null == corp) return null;
+
+                fosterwxMobile = fosterwxMobileService.getOne(new LambdaQueryWrapper<FosterwxMobile>().eq(FosterwxMobile::getMobileNo, handle.getMobileNo()).eq(FosterwxMobile::getWorkWxCorpId, corp.getId()).last("LIMIT 1"));
+
+                return fosterwxMobile;
+            }
+
+            // 主体 昵称 组
+            if (null != handle.getNickName() && !handle.getNickName().isEmpty()) {
+                if (null == corp) return null;
+
+                fosterwxMobile = fosterwxMobileService.getOne(new LambdaQueryWrapper<FosterwxMobile>().eq(FosterwxMobile::getCustserviceName, handle.getNickName()).eq(FosterwxMobile::getWorkWxCorpId, corp.getId()).last("LIMIT 1"));
+
+                return fosterwxMobile;
+            }
+        }
+
+        // 团队id 昵称 组
+        if (null != handle.getNickName() && !handle.getNickName().isEmpty() && null != handle.getTeamId() && !handle.getTeamId().isEmpty()) {
+            fosterwxMobile = fosterwxMobileService.getOne(new LambdaQueryWrapper<FosterwxMobile>().eq(FosterwxMobile::getTeamId, handle.getTeamId()).eq(FosterwxMobile::getCustserviceName, handle.getNickName()).last("LIMIT 1"));
+
+            return fosterwxMobile;
+        }
+
+        return null;
+    }
+
+    /**
+     * 检查入参
+     * @since: 1.18.1
+     * @param: [handle]
+     * @return: java.lang.String
+     * @author: lqc
+     * @date: 2021/10/26
+     */
+    private String checkParam(FosterwxWorkServeHandle handle) {
+        // 判断主体 手机号 组
+        if (null != handle.getMobileNo() && !handle.getMobileNo().isEmpty() && null != handle.getCorpName() && !handle.getCorpName().isEmpty()) {
+            return null;
+        }
+
+        // 判断主体 昵称 组
+        if (null != handle.getNickName() && !handle.getNickName().isEmpty() && null != handle.getCorpName() && !handle.getCorpName().isEmpty()) {
+            return null;
+        }
+
+        // 判断团队id 昵称 组
+        if (null != handle.getNickName() && !handle.getNickName().isEmpty() && null != handle.getTeamId() && !handle.getTeamId().isEmpty()) {
+            return null;
+        }
+
+        return "参数没有设置全，无法根据现有信息获取任务";
+    }
+
+    @PostMapping(value = "/saveBoxInfo", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
+    @ApiOperation(value = "保存小程序信息,已经保存过的小程序更新处理")
+    public Object saveBoxInfo(FosterwxCashWorkBoxClientInfo fosterwxCashWorkBoxClientInfo) {
+        if (fosterwxCashWorkBoxClientInfoService.count(new LambdaQueryWrapper<FosterwxCashWorkBoxClientInfo>().eq(FosterwxCashWorkBoxClientInfo::getGhid, fosterwxCashWorkBoxClientInfo.getGhid())) == 0) {
+            fosterwxCashWorkBoxClientInfoService.save(fosterwxCashWorkBoxClientInfo);
+        } else {
+            fosterwxCashWorkBoxClientInfoService.update(fosterwxCashWorkBoxClientInfo, new LambdaQueryWrapper<FosterwxCashWorkBoxClientInfo>().eq(FosterwxCashWorkBoxClientInfo::getGhid, fosterwxCashWorkBoxClientInfo.getGhid()));
+        }
+
+        return "新增修改成功!";
+    }
+}

src/main/java/com/mokamrp/privates/controller/pangu/FosterwxCashWorkwxTaskCatalogController.java

@@ -1,9 +1,14 @@
 package com.mokamrp.privates.controller.pangu;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.mokamrp.privates.constant.Constants;
 import com.mokamrp.privates.constant.HttpStatus;
+import com.mokamrp.privates.entity.AddHandle;
+import com.mokamrp.privates.entity.DelHandle;
 import com.mokamrp.privates.entity.PostBasePageHandle;
 import com.mokamrp.privates.help.AjaxResult;
 import com.mokamrp.privates.entity.ResHandle;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashTaskTemplate;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
@@ -15,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import com.mokamrp.privates.controller.BaseController;
 import javax.validation.Valid;
+import java.time.LocalDateTime;
 import java.util.Map;
 import java.util.List;
 
@@ -31,7 +37,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @Api(tags = "企微变现任务目录")
-@RequestMapping("/fosterwxCashWorkwxTaskCatalog")
+@RequestMapping("/pangu/fosterwxCashWorkwxTaskCatalog")
 public class FosterwxCashWorkwxTaskCatalogController extends BaseController<FosterwxCashWorkwxTaskCatalog> {
 
     @Autowired
@@ -52,6 +58,21 @@ public class FosterwxCashWorkwxTaskCatalogController extends BaseController<Fost
         return AjaxResult.success(res);
     }
 
+    @PostMapping("/add")
+    public Object add(@Valid @RequestBody AddHandle<FosterwxCashWorkwxTaskCatalog> addHandle, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
+        }
+        FosterwxCashWorkwxTaskCatalog save = addHandle.getRaw();
+        this.onInsert(save);
+        Boolean res = service.save(save);
+        if (res) {
+            return AjaxResult.success(Constants.SUCCESS, save.getId());
+        } else {
+            return AjaxResult.error("新增失败", res);
+        }
+    }
+
 
 }
 

src/main/java/com/mokamrp/privates/controller/pangu/FosterwxCashWorkwxTaskListController.java

@@ -38,7 +38,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @Api(tags = "企微变现任务列表")
-@RequestMapping("/fosterwxCashWorkwxTaskList")
+@RequestMapping("/pangu/fosterwxCashWorkwxTaskList")
 public class FosterwxCashWorkwxTaskListController extends BaseController<FosterwxCashWorkwxTaskList> {
 
     @Autowired

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

@@ -14,6 +14,11 @@ public class PostBasePageHandle {
     private String title;
     private String name;
     private Integer type;
+    private Integer taskType;
+    private Integer templateId;
+    private Integer catalogId;
+    private String ghId;
+    private Integer uploadUid;
     public Integer getPage() {
         return page;
     }

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

@@ -0,0 +1,97 @@
+package com.mokamrp.privates.entity.pangu;
+
+import lombok.Data;
+
+/**
+ * @Classname FosterwxCashBoxClientInfo
+ * @Description TODO
+ * @Date 2021/10/26 2:40 下午
+ * @Created by luqiucheng
+ */
+@Data
+public class FosterwxCashBoxClientInfo {
+    private UrlInfo urlInfo;
+
+    private BoxInfo boxInfo;
+
+    /**
+     * 链接消息
+     */
+    @Data
+    public class UrlInfo {
+        // 链接标题
+        private String title;
+        // 链接描述
+        private String desc;
+        // 链接地址
+        private String url;
+        // 链接图片
+        private String image_url;
+    }
+
+    /**
+     * 小程序消息
+     */
+    @Data
+    public class BoxInfo {
+        /**
+         * 小程序ghid
+         */
+        private String ghid;
+
+        /**
+         * appid
+         */
+        private String wxid;
+
+        /**
+         * 小程序名称
+         */
+        private String name;
+
+        /**
+         * 小程序分享的标题
+         */
+        private String title;
+
+        /**
+         * 入口点
+         */
+        private String enterpoint;
+
+        /**
+         * 小程序图标
+         */
+        private String headimg;
+
+        /**
+         * 缩略图key1
+         */
+        private String image_key1;
+
+        /**
+         * 缩略图key2
+         */
+        private String image_key2;
+
+        /**
+         * 缩略图key3
+         */
+        private String image_key3;
+
+        /**
+         * 缩略图大小
+         */
+        private Integer imageSize;
+
+        /**
+         * 小程序类型，默认2（0：小图样式 2：大图样式）
+         */
+        private Integer appType;
+
+        /**
+         * 小程序分享的标题
+         */
+        private String desc;
+    }
+}

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

@@ -22,6 +22,7 @@ public class FosterwxCashScheduleTaskListHandle {
     private Integer groupId;
     private Integer taskType;
     private Integer status;
+    private Integer type = 1;
     private LocalDateTime sendTimeFrom;
     private LocalDateTime sendTimeTo;
     private Integer createUid;

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

@@ -0,0 +1,21 @@
+package com.mokamrp.privates.entity.pangu;
+
+import lombok.Data;
+
+/**
+ * @Classname FosterwxWorkServeHandle
+ * @Description TODO
+ * @Date 2021/10/26 10:17 上午
+ * @Created by luqiucheng
+ */
+@Data
+public class FosterwxWorkServeHandle {
+    // 主体
+    private String corpName;
+    // 昵称
+    private String nickName;
+    // 团队id
+    private String teamId;
+    // 手机号
+    private String mobileNo;
+}

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

@@ -24,12 +24,15 @@
                B.custservice_name,
                B.team_id,
                B.work_wx_login_status,
+               B.mobile_no,
+               MCA.name as work_wx_corp_name,
                C.station_name,
                D.domain
         FROM pan_fosterwx_cash_mobile as A
         left join pan_fosterwx_mobile as B on A.mobile_id = B.id
         left join pan_fosterwx_station as C on A.station_id = C.id
         left join pan_fosterwx_domain as D on A.domain_id = D.id and D.status = 1
+        left join `mochat_java`.mc_corp as MCA on B.work_wx_corp_id = MCA.id
         <where>
             <if test="params.groupId != null">and A.group_id = #{params.groupId}</if>
             <if test="params.stationId != null">and A.station_id = #{params.stationId}</if>

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

@@ -27,6 +27,12 @@
         SELECT * FROM pan_fosterwx_cash_oas_box
         <where>
             <if test="params.groupId != null">and group_id = #{params.groupId}</if>
+            <if test="params.id != null">and id = #{params.id}</if>
+            <if test="params.stationId != null">and station_id = #{params.stationId}</if>
+            <if test="params.type != null">and type = #{params.type}</if>
+            <if test="params.name != null">and name like concat('%',#{params.groupId},'%')</if>
+            <if test="params.ghId != null">and gh_id = #{params.ghId}</if>
+            <if test="params.uploadUid != null">and upload_uid = #{params.uploadUid}</if>
         </where>
         order by id desc
     </select>

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

@@ -2,6 +2,7 @@ package com.mokamrp.privates.mapper.pangu;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mokamrp.privates.entity.pangu.FosterwxCashScheduleTaskListHandle;
 import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashScheduleTaskList;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
@@ -18,7 +19,7 @@ import java.util.List;
  */
 @Component
 public interface FosterwxCashScheduleTaskListMapper extends BaseMapper<FosterwxCashScheduleTaskList> {
-    public List<FosterwxCashScheduleTaskList> getList(@Param("ew") LambdaQueryWrapper<FosterwxCashScheduleTaskList> fosterwxCashScheduleTaskListLambdaQueryWrapper, @Param("limit") Integer page, @Param("offset") Integer offset);
+    public List<FosterwxCashScheduleTaskList> getList(@Param("ew") LambdaQueryWrapper<FosterwxCashScheduleTaskList> fosterwxCashScheduleTaskListLambdaQueryWrapper, @Param("limit") Integer page, @Param("offset") Integer offset, @Param("handle") FosterwxCashScheduleTaskListHandle handle);
 
     List<FosterwxCashScheduleTaskList> getBannedGhid();
 }

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

@@ -4,55 +4,108 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashScheduleTaskList">
-        <id column="id" property="id" />
-        <result column="schedule_id" property="scheduleId" />
-        <result column="template_id" property="templateId" />
-        <result column="task_id" property="taskId" />
-        <result column="child_task_id" property="childTaskId" />
-        <result column="group_id" property="groupId" />
-        <result column="task_type" property="taskType" />
-        <result column="remark" property="remark" />
-        <result column="task_content" property="taskContent" />
-        <result column="gh_id" property="ghId" />
-        <result column="send_url" property="sendUrl" />
-        <result column="status" property="status" />
-        <result column="type" property="type" />
-        <result column="err_info" property="errInfo" />
-        <result column="send_time" property="sendTime" />
-        <result column="create_uid" property="createUid" />
-        <result column="create_user" property="createUser" />
-        <result column="update_uid" property="updateUid" />
-        <result column="create_at" property="createAt" />
-        <result column="update_at" property="updateAt" />
+        <id column="id" property="id"/>
+        <result column="schedule_id" property="scheduleId"/>
+        <result column="template_id" property="templateId"/>
+        <result column="task_id" property="taskId"/>
+        <result column="child_task_id" property="childTaskId"/>
+        <result column="group_id" property="groupId"/>
+        <result column="task_type" property="taskType"/>
+        <result column="remark" property="remark"/>
+        <result column="task_content" property="taskContent"/>
+        <result column="gh_id" property="ghId"/>
+        <result column="box_ghid" property="boxGhid" />
+        <result column="box_url" property="boxUrl" />
+        <result column="send_url" property="sendUrl"/>
+        <result column="status" property="status"/>
+        <result column="type" property="type"/>
+        <result column="err_info" property="errInfo"/>
+        <result column="send_time" property="sendTime"/>
+        <result column="create_uid" property="createUid"/>
+        <result column="create_user" property="createUser"/>
+        <result column="update_uid" property="updateUid"/>
+        <result column="create_at" property="createAt"/>
+        <result column="update_at" property="updateAt"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, schedule_id, template_id, task_id, childTaskId, group_id, task_type, remark, task_content, status, err_info, send_time, create_uid, update_uid, create_at, update_at
+        id, schedule_id, template_id, task_id, child_task_id, group_id, task_type, remark, task_content, gh_id, box_ghid, box_url, send_url, status, type, err_info, send_time, create_uid, create_user, update_uid, create_at, update_at
     </sql>
     <select id="getList" resultType="com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashScheduleTaskList">
-        SELECT
-        task_list.*,
-        task_template.template_name,
-        mobile_group.group_name
-        FROM
+        <if test="handle.type == 2">
+            SELECT
+            task_list.*,
+            task_template.template_name,
+            mobile_group.group_name,
+            catalog.catalog_name,
+            (
+            SELECT
+            COUNT( 1 )
+            FROM
+            pan_fosterwx_cash_schedule_task_list
+            WHERE
+            pan_fosterwx_cash_schedule_task_list.schedule_id = task_list.schedule_id
+            AND pan_fosterwx_cash_schedule_task_list.template_id = task_list.template_id
+            AND pan_fosterwx_cash_schedule_task_list.task_id = task_list.task_id
+            AND pan_fosterwx_cash_schedule_task_list.group_id = task_list.group_id
+            ) AS total_count,
+            (
+            SELECT
+            COUNT( 1 )
+            FROM
+            pan_fosterwx_cash_schedule_task_list
+            WHERE
+            pan_fosterwx_cash_schedule_task_list.schedule_id = task_list.schedule_id
+            AND pan_fosterwx_cash_schedule_task_list.template_id = task_list.template_id
+            AND pan_fosterwx_cash_schedule_task_list.task_id = task_list.task_id
+            AND pan_fosterwx_cash_schedule_task_list.group_id = task_list.group_id
+            AND pan_fosterwx_cash_schedule_task_list.`status` IN ( 2, 4, 5, 6 )
+            ) AS created_count
+            FROM
+            (
+            SELECT
+            MIN( task_list.id ) AS id,
+            task_list.schedule_id,
+            task_list.template_id,
+            task_list.task_id,
+            task_list.group_id
+            FROM
             pan_fosterwx_cash_schedule_task_list task_list
-                LEFT JOIN pan_fosterwx_cash_task_template task_template ON task_template.id = task_list.template_id
-                LEFT JOIN pan_fosterwx_cash_mobile_group mobile_group ON task_list.group_id = mobile_group.id
-        <where>
-            ${ew.sqlSegment}
-        </where>
-        order by task_list.id desc
-        limit #{limit} offset #{offset}
+            GROUP BY
+            task_list.schedule_id,
+            task_list.template_id,
+            task_list.task_id,
+            task_list.group_id
+            ) task_list
+            LEFT JOIN pan_fosterwx_cash_task_template task_template ON task_template.id = task_list.template_id
+            LEFT JOIN pan_fosterwx_cash_mobile_group mobile_group ON task_list.group_id = mobile_group.id
+            LEFT JOIN pan_fosterwx_cash_workwx_task_catalog catalog ON task_list.task_id = catalog.id
+            ORDER BY
+            task_list.id DESC
+            limit #{limit} offset #{offset}
+        </if>
+        <if test="handle.type == 1">
+            SELECT
+            task_list.*,
+            task_template.template_name,
+            mobile_group.group_name
+            FROM
+            pan_fosterwx_cash_schedule_task_list task_list
+            LEFT JOIN pan_fosterwx_cash_task_template task_template ON task_template.id = task_list.template_id
+            LEFT JOIN pan_fosterwx_cash_mobile_group mobile_group ON task_list.group_id = mobile_group.id
+            <where>
+                ${ew.sqlSegment}
+            </where>
+            order by task_list.id desc
+            limit #{limit} offset #{offset}
+        </if>
     </select>
     <select id="getBannedGhid" resultType="com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashScheduleTaskList">
-        SELECT
-            task_list.*
-        FROM
-            pan_fosterwx_cash_schedule_task_list task_list
-                LEFT JOIN pan_fosterwx_cash_oas_box box ON task_list.gh_id = box.gh_id
-        WHERE
-            box.fobidden_status = 2
-            AND task_list.`status` = 4
+        SELECT task_list.*
+        FROM pan_fosterwx_cash_schedule_task_list task_list
+                 LEFT JOIN pan_fosterwx_cash_oas_box box ON task_list.gh_id = box.gh_id
+        WHERE box.fobidden_status = 2
+          AND task_list.`status` = 4
     </select>
 </mapper>

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

@@ -19,4 +19,5 @@ import java.util.List;
 @Component
 public interface FosterwxCashTaskTemplateMapper extends BaseMapper<FosterwxCashTaskTemplate> {
     public List<FosterwxCashTaskTemplate> getList(Page<FosterwxCashTaskTemplate> pageObj, @Param("params")PostBasePageHandle handle);
+    public List<FosterwxCashTaskTemplate> getWorkwxList(Page<FosterwxCashTaskTemplate> pageObj, @Param("params")PostBasePageHandle handle);
 }

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

@@ -21,7 +21,7 @@
     <select id="getList" resultType="com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashTaskTemplate">
         SELECT A.* FROM pan_fosterwx_cash_task_template as A
         <if test="params.title != null">
-            left join (select template_id,title from pan_fosterwx_cash_task_list where title like concat('%',#{params.title},'%') group by template_id,title) as B
+            left join (select template_id from pan_fosterwx_cash_task_list where title like concat('%',#{params.title},'%') group by template_id) as B
             on B.template_id = A.id
         </if>
         where A.del_flg = 1
@@ -29,7 +29,21 @@
         <if test="params.name != null">and A.template_name like concat('%',#{params.name},'%')</if>
         <if test="params.createUid != null">and A.create_uid = #{params.createUid}</if>
         <if test="params.id != null">and A.id = #{params.id}</if>
-        <if test="params.title != null">and B.title is not null</if>
+        <if test="params.title != null">and B.template_id is not null</if>
         order by id desc
     </select>
+    <select id="getWorkwxList" resultType="com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashTaskTemplate">
+        SELECT A.* FROM pan_fosterwx_cash_task_template as A
+        <if test="params.title != null">
+            left join (select template_id from pan_fosterwx_cash_workwx_task_list where title like concat('%',#{params.title},'%') group by template_id) as B
+            on B.template_id = A.id
+        </if>
+        where A.del_flg = 1
+        <if test="params.type != null">and A.template_type = #{params.type}</if>
+        <if test="params.name != null">and A.template_name like concat('%',#{params.name},'%')</if>
+        <if test="params.createUid != null">and A.create_uid = #{params.createUid}</if>
+        <if test="params.id != null">and A.id = #{params.id}</if>
+        <if test="params.title != null">and B.template_id is not null</if>
+        order by A.id desc
+    </select>
 </mapper>

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

@@ -0,0 +1,21 @@
+package com.mokamrp.privates.mapper.pangu;
+
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashWorkBoxClientInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.stereotype.Component;
+import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
+/**
+ * <p>
+ * 企微小程序信息 Mapper 接口
+ * </p>
+ *
+ * @author leon
+ * @since 2021-10-26
+ */
+@Component
+public interface FosterwxCashWorkBoxClientInfoMapper extends BaseMapper<FosterwxCashWorkBoxClientInfo> {
+    public List<FosterwxCashWorkBoxClientInfo> getList(Page<FosterwxCashWorkBoxClientInfo> pageObj);
+}

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

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mokamrp.privates.mapper.pangu.FosterwxCashWorkBoxClientInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashWorkBoxClientInfo">
+        <id column="id" property="id" />
+        <result column="ghid" property="ghid" />
+        <result column="wxid" property="wxid" />
+        <result column="name" property="name" />
+        <result column="title" property="title" />
+        <result column="enterpoint" property="enterpoint" />
+        <result column="headimg" property="headimg" />
+        <result column="image_key1" property="imageKey1" />
+        <result column="image_key2" property="imageKey2" />
+        <result column="image_key3" property="imageKey3" />
+        <result column="image_size" property="imageSize" />
+        <result column="app_type" property="appType" />
+        <result column="desc" property="desc" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, ghid, wxid, name, title, enterpoint, headimg, image_key1, image_key2, image_key3, image_size, app_type, desc
+    </sql>
+    <select id="getList" resultType="com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashWorkBoxClientInfo">
+        SELECT * FROM pan_fosterwx_cash_work_box_client_info
+    </select>
+</mapper>

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

@@ -1,11 +1,13 @@
 package com.mokamrp.privates.mapper.pangu;
 
+import com.mokamrp.privates.entity.PostBasePageHandle;
 import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashWorkwxTaskCatalog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashWorkwxTaskList;
 import org.springframework.stereotype.Component;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -18,6 +20,9 @@ import java.util.List;
  */
 @Component
 public interface FosterwxCashWorkwxTaskCatalogMapper extends BaseMapper<FosterwxCashWorkwxTaskCatalog> {
-    public List<FosterwxCashWorkwxTaskCatalog> getList(Page<FosterwxCashWorkwxTaskCatalog> pageObj);
-    public List<FosterwxCashWorkwxTaskList>getTaskByTemplateId(@Param("templateId") Integer templateId);
+    public List<FosterwxCashWorkwxTaskCatalog> getList(Page<FosterwxCashWorkwxTaskCatalog> pageObj, @Param("params") PostBasePageHandle handle);
+
+    public List<FosterwxCashWorkwxTaskList> getTaskByTemplateId(@Param("templateId") Integer templateId);
+
+    public List<FosterwxCashWorkwxTaskList> getTaskList(@Param("params") PostBasePageHandle handle);
 }

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

@@ -21,6 +21,10 @@
     </sql>
     <select id="getList" resultType="com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashWorkwxTaskCatalog">
         SELECT * FROM pan_fosterwx_cash_workwx_task_catalog
+        <where>
+            and del_flg = 1
+            <if test="params.templateId != null">and template_id = #{params.templateId}</if>
+        </where>
     </select>
     <select id="getTaskByTemplateId"
             resultType="com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashWorkwxTaskList">
@@ -29,6 +33,21 @@
                B.*
         from pan_fosterwx_cash_workwx_task_catalog as A
         left join pan_fosterwx_cash_workwx_task_list as B on A.id = B.catalog_id
+        where A.del_flg = 1
+        and A.template_id = #{templateId}
         order by send_at desc
     </select>
+
+    <select id="getTaskList"
+            resultType="com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashWorkwxTaskList">
+        select A.catalog_name,
+               A.send_at,
+               B.*
+        from pan_fosterwx_cash_workwx_task_catalog as A
+                 left join pan_fosterwx_cash_workwx_task_list as B on A.id = B.catalog_id
+        where A.del_flg = 1
+        <if test="params.templateId != null">and A.template_id = #{params.templateId}</if>
+        <if test="params.title != null">and B.title like concat('%',#{params.title},'%')</if>
+        order by A.send_at desc
+    </select>
 </mapper>

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

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

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

@@ -41,5 +41,10 @@
     </sql>
     <select id="getList" resultType="com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashWorkwxTaskList">
         SELECT *  FROM pan_fosterwx_cash_workwx_task_list
+        <where>
+            and del_flg = 1
+            <if test="params.templateId != null">and template_id = #{params.templateId}</if>
+            <if test="params.catalogId != null">and catalog_id = #{params.catalogId}</if>
+        </where>
     </select>
 </mapper>

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

@@ -72,6 +72,12 @@ public class FosterwxCashMobile extends Model<FosterwxCashMobile> {
      */
     @TableField(exist = false)
     private String teamId;
+
+    @TableField(exist = false)
+    private String mobileNo;
+
+    @TableField(exist = false)
+    private String workWxCorpName;
     /**
      * 微信登录状态
      */

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

@@ -75,6 +75,16 @@ public class FosterwxCashScheduleTaskList extends Model<FosterwxCashScheduleTask
     private String ghId;
 
     /**
+     * 小程序ghid
+     */
+    private String boxGhid;
+
+    /**
+     * 小程序路径
+     */
+    private String boxUrl;
+
+    /**
      * 发文链接
      */
     private String sendUrl;
@@ -128,17 +138,14 @@ public class FosterwxCashScheduleTaskList extends Model<FosterwxCashScheduleTask
     private FosterwxCashTaskList fosterwxCashTaskList;
 
     @TableField(exist = false)
-    private List<FosterwxCashWorkwxTaskList> fosterwxCashWorkwxTaskListList;
+    private FosterwxCashWorkwxTaskList fosterwxCashWorkwxTaskList;
 
     @TableField(exist = false)
-    private String boxGhid;
+    private List<FosterwxCashWorkwxTaskList> fosterwxCashWorkwxTaskListList;
 
     @TableField(exist = false)
     private Object boxInfo;
 
-    @TableField(exist = false)
-    private String boxUrl;
-
     public Integer getId() {
         return id;
     }
@@ -170,7 +177,7 @@ public class FosterwxCashScheduleTaskList extends Model<FosterwxCashScheduleTask
     public void setTaskId(Integer taskId) {
         this.taskId = taskId;
     }
-    
+
     public Integer getChildTaskId() {
         return childTaskId;
     }
@@ -369,4 +376,12 @@ public class FosterwxCashScheduleTaskList extends Model<FosterwxCashScheduleTask
                 ", updateAt=" + updateAt +
                 "}";
     }
+
+    public FosterwxCashWorkwxTaskList getFosterwxCashWorkwxTaskList() {
+        return fosterwxCashWorkwxTaskList;
+    }
+
+    public void setFosterwxCashWorkwxTaskList(FosterwxCashWorkwxTaskList fosterwxCashWorkwxTaskList) {
+        this.fosterwxCashWorkwxTaskList = fosterwxCashWorkwxTaskList;
+    }
 }

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

@@ -0,0 +1,207 @@
+package com.mokamrp.privates.mapper.pangu.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 企微小程序信息
+ * </p>
+ *
+ * @author leon
+ * @since 2021-10-26
+ */
+@TableName("pan_fosterwx_cash_work_box_client_info")
+public class FosterwxCashWorkBoxClientInfo extends Model<FosterwxCashWorkBoxClientInfo> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 小程序ghid
+     */
+    private String ghid;
+
+    /**
+     * appid
+     */
+    private String wxid;
+
+    /**
+     * 小程序名称
+     */
+    private String name;
+
+    /**
+     * 小程序分享的标题
+     */
+    private String title;
+
+    /**
+     * 入口点
+     */
+    private String enterpoint;
+
+    /**
+     * 小程序图标
+     */
+    private String headimg;
+
+    /**
+     * 缩略图key1
+     */
+    private String imageKey1;
+
+    /**
+     * 缩略图key2
+     */
+    private String imageKey2;
+
+    /**
+     * 缩略图key3
+     */
+    private String imageKey3;
+
+    /**
+     * 缩略图大小
+     */
+    private Integer imageSize;
+
+    /**
+     * 小程序类型，默认2（0：小图样式 2：大图样式）
+     */
+    private Integer appType;
+
+    /**
+     * 小程序分享的标题
+     */
+    @TableField("`desc`")
+    private String desc;
+
+
+    public String getGhid() {
+        return ghid;
+    }
+
+    public void setGhid(String ghid) {
+        this.ghid = ghid;
+    }
+
+    public String getWxid() {
+        return wxid;
+    }
+
+    public void setWxid(String wxid) {
+        this.wxid = wxid;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getEnterpoint() {
+        return enterpoint;
+    }
+
+    public void setEnterpoint(String enterpoint) {
+        this.enterpoint = enterpoint;
+    }
+
+    public String getHeadimg() {
+        return headimg;
+    }
+
+    public void setHeadimg(String headimg) {
+        this.headimg = headimg;
+    }
+
+    public String getImageKey1() {
+        return imageKey1;
+    }
+
+    public void setImageKey1(String imageKey1) {
+        this.imageKey1 = imageKey1;
+    }
+
+    public String getImageKey2() {
+        return imageKey2;
+    }
+
+    public void setImageKey2(String imageKey2) {
+        this.imageKey2 = imageKey2;
+    }
+
+    public String getImageKey3() {
+        return imageKey3;
+    }
+
+    public void setImageKey3(String imageKey3) {
+        this.imageKey3 = imageKey3;
+    }
+
+    public Integer getImageSize() {
+        return imageSize;
+    }
+
+    public void setImageSize(Integer imageSize) {
+        this.imageSize = imageSize;
+    }
+
+    public Integer getAppType() {
+        return appType;
+    }
+
+    public void setAppType(Integer appType) {
+        this.appType = appType;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.ghid;
+    }
+
+    @Override
+    public String toString() {
+        return "FosterwxCashWorkBoxClientInfo{" +
+                "ghid=" + ghid +
+                ", wxid=" + wxid +
+                ", name=" + name +
+                ", title=" + title +
+                ", enterpoint=" + enterpoint +
+                ", headimg=" + headimg +
+                ", imageKey1=" + imageKey1 +
+                ", imageKey2=" + imageKey2 +
+                ", imageKey3=" + imageKey3 +
+                ", imageSize=" + imageSize +
+                ", appType=" + appType +
+                ", desc=" + desc +
+                "}";
+    }
+}

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

@@ -0,0 +1,20 @@
+package com.mokamrp.privates.service.pangu;
+
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashWorkBoxClientInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.mokamrp.privates.entity.PostBasePageHandle;
+import com.mokamrp.privates.entity.ResHandle;
+import java.util.List;
+import java.util.Map;
+/**
+ * <p>
+ * 企微小程序信息 服务类
+ * </p>
+ *
+ * @author leon
+ * @since 2021-10-26
+ */
+public interface FosterwxCashWorkBoxClientInfoService extends IService<FosterwxCashWorkBoxClientInfo> {
+    //.@leon 获取数据列表
+    public ResHandle<List<FosterwxCashWorkBoxClientInfo>> getList(PostBasePageHandle handle);
+}

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

@@ -21,4 +21,6 @@ public interface FosterwxCashWorkwxTaskCatalogService extends IService<FosterwxC
     public ResHandle<List<FosterwxCashWorkwxTaskCatalog>> getList(PostBasePageHandle handle);
 
     public List<FosterwxCashWorkwxTaskList> getTaskByTemplateId(Integer templateId);
+
+    public List<FosterwxCashWorkwxTaskList> getTaskList(PostBasePageHandle handle);
 }

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

@@ -166,6 +166,7 @@ public class FosterwxCashAccountScheduleServiceImpl extends ServiceImpl<Fosterwx
                 fosterwxCashScheduleTaskList.setErrInfo("");
             }
 
+            fosterwxCashScheduleTaskList.setType(fosterwxCashAccountSchedule.getType());
             fosterwxCashScheduleTaskList.setSendTime(LocalDateTime.of(fosterwxCashAccountSchedule.getScheduleDate(), fosterwxCashWorkwxTaskList.getSendAt()));
             fosterwxCashScheduleTaskList.setCreateUid(fosterwxCashAccountSchedule.getCreateUid());
             fosterwxCashScheduleTaskList.setCreateUser(fosterwxCashAccountSchedule.getCreateUser());

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

@@ -14,6 +14,7 @@ import com.mokamrp.privates.service.CoralApiService;
 import com.mokamrp.privates.service.pangu.FosterwxCashOasBoxService;
 import com.mokamrp.privates.service.pangu.FosterwxCashScheduleTaskListService;
 import com.mokamrp.privates.service.pangu.FosterwxCashTaskListService;
+import com.mokamrp.privates.service.pangu.FosterwxCashWorkwxTaskListService;
 import com.mokamrp.privates.utils.pangu.redis.task.TaskRedis;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -45,6 +46,9 @@ public class FosterwxCashScheduleTaskListServiceImpl extends ServiceImpl<Fosterw
     public FosterwxCashTaskListService fosterwxCashTaskListService;
 
     @Autowired
+    public FosterwxCashWorkwxTaskListService fosterwxCashWorkwxTaskListService;
+
+    @Autowired
     public FosterwxCashOasBoxService fosterwxCashOasBoxService;
 
     @Autowired
@@ -59,6 +63,8 @@ public class FosterwxCashScheduleTaskListServiceImpl extends ServiceImpl<Fosterw
         Integer pagesize = handle.getPageSize();
         Integer page = handle.getPage();
         LambdaQueryWrapper<FosterwxCashScheduleTaskList> fosterwxCashScheduleTaskListLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        fosterwxCashScheduleTaskListLambdaQueryWrapper.eq(FosterwxCashScheduleTaskList::getType, handle.getType());
+
         // 任务模板名称
         if (null != handle.getTemplateId())
             fosterwxCashScheduleTaskListLambdaQueryWrapper.eq(FosterwxCashScheduleTaskList::getTemplateId, handle.getTemplateId());
@@ -78,7 +84,8 @@ public class FosterwxCashScheduleTaskListServiceImpl extends ServiceImpl<Fosterw
         if (null != handle.getScheduleId())
             fosterwxCashScheduleTaskListLambdaQueryWrapper.eq(FosterwxCashScheduleTaskList::getScheduleId, handle.getScheduleId());
 
-        List<FosterwxCashScheduleTaskList> list = fosterwxCashScheduleTaskListMapper.getList(fosterwxCashScheduleTaskListLambdaQueryWrapper, pagesize, (page - 1) * pagesize);
+        List<FosterwxCashScheduleTaskList> list = fosterwxCashScheduleTaskListMapper.getList(fosterwxCashScheduleTaskListLambdaQueryWrapper, pagesize, (page - 1) * pagesize, handle);
+
         ResHandle<List<FosterwxCashScheduleTaskList>> res = new ResHandle<>();
         res.setList(list);
         res.setTotal(Long.valueOf(fosterwxCashScheduleTaskListMapper.selectCount(fosterwxCashScheduleTaskListLambdaQueryWrapper)));
@@ -93,7 +100,7 @@ public class FosterwxCashScheduleTaskListServiceImpl extends ServiceImpl<Fosterw
     @Override
     public void cancelTask(Integer id, Integer userId) {
         fosterwxCashScheduleTaskListMapper.updateById(new FosterwxCashScheduleTaskList() {{
-            setScheduleId(id);
+            setId(id);
             setStatus(6);
             setUpdateUid(userId);
             setUpdateAt(LocalDateTime.now());
@@ -146,7 +153,15 @@ public class FosterwxCashScheduleTaskListServiceImpl extends ServiceImpl<Fosterw
             }
 
             fosterwxCashScheduleTaskListMapper.updateById(fosterwxCashScheduleTaskList);
-            fosterwxCashScheduleTaskList.setFosterwxCashTaskList(fosterwxCashTaskListService.getById(fosterwxCashScheduleTaskList.getTaskId()));
+            if (1 == fosterwxCashScheduleTaskList.getType()) {
+                fosterwxCashScheduleTaskList.setFosterwxCashTaskList(fosterwxCashTaskListService.getById(fosterwxCashScheduleTaskList.getTaskId()));
+            } else {
+                fosterwxCashScheduleTaskList.setFosterwxCashWorkwxTaskList(fosterwxCashWorkwxTaskListService.getOne(new LambdaQueryWrapper<FosterwxCashWorkwxTaskList>().
+                        eq(FosterwxCashWorkwxTaskList::getTemplateId, fosterwxCashScheduleTaskList.getTemplateId()).
+                        eq(FosterwxCashWorkwxTaskList::getCatalogId, fosterwxCashScheduleTaskList.getTaskId()).
+                        eq(FosterwxCashWorkwxTaskList::getId, fosterwxCashScheduleTaskList.getChildTaskId()).
+                        last("LIMIT 1")));
+            }
             tempList.add(fosterwxCashScheduleTaskList);
             count++;
             editList.remove(i);

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

@@ -46,7 +46,12 @@ public class FosterwxCashTaskTemplateServiceImpl extends ServiceImpl<FosterwxCas
         Integer pagesize = handle.getPagesize();
         Integer page = handle.getPage();
         Page<FosterwxCashTaskTemplate> pageObj = new Page<FosterwxCashTaskTemplate>(page, pagesize);
-        List<FosterwxCashTaskTemplate> list = fosterwxCashTaskTemplateMapper.getList(pageObj,handle);
+        List<FosterwxCashTaskTemplate> list = new ArrayList<>();
+        if(handle.getType() == 1){
+            list = fosterwxCashTaskTemplateMapper.getList(pageObj,handle);
+        }else{
+            list = fosterwxCashTaskTemplateMapper.getWorkwxList(pageObj,handle);
+        }
         ResHandle<List<FosterwxCashTaskTemplate>> res = new ResHandle<>();
         res.setList(list);
         res.setTotal(pageObj.getTotal());

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

@@ -0,0 +1,43 @@
+package com.mokamrp.privates.service.pangu.impl;
+
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashWorkBoxClientInfo;
+import com.mokamrp.privates.mapper.pangu.FosterwxCashWorkBoxClientInfoMapper;
+import com.mokamrp.privates.service.pangu.FosterwxCashWorkBoxClientInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import com.mokamrp.privates.entity.PostBasePageHandle;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import com.mokamrp.privates.entity.ResHandle;
+import java.util.*;
+
+/**
+ * <p>
+ * 企微小程序信息 服务实现类
+ * </p>
+ *
+ * @author leon
+ * @since 2021-10-26
+ */
+@Service
+public class FosterwxCashWorkBoxClientInfoServiceImpl extends ServiceImpl<FosterwxCashWorkBoxClientInfoMapper, FosterwxCashWorkBoxClientInfo> implements FosterwxCashWorkBoxClientInfoService {
+
+    @Autowired
+    public FosterwxCashWorkBoxClientInfoMapper fosterwxCashWorkBoxClientInfoMapper;
+    /**
+     * 获取数据列表 支持分页
+     * @param handle
+     * @return
+     */
+    public ResHandle<List<FosterwxCashWorkBoxClientInfo>> getList(PostBasePageHandle handle) {
+        Integer pagesize = handle.getPagesize();
+        Integer page = handle.getPage();
+        Page<FosterwxCashWorkBoxClientInfo> pageObj = new Page<FosterwxCashWorkBoxClientInfo>(page, pagesize);
+        List<FosterwxCashWorkBoxClientInfo> list = fosterwxCashWorkBoxClientInfoMapper.getList(pageObj);
+        ResHandle<List<FosterwxCashWorkBoxClientInfo>> res = new ResHandle<>();
+        res.setList(list);
+        res.setTotal(pageObj.getTotal());
+        return res;
+    }
+}

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

@@ -35,17 +35,32 @@ public class FosterwxCashWorkwxTaskCatalogServiceImpl extends ServiceImpl<Foster
         Integer pagesize = handle.getPagesize();
         Integer page = handle.getPage();
         Page<FosterwxCashWorkwxTaskCatalog> pageObj = new Page<FosterwxCashWorkwxTaskCatalog>(page, pagesize);
-        List<FosterwxCashWorkwxTaskCatalog> list = fosterwxCashWorkwxTaskCatalogMapper.getList(pageObj);
+        List<FosterwxCashWorkwxTaskCatalog> list = fosterwxCashWorkwxTaskCatalogMapper.getList(pageObj,handle);
         ResHandle<List<FosterwxCashWorkwxTaskCatalog>> res = new ResHandle<>();
         res.setList(list);
         res.setTotal(pageObj.getTotal());
         return res;
     }
 
+    /**
+     * 通过模板ID获取具体的目录和任务 陆秋成专用
+     * @param templateId
+     * @return
+     */
     public List<FosterwxCashWorkwxTaskList> getTaskByTemplateId(Integer templateId) {
         List<FosterwxCashWorkwxTaskList> list = fosterwxCashWorkwxTaskCatalogMapper.getTaskByTemplateId(templateId);
         return list;
     }
 
+    /**
+     * 查看目录和任务列表 模板查看界面使用
+     * @param handle
+     * @return
+     */
+    public List<FosterwxCashWorkwxTaskList> getTaskList (PostBasePageHandle handle) {
+        List<FosterwxCashWorkwxTaskList> list = fosterwxCashWorkwxTaskCatalogMapper.getTaskList(handle);
+        return list;
+    }
+
 
 }

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

@@ -35,7 +35,7 @@ public class FosterwxCashWorkwxTaskListServiceImpl extends ServiceImpl<FosterwxC
         Integer pagesize = handle.getPagesize();
         Integer page = handle.getPage();
         Page<FosterwxCashWorkwxTaskList> pageObj = new Page<FosterwxCashWorkwxTaskList>(page, pagesize);
-        List<FosterwxCashWorkwxTaskList> list = fosterwxCashWorkwxTaskListMapper.getList(pageObj);
+        List<FosterwxCashWorkwxTaskList> list = fosterwxCashWorkwxTaskListMapper.getList(pageObj,handle);
         ResHandle<List<FosterwxCashWorkwxTaskList>> res = new ResHandle<>();
         res.setList(list);
         res.setTotal(pageObj.getTotal());

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

@@ -62,7 +62,6 @@ public class SyncNewFosterwxTask {
                 fosterwxTaskScheduleHandle.setPage(1);
                 fosterwxTaskScheduleHandle.setPagesize(99999);
                 ResHandle<List<FosterwxTaskSchedule>> resHandle = fosterwxTaskScheduleService.getList(fosterwxTaskScheduleHandle);
-                System.out.println(resHandle);
                 List<FosterwxTaskSchedule> fosterwxTaskScheduleList = resHandle.getList();
                 for (FosterwxTaskSchedule fosterwxTaskSchedule : fosterwxTaskScheduleList) {
                     String sendDate = fosterwxTaskSchedule.getSendDate().toString();

src/main/resources/application-local.properties

@@ -71,6 +71,8 @@ xxl-sso.excluded.paths=/healthy,\
   /pangu/fosterwxFlowList/list,\
   /pangu/fosterwxStation/login,\
   /pangu/fosterwxMobilePool/getOutOfServerList,\
+  /pangu/server/getTaskInfo,\
+  /pangu/server/saveBoxInfo,\
   /pangu/promoteMaxRecord/getPromoteCodeMaxRecord
 #xxl.sso.redis.address=redis://xxl-sso:Jch9shshl@r-uf633f3f27aa2174pd.redis.rds.aliyuncs.com:6379/0
 xxl.sso.redis.address=redis://xxl-sso:MokaSapce666$%25_RediS@r-uf6727zrr24ioihy72pd.redis.rds.aliyuncs.com:23563/0

src/main/resources/application-prod.properties

@@ -65,6 +65,8 @@ xxl-sso.excluded.paths=/healthy,\
   /pangu/fosterwxFlowList/list,\
   /pangu/fosterwxStation/login,\
   /pangu/fosterwxMobilePool/getOutOfServerList,\
+  /pangu/server/getTaskInfo,\
+  /pangu/server/saveBoxInfo,\
   /pangu/promoteMaxRecord/getPromoteCodeMaxRecord
 xxl.sso.redis.address=redis://xxl-sso:MokaSapce666$%25_RediS@r-uf6727zrr24ioihy72.redis.rds.aliyuncs.com:6379/0
 menu.host=http://space-server-in-svc/space/menu/getMenuInterface?sysCode=1006&userId=

src/main/resources/application-test.properties

@@ -66,6 +66,8 @@ xxl-sso.excluded.paths=/healthy,\
 /pangu/fosterwxFlowList/list,\
 /pangu/fosterwxStation/login,\
 /pangu/fosterwxMobilePool/getOutOfServerList,\
+/pangu/server/getTaskInfo,\
+/pangu/server/saveBoxInfo,\
 /pangu/promoteMaxRecord/getPromoteCodeMaxRecord
 #xxl.sso.redis.address=redis://xxl-sso:Jch9shshl@r-uf633f3f27aa2174pd.redis.rds.aliyuncs.com:6379/0
 xxl.sso.redis.address=redis://xxl-sso:MokaSapce666$%25_RediS@r-uf6727zrr24ioihy72pd.redis.rds.aliyuncs.com:23563/0

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

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