Преглед на файлове

Merge branch 'test' into dev-lqc

lqc преди 4 години
родител
ревизия
fabf59ae63
променени са 32 файла, в които са добавени 1027 реда и са изтрити 10 реда
  1. 2 0
      src/main/java/com/mokamrp/privates/constant/RedisKey.java
  2. 61 0
      src/main/java/com/mokamrp/privates/controller/WorkComplainH5RecordController.java
  3. 65 0
      src/main/java/com/mokamrp/privates/controller/WorkComplainH5TypeController.java
  4. 101 0
      src/main/java/com/mokamrp/privates/controller/pangu/DeptController.java
  5. 7 1
      src/main/java/com/mokamrp/privates/controller/pangu/FosterwxCashTaskTemplateController.java
  6. 18 1
      src/main/java/com/mokamrp/privates/controller/pangu/FosterwxCashWorkClientController.java
  7. 7 1
      src/main/java/com/mokamrp/privates/controller/pangu/FosterwxCashWorkwxTaskListController.java
  8. 18 3
      src/main/java/com/mokamrp/privates/controller/pangu/FosterwxStationController.java
  9. 5 0
      src/main/java/com/mokamrp/privates/entity/PostBasePageHandle.java
  10. 21 0
      src/main/java/com/mokamrp/privates/mapper/WorkComplainH5RecordMapper.java
  11. 22 0
      src/main/java/com/mokamrp/privates/mapper/WorkComplainH5RecordMapper.xml
  12. 21 0
      src/main/java/com/mokamrp/privates/mapper/WorkComplainH5TypeMapper.java
  13. 21 0
      src/main/java/com/mokamrp/privates/mapper/WorkComplainH5TypeMapper.xml
  14. 21 0
      src/main/java/com/mokamrp/privates/mapper/pangu/DeptMapper.java
  15. 21 0
      src/main/java/com/mokamrp/privates/mapper/pangu/DeptMapper.xml
  16. 2 1
      src/main/java/com/mokamrp/privates/mapper/pangu/FosterwxCashWorkBoxClientInfoMapper.java
  17. 12 0
      src/main/java/com/mokamrp/privates/mapper/pangu/FosterwxCashWorkBoxClientInfoMapper.xml
  18. 116 0
      src/main/java/com/mokamrp/privates/mapper/pangu/pojo/Dept.java
  19. 8 0
      src/main/java/com/mokamrp/privates/mapper/pangu/pojo/FosterwxCashWorkBoxClientInfo.java
  20. 2 0
      src/main/java/com/mokamrp/privates/mapper/pangu/pojo/FosterwxStation.java
  21. 119 0
      src/main/java/com/mokamrp/privates/mapper/pojo/WorkComplainH5Record.java
  22. 105 0
      src/main/java/com/mokamrp/privates/mapper/pojo/WorkComplainH5Type.java
  23. 20 0
      src/main/java/com/mokamrp/privates/service/WorkComplainH5RecordService.java
  24. 20 0
      src/main/java/com/mokamrp/privates/service/WorkComplainH5TypeService.java
  25. 43 0
      src/main/java/com/mokamrp/privates/service/impl/WorkComplainH5RecordServiceImpl.java
  26. 43 0
      src/main/java/com/mokamrp/privates/service/impl/WorkComplainH5TypeServiceImpl.java
  27. 20 0
      src/main/java/com/mokamrp/privates/service/pangu/DeptService.java
  28. 43 0
      src/main/java/com/mokamrp/privates/service/pangu/impl/DeptServiceImpl.java
  29. 1 1
      src/main/java/com/mokamrp/privates/service/pangu/impl/FosterwxCashWorkBoxClientInfoServiceImpl.java
  30. 60 0
      src/main/java/com/mokamrp/privates/task/pangu/UpdateFosterwxCashWorkBoxClientInfo.java
  31. 1 1
      src/test/java/com/mokamrp/AutoMP.java
  32. 1 1
      src/test/java/com/mokamrp/AutoMPPangu.java

+ 2 - 0
src/main/java/com/mokamrp/privates/constant/RedisKey.java

@@ -33,6 +33,8 @@ public class RedisKey {
     public static final String CheckWxDomainToken = "check_wx_domain_token";
     //.企微客服发送朋友圈任务
     public static final String WorkEmployeeFriendcircleJob = "work_employee_friendcircle_job";
+    //.企微投诉H5类型
+    public static final String WorkComplainType = "work_complain_type";
     //.盘古 微信养号任务
     public static final String PanWxfosterTask = "pan_wxfoster_task:";
     //.盘古 企微养号任务

+ 61 - 0
src/main/java/com/mokamrp/privates/controller/WorkComplainH5RecordController.java

@@ -0,0 +1,61 @@
+package com.mokamrp.privates.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.mokamrp.privates.constant.HttpStatus;
+import com.mokamrp.privates.entity.PostBasePageHandle;
+import com.mokamrp.privates.help.AjaxResult;
+import com.mokamrp.privates.entity.ResHandle;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.mokamrp.privates.service.WorkComplainH5RecordService;
+import com.mokamrp.privates.mapper.pojo.WorkComplainH5Record;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.mokamrp.privates.controller.BaseController;
+import javax.validation.Valid;
+import java.util.Map;
+import java.util.List;
+
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author leon
+ * @since 2021-11-25
+ */
+@RestController
+@RequestMapping("/workComplainH5Record")
+public class WorkComplainH5RecordController extends BaseController<WorkComplainH5Record> {
+
+    @Autowired
+    public WorkComplainH5RecordService workComplainH5RecordService;
+
+    @Autowired
+    public StringRedisTemplate stringRedisTemplate;
+
+    /*
+     * @fast
+     * 默认生成的控制器所继承的父类中有index/add/edit/del四个基础方法,均为post json请求
+     * 如果需要定制化,需要将BaseController中对应的方法复制到当前控制器,然后进行修改
+     */
+
+    @PostMapping("/list")
+    public Object list(@Valid @RequestBody PostBasePageHandle postBasePageHandle, BindingResult bindingResult){
+        if (bindingResult.hasErrors()) {
+            return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
+        }
+        ResHandle<List<WorkComplainH5Record>> res = workComplainH5RecordService.getList(postBasePageHandle);
+        return AjaxResult.success(res);
+    }
+
+
+
+}
+

+ 65 - 0
src/main/java/com/mokamrp/privates/controller/WorkComplainH5TypeController.java

@@ -0,0 +1,65 @@
+package com.mokamrp.privates.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.mokamrp.privates.constant.HttpStatus;
+import com.mokamrp.privates.constant.RedisKey;
+import com.mokamrp.privates.entity.PostBasePageHandle;
+import com.mokamrp.privates.help.AjaxResult;
+import com.mokamrp.privates.entity.ResHandle;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.mokamrp.privates.service.WorkComplainH5TypeService;
+import com.mokamrp.privates.mapper.pojo.WorkComplainH5Type;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.mokamrp.privates.controller.BaseController;
+import javax.validation.Valid;
+import java.util.Map;
+import java.util.List;
+
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * <p>
+ * 企微投诉H5类型 前端控制器
+ * </p>
+ *
+ * @author leon
+ * @since 2021-11-25
+ */
+@RestController
+@RequestMapping("/workComplainH5Type")
+public class WorkComplainH5TypeController extends BaseController<WorkComplainH5Type> {
+
+    @Autowired
+    public WorkComplainH5TypeService workComplainH5TypeService;
+
+    @Autowired
+    public StringRedisTemplate stringRedisTemplate;
+    /*
+     * @fast
+     * 默认生成的控制器所继承的父类中有index/add/edit/del四个基础方法,均为post json请求
+     * 如果需要定制化,需要将BaseController中对应的方法复制到当前控制器,然后进行修改
+     */
+
+    @PostMapping("/list")
+    public Object list(@Valid @RequestBody PostBasePageHandle postBasePageHandle, BindingResult bindingResult){
+        if (bindingResult.hasErrors()) {
+            return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
+        }
+        ResHandle<List<WorkComplainH5Type>> res = workComplainH5TypeService.getList(postBasePageHandle);
+        return AjaxResult.success(res);
+    }
+
+    protected void finalize( )
+    {
+        List<WorkComplainH5Type> list = workComplainH5TypeService.list(new QueryWrapper<WorkComplainH5Type>().orderByAsc("seq"));
+        stringRedisTemplate.opsForValue().set(RedisKey.WorkComplainType, JSONObject.toJSONString(list));
+    }
+}
+

+ 101 - 0
src/main/java/com/mokamrp/privates/controller/pangu/DeptController.java

@@ -0,0 +1,101 @@
+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.DelHandle;
+import com.mokamrp.privates.entity.PostBasePageHandle;
+import com.mokamrp.privates.help.AjaxResult;
+import com.mokamrp.privates.entity.ResHandle;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.*;
+import com.mokamrp.privates.service.pangu.DeptService;
+import com.mokamrp.privates.mapper.pangu.pojo.Dept;
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.mokamrp.privates.controller.BaseController;
+import javax.validation.Valid;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.List;
+
+
+/**
+ * <p>
+ * 盘古部门表 前端控制器
+ * </p>
+ *
+ * @author leon
+ * @since 2021-11-25
+ */
+@RestController
+@Api(tags = "盘古部门管理")
+@RequestMapping("/pangu/dept")
+public class DeptController extends BaseController<Dept> {
+
+    @Autowired
+    public DeptService deptService;
+
+    private List<Integer> chilMenuIds = new ArrayList<>();
+
+    /*
+     * @fast
+     * 默认生成的控制器所继承的父类中有index/add/edit/del四个基础方法,均为post json请求
+     * 如果需要定制化,需要将BaseController中对应的方法复制到当前控制器,然后进行修改
+     */
+
+    @PostMapping("/list")
+    public Object list(@Valid @RequestBody PostBasePageHandle postBasePageHandle, BindingResult bindingResult){
+        if (bindingResult.hasErrors()) {
+            return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
+        }
+        ResHandle<List<Dept>> res = deptService.getList(postBasePageHandle);
+        return AjaxResult.success(res);
+    }
+
+    @GetMapping("/tree")
+    public Object tree(){
+        List<Dept> list = deptService.list();
+        List<Dept> tree = this.getTree(list,0);
+        return AjaxResult.success(tree);
+    }
+
+    @PostMapping("/del")
+    public Object delete(@Valid @RequestBody DelHandle<Dept> delHandle, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<Dept> row = service.list();
+        Dept delInfo = service.getOne(new QueryWrapper<Dept>().eq("id",delHandle.getIds()));
+        this.getChilMenu(row,delInfo.getId());
+        this.chilMenuIds.add(delInfo.getId());
+        boolean res = service.remove(new QueryWrapper<Dept>().in("id",this.chilMenuIds));
+        if (!res) {
+            return AjaxResult.error("删除失败");
+        }
+        return AjaxResult.success(Constants.SUCCESS, res);
+    }
+
+    private void getChilMenu(List<Dept> row,Integer pid){
+        for (Dept dept : row){
+            if(dept.getParentDeptId().equals(pid)){
+                this.chilMenuIds.add(dept.getId());
+                this.getTree(row,dept.getId());
+            }
+        }
+    }
+
+    private List<Dept> getTree(List<Dept> row,Integer pid){
+        List<Dept> tree = new ArrayList<>();
+        for (Dept dept : row){
+            if(dept.getParentDeptId().equals(pid)){
+                dept.setChildren(this.getTree(row,dept.getId()));
+                tree.add(dept);
+            }
+        }
+        return tree;
+    }
+
+}
+

+ 7 - 1
src/main/java/com/mokamrp/privates/controller/pangu/FosterwxCashTaskTemplateController.java

@@ -162,7 +162,7 @@ public class FosterwxCashTaskTemplateController extends BaseController<FosterwxC
                 //.保存任务目录内任务列表
                 //.对接珊瑚云取小程序appid
                 Integer taskType = fosterwxCashWorkwxTaskList.getTaskType();
-                if (taskType == 1 || taskType == 3){
+                if (taskType == 1){
                     FosterwxCashOasBox boxOasInfo = fosterwxCashOasBoxService.getById(fosterwxCashWorkwxTaskList.getBoxId());
                     Object info = coralApiService.getBoxInfo(boxOasInfo.getGhId());
                     JSONObject json = JSONObject.parseObject(info.toString());
@@ -170,6 +170,12 @@ public class FosterwxCashTaskTemplateController extends BaseController<FosterwxC
                     fosterwxCashWorkwxTaskList.setBoxName(boxOasInfo.getName());
                     fosterwxCashWorkwxTaskList.setBoxGhId(boxOasInfo.getGhId());
                     fosterwxCashWorkwxTaskList.setBoxAppid(json.get("appid").toString());
+                }else if (taskType == 3){
+                    //.从缓存抽取ghid videoId tagId,同时从珊瑚云抽取appid boxType
+                    Object info = coralApiService.getBoxInfo(fosterwxCashWorkwxTaskList.getBoxGhId());
+                    JSONObject json = JSONObject.parseObject(info.toString());
+                    fosterwxCashWorkwxTaskList.setBoxType(Integer.parseInt(json.get("boxType").toString()));
+                    fosterwxCashWorkwxTaskList.setBoxAppid(json.get("appid").toString());
                 }
                 //.----end----------
                 fosterwxCashWorkwxTaskList.setTemplateId(add.getId());

+ 18 - 1
src/main/java/com/mokamrp/privates/controller/pangu/FosterwxCashWorkClientController.java

@@ -2,7 +2,12 @@ package com.mokamrp.privates.controller.pangu;
 
 import com.alibaba.fastjson.JSONObject;
 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.PostBasePageHandle;
+import com.mokamrp.privates.entity.ResHandle;
 import com.mokamrp.privates.entity.pangu.FosterwxCashBoxClientInfo;
+import com.mokamrp.privates.entity.pangu.FosterwxCashTaskListHandle;
 import com.mokamrp.privates.entity.pangu.FosterwxWorkServeHandle;
 import com.mokamrp.privates.help.AjaxResult;
 import com.mokamrp.privates.mapper.pangu.pojo.*;
@@ -15,10 +20,13 @@ 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.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -35,7 +43,7 @@ import java.util.List;
 @RequestMapping("/pangu/server")
 @Api(tags = "供客户端调用接口")
 @Slf4j
-public class FosterwxCashWorkClientController {
+public class FosterwxCashWorkClientController extends BaseController<FosterwxCashWorkBoxClientInfo> {
     @Autowired
     private FosterwxCashScheduleTaskListService fosterwxCashScheduleTaskListService;
 
@@ -60,6 +68,15 @@ public class FosterwxCashWorkClientController {
     @Autowired
     private FosterwxCashScheduleTaskMobileService fosterwxCashScheduleTaskMobileService;
 
+    @PostMapping("/list")
+    public Object list(@Valid @RequestBody PostBasePageHandle handle, BindingResult bindingResult){
+        if (bindingResult.hasErrors()) {
+            return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
+        }
+        ResHandle<List<FosterwxCashWorkBoxClientInfo>> res = fosterwxCashWorkBoxClientInfoService.getList(handle);
+        return AjaxResult.success(res);
+    }
+
 
     @PostMapping(value = "/getTaskInfo", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
     @ApiOperation(value = "返回凌晨到当前时间的未发送的数据,主体 昵称/团队id 昵称 两两一组必须有数据")

+ 7 - 1
src/main/java/com/mokamrp/privates/controller/pangu/FosterwxCashWorkwxTaskListController.java

@@ -86,7 +86,7 @@ public class FosterwxCashWorkwxTaskListController extends BaseController<Fosterw
         }
         this.onUpdate(editHandle);
         Integer taskType = editHandle.getRaw().getTaskType();
-        if (taskType == 1 || taskType == 3) {
+        if (taskType == 1) {
             FosterwxCashOasBox boxOasInfo = fosterwxCashOasBoxService.getById(editHandle.getRaw().getBoxId());
             Object info = coralApiService.getBoxInfo(boxOasInfo.getGhId());
             JSONObject json = JSONObject.parseObject(info.toString());
@@ -94,6 +94,12 @@ public class FosterwxCashWorkwxTaskListController extends BaseController<Fosterw
             editHandle.getRaw().setBoxName(boxOasInfo.getName());
             editHandle.getRaw().setBoxGhId(boxOasInfo.getGhId());
             editHandle.getRaw().setBoxAppid(json.get("appid").toString());
+        } else if (taskType == 3){
+            //.从缓存抽取ghid videoId tagId,同时从珊瑚云抽取appid boxType
+            Object info = coralApiService.getBoxInfo(editHandle.getRaw().getBoxGhId());
+            JSONObject json = JSONObject.parseObject(info.toString());
+            editHandle.getRaw().setBoxType(Integer.parseInt(json.get("boxType").toString()));
+            editHandle.getRaw().setBoxAppid(json.get("appid").toString());
         }
         service.update(editHandle.getRaw(), new QueryWrapper<FosterwxCashWorkwxTaskList>().in("id", editHandle.getIds()));
         return AjaxResult.success(Constants.SUCCESS, true);

+ 18 - 3
src/main/java/com/mokamrp/privates/controller/pangu/FosterwxStationController.java

@@ -7,24 +7,26 @@ import com.mokamrp.privates.constant.Constants;
 import com.mokamrp.privates.constant.HttpStatus;
 import com.mokamrp.privates.constant.RedisKey;
 import com.mokamrp.privates.controller.BaseController;
-import com.mokamrp.privates.entity.AddHandle;
-import com.mokamrp.privates.entity.DelHandle;
-import com.mokamrp.privates.entity.EditHandle;
+import com.mokamrp.privates.entity.*;
 import com.mokamrp.privates.entity.pangu.GetForsterwxStationHandle;
 import com.mokamrp.privates.entity.pangu.LoginStationHandle;
 import com.mokamrp.privates.help.AjaxResult;
 import com.mokamrp.privates.interceptor.AuthUser;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashMobile;
 import com.mokamrp.privates.mapper.pangu.pojo.FosterwxStation;
 import com.mokamrp.privates.mapper.pojo.User;
 import com.mokamrp.privates.service.CoralApiService;
 import com.mokamrp.privates.service.WechatApiService;
 import com.mokamrp.privates.service.pangu.FosterwxStationService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
@@ -38,6 +40,7 @@ import java.util.Map;
  * @since 2021-07-19
  */
 @RestController
+@Api(tags = "盘古站点管理")
 @RequestMapping("/pangu/fosterwxStation")
 public class FosterwxStationController extends BaseController<FosterwxStation> {
 
@@ -129,6 +132,18 @@ public class FosterwxStationController extends BaseController<FosterwxStation> {
             return AjaxResult.error("新增失败", res);
         }
     }
+    @ApiOperation(value = "批量设置盘古部门")
+    @PostMapping("/setPanguDept")
+    public Object setPanguDept(@Valid @RequestBody SetIdsHandle handle, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
+        }
+        FosterwxStation save = new FosterwxStation();
+        save.setPanDeptId(handle.getId());
+        save.setUpdateAt(LocalDateTime.now());
+        service.update(save, new QueryWrapper<FosterwxStation>().in("id", handle.getIds()));
+        return AjaxResult.success(Constants.SUCCESS, true);
+    }
 
     /**
      * 站点负责人后台登录

+ 5 - 0
src/main/java/com/mokamrp/privates/entity/PostBasePageHandle.java

@@ -2,6 +2,8 @@ package com.mokamrp.privates.entity;
 
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class PostBasePageHandle {
     private Integer page;
@@ -19,9 +21,12 @@ public class PostBasePageHandle {
     private Integer templateId;
     private Integer catalogId;
     private String ghId;
+    private List<String> ghIds;
     private Integer uploadUid;
     private Integer wxType;
     private Integer status;
+    private Integer materialId;
+    private Integer tagId;
     public Integer getPage() {
         return page;
     }

+ 21 - 0
src/main/java/com/mokamrp/privates/mapper/WorkComplainH5RecordMapper.java

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

+ 22 - 0
src/main/java/com/mokamrp/privates/mapper/WorkComplainH5RecordMapper.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mokamrp.privates.mapper.WorkComplainH5RecordMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.mokamrp.privates.mapper.pojo.WorkComplainH5Record">
+        <id column="id" property="id" />
+        <result column="complain_type" property="complainType" />
+        <result column="image" property="image" />
+        <result column="content" property="content" />
+        <result column="create_at" property="createAt" />
+        <result column="update_at" property="updateAt" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, complain_type, image, content, create_at, update_at
+    </sql>
+    <select id="getList" resultType="com.mokamrp.privates.mapper.pojo.WorkComplainH5Record">
+        SELECT * FROM private_work_complain_h5_record
+    </select>
+</mapper>

+ 21 - 0
src/main/java/com/mokamrp/privates/mapper/WorkComplainH5TypeMapper.java

@@ -0,0 +1,21 @@
+package com.mokamrp.privates.mapper;
+
+import com.mokamrp.privates.mapper.pojo.WorkComplainH5Type;
+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>
+ * 企微投诉H5类型 Mapper 接口
+ * </p>
+ *
+ * @author leon
+ * @since 2021-11-25
+ */
+@Component
+public interface WorkComplainH5TypeMapper extends BaseMapper<WorkComplainH5Type> {
+    public List<WorkComplainH5Type> getList(Page<WorkComplainH5Type> pageObj);
+}

+ 21 - 0
src/main/java/com/mokamrp/privates/mapper/WorkComplainH5TypeMapper.xml

@@ -0,0 +1,21 @@
+<?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.WorkComplainH5TypeMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.mokamrp.privates.mapper.pojo.WorkComplainH5Type">
+        <id column="id" property="id" />
+        <result column="seq" property="seq" />
+        <result column="name" property="name" />
+        <result column="create_at" property="createAt" />
+        <result column="update_at" property="updateAt" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, seq, name, create_at, update_at
+    </sql>
+    <select id="getList" resultType="com.mokamrp.privates.mapper.pojo.WorkComplainH5Type">
+        SELECT * FROM private_work_complain_h5_type
+    </select>
+</mapper>

+ 21 - 0
src/main/java/com/mokamrp/privates/mapper/pangu/DeptMapper.java

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

+ 21 - 0
src/main/java/com/mokamrp/privates/mapper/pangu/DeptMapper.xml

@@ -0,0 +1,21 @@
+<?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.DeptMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.mokamrp.privates.mapper.pangu.pojo.Dept">
+        <id column="id" property="id" />
+        <result column="parent_dept_id" property="parentDeptId" />
+        <result column="leader_uid" property="leaderUid" />
+        <result column="create_at" property="createAt" />
+        <result column="update_at" property="updateAt" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, parent_dept_id, leader_uid, create_at, update_at
+    </sql>
+    <select id="getList" resultType="com.mokamrp.privates.mapper.pangu.pojo.Dept">
+        SELECT * FROM pan_dept
+    </select>
+</mapper>

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

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

+ 12 - 0
src/main/java/com/mokamrp/privates/mapper/pangu/FosterwxCashWorkBoxClientInfoMapper.xml

@@ -25,5 +25,17 @@
     </sql>
     <select id="getList" resultType="com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashWorkBoxClientInfo">
         SELECT * FROM pan_fosterwx_cash_work_box_client_info
+        <where>
+            <if test="params.name">and name = #{params.name}</if>
+            <if test="params.type">and box_type = #{params.type}</if>
+            <if test="params.materialId">and material_id = #{params.materialId}</if>
+            <if test="params.tagId">and tag_id = #{params.tagId}</if>
+            <if test="params.title">and title like concat('%',#{params.title},'%')</if>
+            <if test="params.ghIds != null and params.ghIds.size() > 0 ">and ghid in
+            <foreach collection="params.ghIds" item="item" open="(" separator="," close=")">
+                #{item}@app
+            </foreach>
+        </if>
+        </where>
     </select>
 </mapper>

+ 116 - 0
src/main/java/com/mokamrp/privates/mapper/pangu/pojo/Dept.java

@@ -0,0 +1,116 @@
+package com.mokamrp.privates.mapper.pangu.pojo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ * 盘古部门表
+ * </p>
+ *
+ * @author leon
+ * @since 2021-11-25
+ */
+@TableName("pan_dept")
+@Data
+public class Dept extends Model<Dept> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+      @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 父级部门ID
+     */
+    private Integer parentDeptId;
+
+    private String deptName;
+
+    /**
+     * 部门负责人
+     */
+    private Integer leaderUid;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createAt;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateAt;
+
+    @TableField(exist = false)
+    private List<Dept> children = new ArrayList<>();
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getParentDeptId() {
+        return parentDeptId;
+    }
+
+    public void setParentDeptId(Integer parentDeptId) {
+        this.parentDeptId = parentDeptId;
+    }
+
+    public Integer getLeaderUid() {
+        return leaderUid;
+    }
+
+    public void setLeaderUid(Integer leaderUid) {
+        this.leaderUid = leaderUid;
+    }
+
+    public LocalDateTime getCreateAt() {
+        return createAt;
+    }
+
+    public void setCreateAt(LocalDateTime createAt) {
+        this.createAt = createAt;
+    }
+
+    public LocalDateTime getUpdateAt() {
+        return updateAt;
+    }
+
+    public void setUpdateAt(LocalDateTime updateAt) {
+        this.updateAt = updateAt;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "Dept{" +
+        "id=" + id +
+        ", parentDeptId=" + parentDeptId +
+        ", leaderUid=" + leaderUid +
+        ", createAt=" + createAt +
+        ", updateAt=" + updateAt +
+        "}";
+    }
+}

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

@@ -5,6 +5,7 @@ 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 lombok.Data;
 
 import java.io.Serializable;
 
@@ -16,6 +17,7 @@ import java.io.Serializable;
  * @author leon
  * @since 2021-10-26
  */
+@Data
 @TableName("pan_fosterwx_cash_work_box_client_info")
 public class FosterwxCashWorkBoxClientInfo extends Model<FosterwxCashWorkBoxClientInfo> {
 
@@ -29,6 +31,12 @@ public class FosterwxCashWorkBoxClientInfo extends Model<FosterwxCashWorkBoxClie
      */
     private String ghid;
 
+    private Integer boxType;
+
+    private Integer materialId;
+
+    private Integer tagId;
+
     /**
      * appid
      */

+ 2 - 0
src/main/java/com/mokamrp/privates/mapper/pangu/pojo/FosterwxStation.java

@@ -29,6 +29,8 @@ public class FosterwxStation extends Model<FosterwxStation> {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
+    private Integer panDeptId;
+
     /**
      * 个微任务模板id(pan_fosterwx_task_template.id)
      */

+ 119 - 0
src/main/java/com/mokamrp/privates/mapper/pojo/WorkComplainH5Record.java

@@ -0,0 +1,119 @@
+package com.mokamrp.privates.mapper.pojo;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author leon
+ * @since 2021-11-25
+ */
+@TableName("private_work_complain_h5_record")
+public class WorkComplainH5Record extends Model<WorkComplainH5Record> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+      @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 投诉类型
+     */
+    private Integer complainType;
+
+    /**
+     * 投诉图片
+     */
+    private String image;
+
+    /**
+     * 投诉内容
+     */
+    private String content;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createAt;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateAt;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getComplainType() {
+        return complainType;
+    }
+
+    public void setComplainType(Integer complainType) {
+        this.complainType = complainType;
+    }
+
+    public String getImage() {
+        return image;
+    }
+
+    public void setImage(String image) {
+        this.image = image;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public LocalDateTime getCreateAt() {
+        return createAt;
+    }
+
+    public void setCreateAt(LocalDateTime createAt) {
+        this.createAt = createAt;
+    }
+
+    public LocalDateTime getUpdateAt() {
+        return updateAt;
+    }
+
+    public void setUpdateAt(LocalDateTime updateAt) {
+        this.updateAt = updateAt;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "WorkComplainH5Record{" +
+        "id=" + id +
+        ", complainType=" + complainType +
+        ", image=" + image +
+        ", content=" + content +
+        ", createAt=" + createAt +
+        ", updateAt=" + updateAt +
+        "}";
+    }
+}

+ 105 - 0
src/main/java/com/mokamrp/privates/mapper/pojo/WorkComplainH5Type.java

@@ -0,0 +1,105 @@
+package com.mokamrp.privates.mapper.pojo;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 企微投诉H5类型
+ * </p>
+ *
+ * @author leon
+ * @since 2021-11-25
+ */
+@TableName("private_work_complain_h5_type")
+public class WorkComplainH5Type extends Model<WorkComplainH5Type> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+      @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 顺序
+     */
+    private Integer seq;
+
+    /**
+     * 投诉名称
+     */
+    private String name;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createAt;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateAt;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getSeq() {
+        return seq;
+    }
+
+    public void setSeq(Integer seq) {
+        this.seq = seq;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public LocalDateTime getCreateAt() {
+        return createAt;
+    }
+
+    public void setCreateAt(LocalDateTime createAt) {
+        this.createAt = createAt;
+    }
+
+    public LocalDateTime getUpdateAt() {
+        return updateAt;
+    }
+
+    public void setUpdateAt(LocalDateTime updateAt) {
+        this.updateAt = updateAt;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "WorkComplainH5Type{" +
+        "id=" + id +
+        ", seq=" + seq +
+        ", name=" + name +
+        ", createAt=" + createAt +
+        ", updateAt=" + updateAt +
+        "}";
+    }
+}

+ 20 - 0
src/main/java/com/mokamrp/privates/service/WorkComplainH5RecordService.java

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

+ 20 - 0
src/main/java/com/mokamrp/privates/service/WorkComplainH5TypeService.java

@@ -0,0 +1,20 @@
+package com.mokamrp.privates.service;
+
+import com.mokamrp.privates.mapper.pojo.WorkComplainH5Type;
+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>
+ * 企微投诉H5类型 服务类
+ * </p>
+ *
+ * @author leon
+ * @since 2021-11-25
+ */
+public interface WorkComplainH5TypeService extends IService<WorkComplainH5Type> {
+    //.@leon 获取数据列表
+    public ResHandle<List<WorkComplainH5Type>> getList(PostBasePageHandle handle);
+}

+ 43 - 0
src/main/java/com/mokamrp/privates/service/impl/WorkComplainH5RecordServiceImpl.java

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

+ 43 - 0
src/main/java/com/mokamrp/privates/service/impl/WorkComplainH5TypeServiceImpl.java

@@ -0,0 +1,43 @@
+package com.mokamrp.privates.service.impl;
+
+import com.mokamrp.privates.mapper.pojo.WorkComplainH5Type;
+import com.mokamrp.privates.mapper.WorkComplainH5TypeMapper;
+import com.mokamrp.privates.service.WorkComplainH5TypeService;
+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>
+ * 企微投诉H5类型 服务实现类
+ * </p>
+ *
+ * @author leon
+ * @since 2021-11-25
+ */
+@Service
+public class WorkComplainH5TypeServiceImpl extends ServiceImpl<WorkComplainH5TypeMapper, WorkComplainH5Type> implements WorkComplainH5TypeService {
+
+    @Autowired
+    public WorkComplainH5TypeMapper workComplainH5TypeMapper;
+    /**
+     * 获取数据列表 支持分页
+     * @param handle
+     * @return
+     */
+    public ResHandle<List<WorkComplainH5Type>> getList(PostBasePageHandle handle) {
+        Integer pagesize = handle.getPagesize();
+        Integer page = handle.getPage();
+        Page<WorkComplainH5Type> pageObj = new Page<WorkComplainH5Type>(page, pagesize);
+        List<WorkComplainH5Type> list = workComplainH5TypeMapper.getList(pageObj);
+        ResHandle<List<WorkComplainH5Type>> res = new ResHandle<>();
+        res.setList(list);
+        res.setTotal(pageObj.getTotal());
+        return res;
+    }
+}

+ 20 - 0
src/main/java/com/mokamrp/privates/service/pangu/DeptService.java

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

+ 43 - 0
src/main/java/com/mokamrp/privates/service/pangu/impl/DeptServiceImpl.java

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

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

@@ -34,7 +34,7 @@ public class FosterwxCashWorkBoxClientInfoServiceImpl extends ServiceImpl<Foster
         Integer pagesize = handle.getPagesize();
         Integer page = handle.getPage();
         Page<FosterwxCashWorkBoxClientInfo> pageObj = new Page<FosterwxCashWorkBoxClientInfo>(page, pagesize);
-        List<FosterwxCashWorkBoxClientInfo> list = fosterwxCashWorkBoxClientInfoMapper.getList(pageObj);
+        List<FosterwxCashWorkBoxClientInfo> list = fosterwxCashWorkBoxClientInfoMapper.getList(pageObj,handle);
         ResHandle<List<FosterwxCashWorkBoxClientInfo>> res = new ResHandle<>();
         res.setList(list);
         res.setTotal(pageObj.getTotal());

+ 60 - 0
src/main/java/com/mokamrp/privates/task/pangu/UpdateFosterwxCashWorkBoxClientInfo.java

@@ -0,0 +1,60 @@
+package com.mokamrp.privates.task.pangu;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashWorkBoxClientInfo;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxWxfriend;
+import com.mokamrp.privates.service.CoralApiService;
+import com.mokamrp.privates.service.pangu.FosterwxCashWorkBoxClientInfoService;
+import net.javacrumbs.shedlock.core.SchedulerLock;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Component
+public class UpdateFosterwxCashWorkBoxClientInfo {
+
+    @Autowired
+    public FosterwxCashWorkBoxClientInfoService fosterwxCashWorkBoxClientInfoService;
+
+    @Autowired
+    public CoralApiService coralApiService;
+
+    @Scheduled(cron = "0 */1 * * * ?")
+    @SchedulerLock(name = "pangu:UpdateFosterwxCashWorkBoxClientInfo", lockAtLeastForString = "PT5S", lockAtMostForString = "PT15M")
+    public void execute() {
+        System.out.println("[cronjob]:更新企微客户端上报小程序消息");
+        List<FosterwxCashWorkBoxClientInfo> list = fosterwxCashWorkBoxClientInfoService.list(new QueryWrapper<FosterwxCashWorkBoxClientInfo>().isNull("box_type"));
+        for (FosterwxCashWorkBoxClientInfo box : list){
+            String ghId = box.getGhid().replace("@app","");
+            Object coralBox = coralApiService.getBoxInfo(ghId);
+            if(coralBox == null){
+                continue;
+            }
+            JSONObject json = JSONObject.parseObject(coralBox.toString());
+            Integer boxType = Integer.parseInt(json.get("boxType").toString());
+            String[] params = box.getEnterpoint().split("&");
+            Integer materialId = null;
+            Integer tagId = null;
+            for (String param : params){
+                String[] kv = param.split("=");
+                if (kv.length <= 1){
+                    continue;
+                }
+                if (kv[0].equals("materialId") || kv[0].equals("videoId")){
+                    materialId = Integer.parseInt(kv[1]);
+                }
+                if (kv[0].equals("categoryId")){
+                    tagId = Integer.parseInt(kv[1]);
+                }
+            }
+            FosterwxCashWorkBoxClientInfo save = new FosterwxCashWorkBoxClientInfo();
+            save.setBoxType(boxType);
+            save.setMaterialId(materialId);
+            save.setTagId(tagId);
+        }
+    }
+}

+ 1 - 1
src/test/java/com/mokamrp/AutoMP.java

@@ -47,7 +47,7 @@ public class AutoMP {
 				.setColumnNaming(NamingStrategy.underline_to_camel)
 				.setNaming(NamingStrategy.underline_to_camel) // 数据库表映射到实体的命名策略,下划线转驼峰命名
 				.setTablePrefix("private_") //表名前缀
-				.setInclude("private_oas_box");  // 生成的表
+				.setInclude("private_work_complain_h5_type");  // 生成的表
 		
 		//4. 包名策略配置 
 		PackageConfig pkConfig = new PackageConfig();

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