Merge branch 'dev-lqc'

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

@@ -76,11 +76,17 @@ public class FosterwxCashOasBoxController extends BaseController<FosterwxCashOas
             return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
         }
         this.onUpdate(editHandle);
+        FosterwxCashOasBox info = fosterwxCashOasBoxService.getById(editHandle.getIds());
+        if (info == null){
+            return AjaxResult.error("信息不存在");
+        }
         if (editHandle.getRaw().getMobileGroupIds() != null || editHandle.getRaw().getMobileGroupIds().size() > 0) {
-            fosterwxCashOasBoxMobileGroupService.remove(new QueryWrapper<FosterwxCashOasBoxMobileGroup>().eq("oas_box_id", editHandle.getIds()));
+            fosterwxCashOasBoxMobileGroupService.remove(new QueryWrapper<FosterwxCashOasBoxMobileGroup>()
+                    .eq("oas_box_id", editHandle.getIds()));
             for (Integer groupId : editHandle.getRaw().getMobileGroupIds()) {
                 FosterwxCashOasBoxMobileGroup add = new FosterwxCashOasBoxMobileGroup();
                 add.setOasBoxId(Integer.parseInt(editHandle.getIds()));
+                add.setWxType(info.getType());
                 add.setCashMobileGroupId(groupId);
                 add.setUpdateAt(LocalDateTime.now());
                 add.setCreateAt(LocalDateTime.now());
@@ -117,6 +123,7 @@ public class FosterwxCashOasBoxController extends BaseController<FosterwxCashOas
             for (Integer id : handle.getIds()) {
                 Integer has = fosterwxCashOasBoxMobileGroupService.count(new QueryWrapper<FosterwxCashOasBoxMobileGroup>()
                         .eq("oas_box_id", localId)
+                        .eq("wx_type",handle.getWxType())
                         .eq("cash_mobile_group_id", id));
                 if (has > 0) {
                     continue;
@@ -124,6 +131,7 @@ public class FosterwxCashOasBoxController extends BaseController<FosterwxCashOas
                 FosterwxCashOasBoxMobileGroup add = new FosterwxCashOasBoxMobileGroup();
                 add.setCashMobileGroupId(id);
                 add.setOasBoxId(localId);
+                add.setWxType(handle.getWxType());
                 add.setCreateAt(LocalDateTime.now());
                 add.setUpdateAt(LocalDateTime.now());
                 fosterwxCashOasBoxMobileGroupService.save(add);
@@ -183,12 +191,42 @@ public class FosterwxCashOasBoxController extends BaseController<FosterwxCashOas
         }
         row = voltaRes.getData();
         try {
-            VoltaHandle<Boolean> res = fosterwxCashOasBoxService.importData(row, authUser);
+            VoltaHandle<Boolean> res = fosterwxCashOasBoxService.importData(row, authUser,1);
+        } catch (Exception e) {
+            return AjaxResult.error(e.getMessage());
+        }
+        return AjaxResult.success(HttpMsg.importSuccess);
+    }
+
+    @PostMapping("/importWorkwx")
+    public Object uploadFileWorkwx(@RequestBody MultipartFile file, @AuthUser User authUser) {
+        Map<String, Object> map = new HashMap<>(16);
+        Map<Integer, String> feild = new HashMap<>();
+        feild.put(0, "stationName");
+        feild.put(1, "groupId");
+        feild.put(2, "mobileGroupId");
+        feild.put(3, "type");
+        feild.put(4, "boxType|default");
+        feild.put(5, "boxLocation|default");
+        feild.put(6, "ghId");
+        feild.put(7, "name");
+        feild.put(8, "scope");
+        feild.put(9, "remark|default");
+        List<Map<String, String>> row = new ArrayList<>();
+        VoltaHandle<ArrayList<Map<String, String>>> voltaRes = Analysis.analysis(file, feild);
+        if (voltaRes.getErr() != null) {
+            return AjaxResult.error(voltaRes.getErr());
+        }
+        row = voltaRes.getData();
+        try {
+            VoltaHandle<Boolean> res = fosterwxCashOasBoxService.importData(row, authUser,2);
         } catch (Exception e) {
             return AjaxResult.error(e.getMessage());
         }
         return AjaxResult.success(HttpMsg.importSuccess);
     }
 
+
+
 }
 

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

@@ -1,5 +1,6 @@
 package com.mokamrp.privates.controller.pangu;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.mokamrp.privates.constant.Constants;
 import com.mokamrp.privates.constant.HttpStatus;
@@ -9,13 +10,10 @@ import com.mokamrp.privates.entity.PostBasePageHandle;
 import com.mokamrp.privates.help.AjaxResult;
 import com.mokamrp.privates.entity.ResHandle;
 import com.mokamrp.privates.interceptor.AuthUser;
-import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashTaskList;
-import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashWorkwxTaskCatalog;
-import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashWorkwxTaskList;
+import com.mokamrp.privates.mapper.pangu.pojo.*;
 import com.mokamrp.privates.mapper.pojo.User;
-import com.mokamrp.privates.service.pangu.FosterwxCashTaskListService;
-import com.mokamrp.privates.service.pangu.FosterwxCashWorkwxTaskCatalogService;
-import com.mokamrp.privates.service.pangu.FosterwxCashWorkwxTaskListService;
+import com.mokamrp.privates.service.CoralApiService;
+import com.mokamrp.privates.service.pangu.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,8 +21,6 @@ import org.springframework.cglib.core.Local;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestMapping;
-import com.mokamrp.privates.service.pangu.FosterwxCashTaskTemplateService;
-import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashTaskTemplate;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -64,6 +60,12 @@ public class FosterwxCashTaskTemplateController extends BaseController<FosterwxC
     @Autowired
     public FosterwxCashWorkwxTaskCatalogService fosterwxCashWorkwxTaskCatalogService;
 
+    @Autowired
+    public FosterwxCashOasBoxService fosterwxCashOasBoxService;
+
+    @Autowired
+    public CoralApiService coralApiService;
+
     /*
      * @fast
      * 默认生成的控制器所继承的父类中有index/add/edit/del四个基础方法,均为post json请求
@@ -158,6 +160,18 @@ public class FosterwxCashTaskTemplateController extends BaseController<FosterwxC
             fosterwxCashWorkwxTaskCatalogService.save(fosterwxCashWorkwxTaskCatalog);
             for (FosterwxCashWorkwxTaskList fosterwxCashWorkwxTaskList : fosterwxCashWorkwxTaskCatalog.getTaskList()){
                 //.保存任务目录内任务列表
+                //.对接珊瑚云取小程序appid
+                Integer taskType = fosterwxCashWorkwxTaskList.getTaskType();
+                if (taskType == 1 || taskType == 3){
+                    FosterwxCashOasBox boxOasInfo = fosterwxCashOasBoxService.getById(fosterwxCashWorkwxTaskList.getBoxId());
+                    Object info = coralApiService.getBoxInfo(boxOasInfo.getGhId());
+                    JSONObject json = JSONObject.parseObject(info.toString());
+                    fosterwxCashWorkwxTaskList.setBoxType(boxOasInfo.getBoxType());
+                    fosterwxCashWorkwxTaskList.setBoxName(boxOasInfo.getName());
+                    fosterwxCashWorkwxTaskList.setBoxGhId(boxOasInfo.getGhId());
+                    fosterwxCashWorkwxTaskList.setBoxAppid(json.get("appid").toString());
+                }
+                //.----end----------
                 fosterwxCashWorkwxTaskList.setTemplateId(add.getId());
                 fosterwxCashWorkwxTaskList.setCatalogId(fosterwxCashWorkwxTaskCatalog.getId());
                 fosterwxCashWorkwxTaskList.setCreateAt(LocalDateTime.now());

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

@@ -44,7 +44,7 @@ public class FosterwxCashWorkClientController {
     private FosterwxMobileService fosterwxMobileService;
 
     @Autowired
-    private FosterwxCashMobileService fosterwxCashMobileService;
+    private FosterwxCashWorkwxMobileService fosterwxCashWorkwxMobileService;
 
     @Autowired
     private FosterwxCashWorkBoxClientInfoService fosterwxCashWorkBoxClientInfoService;
@@ -52,6 +52,9 @@ public class FosterwxCashWorkClientController {
     @Autowired
     private FosterwxCashWorkwxTaskListService fosterwxCashWorkwxTaskListService;
 
+    @Autowired
+    private FosterwxCashOasBoxService fosterwxCashOasBoxService;
+
 
     @PostMapping(value = "/getTaskInfo", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
     @ApiOperation(value = "返回凌晨到当前时间的未发送的数据,主体 昵称/团队id 昵称 两两一组必须有数据")
@@ -69,9 +72,9 @@ public class FosterwxCashWorkClientController {
         if (null == fosterwxMobile) return AjaxResult.error("根据参数无法获取所属账号");
 
         // 根据手机id 获取分组id
-        FosterwxCashMobile fosterwxCashMobile = fosterwxCashMobileService.getOne(new LambdaQueryWrapper<FosterwxCashMobile>().eq(FosterwxCashMobile::getMobileId, fosterwxMobile.getId()).last("LIMIT 1"));
+        FosterwxCashWorkwxMobile fosterwxCashWorkwxMobile = fosterwxCashWorkwxMobileService.getOne(new LambdaQueryWrapper<FosterwxCashWorkwxMobile>().eq(FosterwxCashWorkwxMobile::getMobileId, fosterwxMobile.getId()).last("LIMIT 1"));
 
-        if (null == fosterwxCashMobile) return AjaxResult.error("该账号未划入变现分组");
+        if (null == fosterwxCashWorkwxMobile) return AjaxResult.error("该账号未划入变现分组");
 
         LocalDate now = LocalDate.now();
         LocalDateTime firstDateTime = LocalDateTime.of(now, LocalTime.MIN);
@@ -81,7 +84,7 @@ public class FosterwxCashWorkClientController {
         // 企微任务
         fosterwxCashScheduleTaskListLambdaQueryWrapper.eq(FosterwxCashScheduleTaskList::getType, 2);
         // 分组id
-        fosterwxCashScheduleTaskListLambdaQueryWrapper.eq(FosterwxCashScheduleTaskList::getGroupId, fosterwxCashMobile.getGroupId());
+        fosterwxCashScheduleTaskListLambdaQueryWrapper.eq(FosterwxCashScheduleTaskList::getGroupId, fosterwxCashWorkwxMobile.getGroupId());
         // 已生成的任务 待发送的任务
         fosterwxCashScheduleTaskListLambdaQueryWrapper.in(FosterwxCashScheduleTaskList::getStatus, 2, 4);
 
@@ -106,7 +109,21 @@ public class FosterwxCashWorkClientController {
             FosterwxCashBoxClientInfo fosterwxCashBoxClientInfo = new FosterwxCashBoxClientInfo();
             fosterwxCashBoxClientInfo.setTaskType(fosterwxCashScheduleTaskList.getTaskType());
             if (3 == fosterwxCashScheduleTaskList.getTaskType()) {
-                FosterwxCashWorkBoxClientInfo fosterwxCashWorkBoxClientInfo = fosterwxCashWorkBoxClientInfoService.getOne(new LambdaQueryWrapper<FosterwxCashWorkBoxClientInfo>().like(FosterwxCashWorkBoxClientInfo::getWxid, fosterwxCashScheduleTaskList.getBoxGhid()));
+                LambdaQueryWrapper<FosterwxCashWorkBoxClientInfo> fosterwxCashWorkBoxClientInfoLambdaQueryWrapper = new LambdaQueryWrapper<FosterwxCashWorkBoxClientInfo>();
+                fosterwxCashWorkBoxClientInfoLambdaQueryWrapper.like(FosterwxCashWorkBoxClientInfo::getWxid, fosterwxCashScheduleTaskList.getBoxGhid());
+                switch (fosterwxCashWorkwxTaskList.getBoxType()) {
+                    case 8:
+                        // 投放版小程序
+                        fosterwxCashWorkBoxClientInfoLambdaQueryWrapper.like(FosterwxCashWorkBoxClientInfo::getEnterpoint, "videoId=" + fosterwxCashWorkwxTaskList.getVideoId() + "&");
+                        break;
+                    case 26:
+                        fosterwxCashWorkBoxClientInfoLambdaQueryWrapper.like(FosterwxCashWorkBoxClientInfo::getEnterpoint, "materialId=" + fosterwxCashWorkwxTaskList.getVideoId() + "&");
+                        fosterwxCashWorkBoxClientInfoLambdaQueryWrapper.like(FosterwxCashWorkBoxClientInfo::getEnterpoint, "categoryId=" + fosterwxCashWorkwxTaskList.getTagId() + "&");
+                        break;
+                    default:
+                        break;
+                }
+                FosterwxCashWorkBoxClientInfo fosterwxCashWorkBoxClientInfo = fosterwxCashWorkBoxClientInfoService.getOne(fosterwxCashWorkBoxClientInfoLambdaQueryWrapper);
 
                 if (null != fosterwxCashWorkBoxClientInfo) {
                     FosterwxCashBoxClientInfo.BoxInfo boxInfo = fosterwxCashBoxClientInfo.new BoxInfo();
@@ -114,7 +131,7 @@ public class FosterwxCashWorkClientController {
                     boxInfo.setWxid(fosterwxCashWorkBoxClientInfo.getWxid());
                     boxInfo.setName(fosterwxCashWorkBoxClientInfo.getName());
                     boxInfo.setTitle(fosterwxCashWorkwxTaskList.getTitle());
-                    boxInfo.setEnterpoint(fosterwxCashScheduleTaskList.getBoxUrl());
+                    boxInfo.setEnterpoint(fosterwxCashWorkBoxClientInfo.getEnterpoint());
                     boxInfo.setHeadimg(fosterwxCashWorkBoxClientInfo.getHeadimg());
                     boxInfo.setImage_key1(fosterwxCashWorkBoxClientInfo.getImageKey1());
                     boxInfo.setImage_key2(fosterwxCashWorkBoxClientInfo.getImageKey2());
@@ -123,8 +140,9 @@ public class FosterwxCashWorkClientController {
                     boxInfo.setApp_type(fosterwxCashWorkBoxClientInfo.getAppType());
                     boxInfo.setDesc(fosterwxCashWorkBoxClientInfo.getDesc());
                     fosterwxCashBoxClientInfo.setBoxInfo(boxInfo);
+                } else {
+                    log.info("小程序{}无法根据{}{}获取缓存", fosterwxCashScheduleTaskList.getBoxGhid(), fosterwxCashWorkwxTaskList.getVideoId(), fosterwxCashWorkwxTaskList.getTagId());
                 }
-
             } else {
                 FosterwxCashBoxClientInfo.UrlInfo urlInfo = fosterwxCashBoxClientInfo.new UrlInfo();
                 urlInfo.setTitle(fosterwxCashWorkwxTaskList.getUrlTitle());
@@ -217,11 +235,7 @@ public class FosterwxCashWorkClientController {
     @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()));
-        }
+        fosterwxCashWorkBoxClientInfoService.save(fosterwxCashWorkBoxClientInfo);
 
         return "新增修改成功!";
     }

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

@@ -0,0 +1,88 @@
+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.PostBasePageHandle;
+import com.mokamrp.privates.entity.SetGroupHandle;
+import com.mokamrp.privates.entity.SetIdsHandle;
+import com.mokamrp.privates.help.AjaxResult;
+import com.mokamrp.privates.entity.ResHandle;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashMobile;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.mokamrp.privates.service.pangu.FosterwxCashWorkwxMobileService;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashWorkwxMobile;
+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.time.LocalDateTime;
+import java.util.Map;
+import java.util.List;
+
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * <p>
+ * 盘古个微养号变现企微账号库 前端控制器
+ * </p>
+ *
+ * @author leon
+ * @since 2021-11-04
+ */
+@RestController
+@RequestMapping("/pangu/fosterwxCashWorkwxMobile")
+public class FosterwxCashWorkwxMobileController extends BaseController<FosterwxCashWorkwxMobile> {
+
+    @Autowired
+    public FosterwxCashWorkwxMobileService fosterwxCashWorkwxMobileService;
+
+    /*
+     * @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<FosterwxCashWorkwxMobile>> res = fosterwxCashWorkwxMobileService.getList(postBasePageHandle);
+        return AjaxResult.success(res);
+    }
+
+    @PostMapping("/setDomain")
+    public Object setDoamin(@Valid @RequestBody SetIdsHandle setIdsHandle, BindingResult bindingResult){
+        if (bindingResult.hasErrors()) {
+            return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
+        }
+        FosterwxCashWorkwxMobile save = new FosterwxCashWorkwxMobile();
+        save.setDomainId(setIdsHandle.getId());
+        save.setUpdateAt(LocalDateTime.now());
+        fosterwxCashWorkwxMobileService.update(save,new QueryWrapper<FosterwxCashWorkwxMobile>().in("id",setIdsHandle.getIds()));
+        return AjaxResult.success();
+    }
+
+    @ApiOperation(value = "批量设置分组")
+    @PostMapping("/setGroup")
+    public Object setGroup(@Valid @RequestBody SetGroupHandle handle, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
+        }
+        FosterwxCashWorkwxMobile save = new FosterwxCashWorkwxMobile();
+        save.setGroupId(handle.getGroupId());
+        save.setUpdateAt(LocalDateTime.now());
+        service.update(save, new QueryWrapper<FosterwxCashWorkwxMobile>().in("id", handle.getIds()));
+//        this.sync();
+        return AjaxResult.success(Constants.SUCCESS, true);
+    }
+
+
+}
+

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

@@ -0,0 +1,55 @@
+package com.mokamrp.privates.controller.pangu;
+
+import com.mokamrp.privates.constant.HttpStatus;
+import com.mokamrp.privates.entity.PostBasePageHandle;
+import com.mokamrp.privates.help.AjaxResult;
+import com.mokamrp.privates.entity.ResHandle;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.mokamrp.privates.service.pangu.FosterwxCashWorkwxMobileGroupService;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashWorkwxMobileGroup;
+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-04
+ */
+@RestController
+@RequestMapping("/pangu/fosterwxCashWorkwxMobileGroup")
+public class FosterwxCashWorkwxMobileGroupController extends BaseController<FosterwxCashWorkwxMobileGroup> {
+
+    @Autowired
+    public FosterwxCashWorkwxMobileGroupService fosterwxCashWorkwxMobileGroupService;
+
+    /*
+     * @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<FosterwxCashWorkwxMobileGroup>> res = fosterwxCashWorkwxMobileGroupService.getList(postBasePageHandle);
+        return AjaxResult.success(res);
+    }
+
+
+}
+

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

@@ -1,14 +1,19 @@
 package com.mokamrp.privates.controller.pangu;
 
+import com.alibaba.fastjson.JSONObject;
 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.EditHandle;
 import com.mokamrp.privates.entity.PostBasePageHandle;
 import com.mokamrp.privates.entity.pangu.GetByIdHandle;
 import com.mokamrp.privates.help.AjaxResult;
 import com.mokamrp.privates.entity.ResHandle;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashOasBox;
 import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashTaskList;
+import com.mokamrp.privates.service.CoralApiService;
+import com.mokamrp.privates.service.pangu.FosterwxCashOasBoxService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,6 +49,11 @@ public class FosterwxCashWorkwxTaskListController extends BaseController<Fosterw
     @Autowired
     public FosterwxCashWorkwxTaskListService fosterwxCashWorkwxTaskListService;
 
+    @Autowired
+    public FosterwxCashOasBoxService fosterwxCashOasBoxService;
+
+    @Autowired
+    public CoralApiService coralApiService;
     /*
      * @fast
      * 默认生成的控制器所继承的父类中有index/add/edit/del四个基础方法,均为post json请求
@@ -69,7 +79,25 @@ public class FosterwxCashWorkwxTaskListController extends BaseController<Fosterw
                 .eq("catalog_id",getByIdHandle.getId()));
         return AjaxResult.success(res);
     }
-
+    @PostMapping("/edit")
+    public Object edit(@Valid @RequestBody EditHandle<FosterwxCashWorkwxTaskList> editHandle, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
+        }
+        this.onUpdate(editHandle);
+        Integer taskType = editHandle.getRaw().getTaskType();
+        if (taskType == 1 || taskType == 3) {
+            FosterwxCashOasBox boxOasInfo = fosterwxCashOasBoxService.getById(editHandle.getRaw().getBoxId());
+            Object info = coralApiService.getBoxInfo(boxOasInfo.getGhId());
+            JSONObject json = JSONObject.parseObject(info.toString());
+            editHandle.getRaw().setBoxType(boxOasInfo.getBoxType());
+            editHandle.getRaw().setBoxName(boxOasInfo.getName());
+            editHandle.getRaw().setBoxGhId(boxOasInfo.getGhId());
+            editHandle.getRaw().setBoxAppid(json.get("appid").toString());
+        }
+        service.update(editHandle.getRaw(), new QueryWrapper<FosterwxCashWorkwxTaskList>().in("id", editHandle.getIds()));
+        return AjaxResult.success(Constants.SUCCESS, true);
+    }
     /**
      * 软删除
      * @param delHandle

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

@@ -83,27 +83,27 @@ public class FosterwxMobileController extends BaseController<FosterwxMobile> {
             return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
         }
         ResHandle<List<FosterwxMobileVo>> res = new ResHandle<List<FosterwxMobileVo>>();
-        if (getForsterwxMobileHandle.getWxFriendName() != null && !getForsterwxMobileHandle.getWxFriendName().isEmpty()) {
-            //.当查询条件包含微信好友名称时
-            List<FosterwxMobileWxfriend> hasWxfriendList = fosterwxMobileWxfriendService.list(new QueryWrapper<FosterwxMobileWxfriend>()
-                    .like("wx_name", "%" + getForsterwxMobileHandle.getWxFriendName() + "%"));
-            List<Integer> mobileIds = hasWxfriendList.stream().map(FosterwxMobileWxfriend::getId).collect(Collectors.toList());
-            if (hasWxfriendList == null || hasWxfriendList.size() <= 0) {
-                return AjaxResult.success(res);
-            }
-            if (getForsterwxMobileHandle.getId() == null) {
-                getForsterwxMobileHandle.setIds(mobileIds);
-            }
-            res = fosterwxMobileService.getList(getForsterwxMobileHandle);
-            List<FosterwxMobileVo> list = fosterwxMobileService.setWxFriend(res.getList());
-            res.setList(list);
-
-        } else {
+//        if (getForsterwxMobileHandle.getWxFriendName() != null && !getForsterwxMobileHandle.getWxFriendName().isEmpty()) {
+//            //.当查询条件包含微信好友名称时
+//            List<FosterwxMobileWxfriend> hasWxfriendList = fosterwxMobileWxfriendService.list(new QueryWrapper<FosterwxMobileWxfriend>()
+//                    .like("wx_name", "%" + getForsterwxMobileHandle.getWxFriendName() + "%"));
+//            List<Integer> mobileIds = hasWxfriendList.stream().map(FosterwxMobileWxfriend::getId).collect(Collectors.toList());
+//            if (hasWxfriendList == null || hasWxfriendList.size() <= 0) {
+//                return AjaxResult.success(res);
+//            }
+//            if (getForsterwxMobileHandle.getId() == null) {
+//                getForsterwxMobileHandle.setIds(mobileIds);
+//            }
+//            res = fosterwxMobileService.getList(getForsterwxMobileHandle);
+//            List<FosterwxMobileVo> list = fosterwxMobileService.setWxFriend(res.getList());
+//            res.setList(list);
+
+//        } else {
             //.正常查询
             res = fosterwxMobileService.getList(getForsterwxMobileHandle);
-            List<FosterwxMobileVo> list = fosterwxMobileService.setWxFriend(res.getList());
-            res.setList(list);
-        }
+//            List<FosterwxMobileVo> list = fosterwxMobileService.setWxFriend(res.getList());
+//            res.setList(list);
+//        }
         return AjaxResult.success(res);
     }
 
@@ -335,6 +335,21 @@ public class FosterwxMobileController extends BaseController<FosterwxMobile> {
         return AjaxResult.success();
     }
 
+    /**
+     * 批量加入变现账号
+     * @param handle
+     * @param bindingResult
+     * @return
+     */
+    @PostMapping("/addCashWorkwxMobileList")
+    public Object addCashWorkwxMobileList(@Valid @RequestBody SetIdsHandle handle, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
+        }
+        fosterwxMobileService.addCashWorkwxMobileList(handle);
+        return AjaxResult.success();
+    }
+
     /*
      *@Leon 以下接口为站点负责人后台页面接口，需要独立登陆才可访问
      */
@@ -498,12 +513,9 @@ public class FosterwxMobileController extends BaseController<FosterwxMobile> {
         feild.put(13, "wxIdentityCardNo|default");
         feild.put(14, "bankCardNo|default");
         feild.put(15, "bankCardMobileNo");
-        feild.put(16, "wxFriendName1");
-        feild.put(17, "wxFriendUserName1");
-        feild.put(18, "wxFriendName2");
-        feild.put(19, "wxFriendUserName2");
-        feild.put(20, "wxFriendName3");
-        feild.put(21, "wxFriendUserName3");
+        feild.put(16, "wxFriendId1|default");
+        feild.put(17, "wxFriendId2|default");
+        feild.put(18, "wxFriendId3|default");
         feild.put(22, "workWxCorp|default");
         feild.put(23, "workWxRegisterAt|default");
         List<Map<String, String>> row = new ArrayList<>();

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

@@ -0,0 +1,54 @@
+package com.mokamrp.privates.controller.pangu;
+
+import com.mokamrp.privates.constant.HttpStatus;
+import com.mokamrp.privates.entity.PostBasePageHandle;
+import com.mokamrp.privates.help.AjaxResult;
+import com.mokamrp.privates.entity.ResHandle;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.mokamrp.privates.service.pangu.FosterwxWxfriendService;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxWxfriend;
+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-03
+ */
+@RestController
+@RequestMapping("/fosterwxWxfriend")
+public class FosterwxWxfriendController extends BaseController<FosterwxWxfriend> {
+
+    @Autowired
+    public FosterwxWxfriendService fosterwxWxfriendService;
+
+    /*
+     * @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<FosterwxWxfriend>> res = fosterwxWxfriendService.getList(postBasePageHandle);
+        return AjaxResult.success(res);
+    }
+
+}
+

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

@@ -19,6 +19,7 @@ public class PostBasePageHandle {
     private Integer catalogId;
     private String ghId;
     private Integer uploadUid;
+    private Integer wxType;
     public Integer getPage() {
         return page;
     }

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

@@ -11,4 +11,6 @@ public class SetIdssHandle {
     private List<Integer> localIds;
 
     private List<Integer> ids;
+
+    private Integer wxType;
 }

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

@@ -12,4 +12,5 @@ public class GetFosterwxCashOasBoxMobileGroupHandle {
     private Integer id;
     private Integer oasBoxId;
     private Integer cashMobileGroupId;
+    private Integer wxType;
 }

src/main/java/com/mokamrp/privates/help/Analysis.java

@@ -3,10 +3,8 @@ package com.mokamrp.privates.help;
 import com.mokamrp.privates.entity.VoltaHandle;
 import com.mokamrp.privates.utils.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.xssf.usermodel.XSSFCell;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -60,9 +58,16 @@ public class Analysis {
             for (int i = 1; i < sheet.getPhysicalNumberOfRows(); i++) {
                 //循环获取工作表的每一行
                 Row sheetRow = sheet.getRow(i);
+                if (sheetRow == null){
+                    continue;
+                }
+                //.如果每行首列为空 直接视为本行没数据
+                if(Analysis.getCellValue(sheetRow.getCell(0)).isEmpty()){
+                    continue;
+                }
                 //循环获取每一列
                 Map<String,String> cell = new HashMap<>();
-                for (int j = 0; j < sheetRow.getPhysicalNumberOfCells(); j++) {
+                for (int j = 0; j < sheet.getRow(0).getPhysicalNumberOfCells(); j++) {
                     if (field.get(j) == null){
                         continue;
                     }
@@ -73,14 +78,11 @@ public class Analysis {
                     if (param.length > 1){
                         paramRule = param[1];
                     }
-                    if (sheetRow.getCell(j) == null){
-                        continue;
-                    }
-                    sheetRow.getCell(j).setCellType(CellType.STRING);
+                    String cellStr = Analysis.getCellValue(sheetRow.getCell(j));
                     //如果列数据为空，检查是否允许此列数据为空
-                    if (sheetRow.getCell(j).getStringCellValue() == null || sheetRow.getCell(j).getStringCellValue().isEmpty()) {
+                    if (cellStr.isEmpty()) {
                         if (paramRule == null){
-                            String collName = sheet.getRow(0).getCell(j).getStringCellValue();
+                            String collName = Analysis.getCellValue(sheet.getRow(0).getCell(j));
                             res.setErr("第"+i+"行,("+collName+")列数据不可为空，请检查表格");
                             return res;
                         }else if (paramRule.equals("default")) {
@@ -89,7 +91,7 @@ public class Analysis {
                             paramValue = paramRule;
                         }
                     }else{
-                        paramValue = sheetRow.getCell(j).getStringCellValue();
+                        paramValue = cellStr;
                     }
                     if(j>=field.size()){
                         break;
@@ -127,4 +129,36 @@ public class Analysis {
         }
 
     }
+
+    public static String getCellValue(Cell cell) {
+        String value = "";
+        if (cell != null) {
+            // 以下是判断数据的类型
+            switch (cell.getCellTypeEnum()) {
+                case NUMERIC: // 数字
+                    cell.setCellType(CellType.STRING);
+                    value = cell.getStringCellValue() + "";
+                    break;
+                case STRING: // 字符串
+                    value = cell.getStringCellValue();
+                    break;
+                case BOOLEAN: // Boolean
+                    value = cell.getBooleanCellValue() + "";
+                    break;
+                case FORMULA: // 公式
+                    value = cell.getCellFormula() + "";
+                    break;
+                case BLANK: // 空值
+                    value = "";
+                    break;
+                case ERROR: // 故障
+                    value = "非法字符";
+                    break;
+                default:
+                    value = "";
+                    break;
+            }
+        }
+        return value.trim();
+    }
 }

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

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

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

@@ -22,6 +22,9 @@
         LEFT JOIN (SELECT COUNT(id) AS cnt, group_id
         from pan_fosterwx_cash_oas_box
         GROUP BY group_id) AS B ON A.id = B.group_id
+        <where>
+            <if test="params.wxType != null">and A.wx_type = #{params.wxType}</if>
+        </where>
         order by A.id desc
     </select>
 </mapper>

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

@@ -30,6 +30,7 @@
             <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.wxType != null">and wx_type = #{params.wxType}</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>

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

@@ -20,6 +20,7 @@
         left join pan_fosterwx_cash_mobile_group as B on A.cash_mobile_group_id = B.id
         <where>
             <if test="params.oasBoxId">and A.oas_box_id = #{params.oasBoxId}</if>
+            <if test="params.wxType != null">and A.wx_type = #{params.wxType}</if>
         </where>
         order by A.id desc
     </select>

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

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

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

@@ -0,0 +1,26 @@
+<?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.FosterwxCashWorkwxMobileGroupMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashWorkwxMobileGroup">
+        <id column="id" property="id" />
+        <result column="dept_id" property="deptId" />
+        <result column="group_name" property="groupName" />
+        <result column="create_at" property="createAt" />
+        <result column="update_at" property="updateAt" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, dept_id, group_name, create_at, update_at
+    </sql>
+    <select id="getList" resultType="com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashWorkwxMobileGroup">
+        SELECT A.*, B.cnt, B.group_id
+        FROM pan_fosterwx_cash_workwx_mobile_group as A
+                 LEFT JOIN (SELECT COUNT(id) AS cnt, group_id
+                            from pan_fosterwx_cash_workwx_mobile
+                            GROUP BY group_id) AS B ON A.id = B.group_id
+        order by A.id desc
+    </select>
+</mapper>

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

@@ -0,0 +1,22 @@
+package com.mokamrp.privates.mapper.pangu;
+
+import com.mokamrp.privates.entity.PostBasePageHandle;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashWorkwxMobile;
+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-04
+ */
+@Component
+public interface FosterwxCashWorkwxMobileMapper extends BaseMapper<FosterwxCashWorkwxMobile> {
+    public List<FosterwxCashWorkwxMobile> getList(Page<FosterwxCashWorkwxMobile> pageObj, @Param("params") PostBasePageHandle handle);
+}

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

@@ -0,0 +1,43 @@
+<?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.FosterwxCashWorkwxMobileMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashWorkwxMobile">
+        <id column="id" property="id" />
+        <result column="group_id" property="groupId" />
+        <result column="station_id" property="stationId" />
+        <result column="mobile_id" property="mobileId" />
+        <result column="domain_id" property="domainId" />
+        <result column="create_at" property="createAt" />
+        <result column="update_at" property="updateAt" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, group_id, station_id, mobile_id, domain_id, create_at, update_at
+    </sql>
+    <select id="getList" resultType="com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashWorkwxMobile">
+        SELECT A.*,
+        B.mobile_code,
+        B.mobile_unio_code,
+        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_workwx_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>
+            <if test="params.mobileId != null">and A.mobile_id = #{params.mobileId}</if>
+        </where>
+        order by A.id desc
+    </select>
+</mapper>

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

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

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

@@ -0,0 +1,24 @@
+<?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.FosterwxWxfriendMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.mokamrp.privates.mapper.pangu.pojo.FosterwxWxfriend">
+        <id column="id" property="id" />
+        <result column="station_id" property="stationId" />
+        <result column="status" property="status" />
+        <result column="wx_name" property="wxName" />
+        <result column="wx_username" property="wxUsername" />
+        <result column="next_start_at" property="nextStartAt" />
+        <result column="create_at" property="createAt" />
+        <result column="update_at" property="updateAt" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, station_id, status, wx_name, wx_username, next_start_at, create_at, update_at
+    </sql>
+    <select id="getList" resultType="com.mokamrp.privates.mapper.pangu.pojo.FosterwxWxfriend">
+        SELECT * FROM pan_fosterwx_wxfriend
+    </select>
+</mapper>

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

@@ -47,6 +47,11 @@ public class FosterwxCashOasBox extends Model<FosterwxCashOasBox> {
     private Integer type;
 
     /**
+     * 微信类型(1.个微2.企微)
+     */
+    private Integer wxType;
+
+    /**
      * 小程序类型(对接珊瑚云类型)
      */
     private Integer boxType;

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

@@ -32,6 +32,11 @@ public class FosterwxCashOasBoxGroup extends Model<FosterwxCashOasBoxGroup> {
      */
     private String deptId;
 
+    /**
+     * 微信类型(1.个微2.企微)
+     */
+    private Integer wxType;
+
     private String groupName;
 
     @TableField(exist = false)

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

@@ -36,6 +36,11 @@ public class FosterwxCashOasBoxMobileGroup extends Model<FosterwxCashOasBoxMobil
     private Integer oasBoxId;
 
     /**
+     * 微信类型(1.个微2.企微)
+     */
+    private Integer wxType;
+
+    /**
      * 变现账号分组id
      */
     private Integer cashMobileGroupId;

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

@@ -0,0 +1,171 @@
+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;
+
+/**
+ * <p>
+ * 盘古个微养号变现企微账号库
+ * </p>
+ *
+ * @author leon
+ * @since 2021-11-04
+ */
+@Data
+@TableName("pan_fosterwx_cash_workwx_mobile")
+public class FosterwxCashWorkwxMobile extends Model<FosterwxCashWorkwxMobile> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+      @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 分组
+     */
+    private Integer groupId;
+
+    /**
+     * 站点id(pan_fosterwx_station.id)
+     */
+    private Integer stationId;
+
+    /**
+     * 账号id
+     */
+    private Integer mobileId;
+
+    /**
+     * 域名id
+     */
+    private Integer domainId;
+
+    @TableField(exist = false)
+    private String domain;
+
+    @TableField(exist = false)
+    private String stationName;
+
+    @TableField(exist = false)
+    private String mobileCode;
+
+    @TableField(exist = false)
+    private String mobileUnioCode;
+
+    /**
+     * 客服名称
+     */
+    @TableField(exist = false)
+    private String custserviceName;
+    /**
+     * 团队ID
+     */
+    @TableField(exist = false)
+    private String teamId;
+
+    @TableField(exist = false)
+    private String mobileNo;
+
+    @TableField(exist = false)
+    private String workWxCorpName;
+    /**
+     * 微信登录状态
+     */
+    @TableField(exist = false)
+    private Integer workWxLoginStatus;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createAt;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateAt;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getGroupId() {
+        return groupId;
+    }
+
+    public void setGroupId(Integer groupId) {
+        this.groupId = groupId;
+    }
+
+    public Integer getStationId() {
+        return stationId;
+    }
+
+    public void setStationId(Integer stationId) {
+        this.stationId = stationId;
+    }
+
+    public Integer getMobileId() {
+        return mobileId;
+    }
+
+    public void setMobileId(Integer mobileId) {
+        this.mobileId = mobileId;
+    }
+
+    public Integer getDomainId() {
+        return domainId;
+    }
+
+    public void setDomainId(Integer domainId) {
+        this.domainId = domainId;
+    }
+
+    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 "FosterwxCashWorkwxMobile{" +
+        "id=" + id +
+        ", groupId=" + groupId +
+        ", stationId=" + stationId +
+        ", mobileId=" + mobileId +
+        ", domainId=" + domainId +
+        ", createAt=" + createAt +
+        ", updateAt=" + updateAt +
+        "}";
+    }
+}

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

@@ -0,0 +1,101 @@
+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;
+
+/**
+ * <p>
+ * 盘古微信养号变现企微账号分组
+ * </p>
+ *
+ * @author leon
+ * @since 2021-11-04
+ */
+@Data
+@TableName("pan_fosterwx_cash_workwx_mobile_group")
+public class FosterwxCashWorkwxMobileGroup extends Model<FosterwxCashWorkwxMobileGroup> {
+
+    private static final long serialVersionUID = 1L;
+
+      @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 部门ID
+     */
+    private String deptId;
+
+    private String groupName;
+
+    @TableField(exist = false)
+    private Integer cnt;
+
+    private LocalDateTime createAt;
+
+    private LocalDateTime updateAt;
+
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(String deptId) {
+        this.deptId = deptId;
+    }
+
+    public String getGroupName() {
+        return groupName;
+    }
+
+    public void setGroupName(String groupName) {
+        this.groupName = groupName;
+    }
+
+    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 "FosterwxCashWorkwxMobileGroup{" +
+        "id=" + id +
+        ", deptId=" + deptId +
+        ", groupName=" + groupName +
+        ", createAt=" + createAt +
+        ", updateAt=" + updateAt +
+        "}";
+    }
+}

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

@@ -71,11 +71,21 @@ public class FosterwxCashWorkwxTaskList extends Model<FosterwxCashWorkwxTaskList
      */
     private Integer boxType;
 
+    private Integer boxId;
+
+    @TableField(exist = false)
+    private String ghId;
+
+    @TableField(exist = false)
+    private String BoxName;
+
     /**
      * 小程序appid
      */
     private String boxAppid;
 
+    private String boxGhId;
+
     /**
      * 小程序路径
      */

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

@@ -116,17 +116,17 @@ public class FosterwxMobileVo extends Model<FosterwxMobileVo> {
      */
     private String wxIdentityCardNo;
 
-    private String wxName1 = "";
-
-    private String wxUsername1 = "";
-
-    private String wxName2 = "";
-
-    private String wxUsername2 = "";
-
-    private String wxName3 = "";
-
-    private String wxUsername3 = "";
+//    private String wxName1 = "";
+//
+//    private String wxUsername1 = "";
+//
+//    private String wxName2 = "";
+//
+//    private String wxUsername2 = "";
+//
+//    private String wxName3 = "";
+//
+//    private String wxUsername3 = "";
 
     /**
      * 微信注册时间

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

@@ -4,6 +4,8 @@ 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;
 
@@ -15,6 +17,7 @@ import java.io.Serializable;
  * @author leon
  * @since 2021-07-23
  */
+@Data
 @TableName("pan_fosterwx_mobile_wxfriend")
 public class FosterwxMobileWxfriend extends Model<FosterwxMobileWxfriend> {
 
@@ -37,15 +40,9 @@ public class FosterwxMobileWxfriend extends Model<FosterwxMobileWxfriend> {
     private Integer seq;
 
     /**
-     * 微信姓名
+     * 好友ID
      */
-    private String wxName;
-
-    /**
-     * 微信账号
-     */
-    private String wxUsername;
-
+    private Integer friendId;
     /**
      * 创建时间
      */
@@ -81,22 +78,6 @@ public class FosterwxMobileWxfriend extends Model<FosterwxMobileWxfriend> {
         this.seq = seq;
     }
 
-    public String getWxName() {
-        return wxName;
-    }
-
-    public void setWxName(String wxName) {
-        this.wxName = wxName;
-    }
-
-    public String getWxUsername() {
-        return wxUsername;
-    }
-
-    public void setWxUsername(String wxUsername) {
-        this.wxUsername = wxUsername;
-    }
-
     public LocalDateTime getCreateAt() {
         return createAt;
     }
@@ -124,8 +105,6 @@ public class FosterwxMobileWxfriend extends Model<FosterwxMobileWxfriend> {
         "id=" + id +
         ", mobileId=" + mobileId +
         ", seq=" + seq +
-        ", wxName=" + wxName +
-        ", wxUsername=" + wxUsername +
         ", createAt=" + createAt +
         ", updateAt=" + updateAt +
         "}";

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

@@ -0,0 +1,141 @@
+package com.mokamrp.privates.mapper.pangu.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-03
+ */
+@TableName("pan_fosterwx_wxfriend")
+public class FosterwxWxfriend extends Model<FosterwxWxfriend> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+      @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 站点ID
+     */
+    private Integer stationId;
+
+    /**
+     * 状态(1.正常2.停用)
+     */
+    private Integer status;
+
+    /**
+     * 微信昵称
+     */
+    private String wxName;
+
+    /**
+     * 微信账户名
+     */
+    private String wxUsername;
+
+    /**
+     * 下次启用时间
+     */
+    private LocalDateTime nextStartAt;
+
+    private LocalDateTime createAt;
+
+    private LocalDateTime updateAt;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getStationId() {
+        return stationId;
+    }
+
+    public void setStationId(Integer stationId) {
+        this.stationId = stationId;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public String getWxName() {
+        return wxName;
+    }
+
+    public void setWxName(String wxName) {
+        this.wxName = wxName;
+    }
+
+    public String getWxUsername() {
+        return wxUsername;
+    }
+
+    public void setWxUsername(String wxUsername) {
+        this.wxUsername = wxUsername;
+    }
+
+    public LocalDateTime getNextStartAt() {
+        return nextStartAt;
+    }
+
+    public void setNextStartAt(LocalDateTime nextStartAt) {
+        this.nextStartAt = nextStartAt;
+    }
+
+    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 "FosterwxWxfriend{" +
+        "id=" + id +
+        ", stationId=" + stationId +
+        ", status=" + status +
+        ", wxName=" + wxName +
+        ", wxUsername=" + wxUsername +
+        ", nextStartAt=" + nextStartAt +
+        ", createAt=" + createAt +
+        ", updateAt=" + updateAt +
+        "}";
+    }
+}

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

@@ -42,7 +42,9 @@ public class CoralApiServiceImpl implements CoralApiService {
         String url = "/box/getBoxInfo";
         String params = "ghId=" + ghId;
         String res = HttpUtils.sendGet(newCoral + url, params);
-        System.out.println(res);
+        if (res == null || res.isEmpty()){
+            return null;
+        }
         JSONObject info = JSON.parseObject(res);
         if (info.get("code") == null || Integer.parseInt(info.get("code").toString()) != 0) {
             return null;

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

@@ -23,9 +23,9 @@ public interface FosterwxCashOasBoxService extends IService<FosterwxCashOasBox>
     //.@leon 增加发文数量记录
     public Boolean addSendTextCnt(Integer groupId,String ghId);
     //.@leon 获取一个正常状态的小程序
-    public FosterwxCashOasBox getRandBox(Integer groupId);
+    public FosterwxCashOasBox getRandBox(Integer groupId,Integer wxType);
     //.@leon 获取一个正常状态的公众号
-    public FosterwxCashOasBox getRandOas(Integer groupId);
+    public FosterwxCashOasBox getRandOas(Integer groupId,Integer wxType);
 
-    public VoltaHandle<Boolean> importData(List<Map<String, String>> row, User authUser) throws Exception;
+    public VoltaHandle<Boolean> importData(List<Map<String, String>> row, User authUser,Integer wxType) throws Exception;
 }

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

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

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

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

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

@@ -28,8 +28,10 @@ public interface FosterwxMobileService extends IService<FosterwxMobile> {
 
     public VoltaHandle<Boolean> importData(List<Map<String,String>> row, User authUser) throws Exception;
 
-    public List<FosterwxMobileVo> setWxFriend(List<FosterwxMobileVo> list);
+//    public List<FosterwxMobileVo> setWxFriend(List<FosterwxMobileVo> list);
     //.@leon 批量加入变现账号
     public Boolean addCashMobileList(SetIdsHandle setIdsHandle);
+    //.@leon 批量加入变现企微账号
+    public Boolean addCashWorkwxMobileList(SetIdsHandle setIdsHandle);
 
 }

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

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

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

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

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

@@ -46,6 +46,9 @@ public class FosterwxCashOasBoxServiceImpl extends ServiceImpl<FosterwxCashOasBo
     public FosterwxCashMobileGroupService fosterwxCashMobileGroupService;
 
     @Autowired
+    public FosterwxCashWorkwxMobileGroupService fosterwxCashWorkwxMobileGroupService;
+
+    @Autowired
     public FosterwxCashOasBoxMobileGroupService fosterwxCashOasBoxMobileGroupService;
 
     @Autowired
@@ -87,11 +90,12 @@ public class FosterwxCashOasBoxServiceImpl extends ServiceImpl<FosterwxCashOasBo
      *
      * @return
      */
-    public FosterwxCashOasBox getRandBox(Integer groupId) {
+    public FosterwxCashOasBox getRandBox(Integer groupId,Integer wxType) {
         List<FosterwxCashOasBoxMobileGroup> mobileGroupList = fosterwxCashOasBoxMobileGroupService.list(new QueryWrapper<FosterwxCashOasBoxMobileGroup>().eq("cash_mobile_group_id",groupId));
         List<Integer> boxOasIds = mobileGroupList.stream().map(FosterwxCashOasBoxMobileGroup::getOasBoxId).collect(Collectors.toList());
         List<FosterwxCashOasBox> list = this.list(new QueryWrapper<FosterwxCashOasBox>()
                 .eq("type", 1)
+                .eq("wx_type",wxType)
                 .in("id", boxOasIds)
                 .lt("send_text_cnt", 90)
                 .eq("fobidden_status", 1));
@@ -113,11 +117,12 @@ public class FosterwxCashOasBoxServiceImpl extends ServiceImpl<FosterwxCashOasBo
      *
      * @return
      */
-    public FosterwxCashOasBox getRandOas(Integer groupId) {
+    public FosterwxCashOasBox getRandOas(Integer groupId,Integer wxType) {
         List<FosterwxCashOasBoxMobileGroup> mobileGroupList = fosterwxCashOasBoxMobileGroupService.list(new QueryWrapper<FosterwxCashOasBoxMobileGroup>().eq("cash_mobile_group_id",groupId));
         List<Integer> boxOasIds = mobileGroupList.stream().map(FosterwxCashOasBoxMobileGroup::getOasBoxId).collect(Collectors.toList());
         List<FosterwxCashOasBox> list = this.list(new QueryWrapper<FosterwxCashOasBox>()
                 .eq("type", 2)
+                .eq("wx_type",wxType)
                 .in("id", boxOasIds)
                 .lt("send_text_cnt", 90)
                 .eq("fobidden_status", 1));
@@ -141,7 +146,7 @@ public class FosterwxCashOasBoxServiceImpl extends ServiceImpl<FosterwxCashOasBo
      * @return
      */
     @Transactional(rollbackFor = Exception.class)
-    public VoltaHandle<Boolean> importData(List<Map<String, String>> row, User authUser) throws Exception {
+    public VoltaHandle<Boolean> importData(List<Map<String, String>> row, User authUser,Integer wxType) throws Exception {
         VoltaHandle<Boolean> res = new VoltaHandle<>();
         if (row.size() <= 0) {
             throw new Exception("表格读取完成后，没有获取到任何数据");
@@ -156,10 +161,20 @@ public class FosterwxCashOasBoxServiceImpl extends ServiceImpl<FosterwxCashOasBo
             if (stationInfo == null) {
                 throw new Exception("站点编号不存在");
             }
-            FosterwxCashMobileGroup fosterwxCashMobileGroup = fosterwxCashMobileGroupService.getOne(new QueryWrapper<FosterwxCashMobileGroup>().eq("id",Integer.parseInt(row.get(i).get("mobileGroupId"))));
-            if (fosterwxCashMobileGroup == null){
-                throw new Exception("第"+i+"行:账号分组ID不存在");
+            if (wxType == 1){
+                //.个微
+                FosterwxCashMobileGroup fosterwxCashMobileGroup = fosterwxCashMobileGroupService.getOne(new QueryWrapper<FosterwxCashMobileGroup>().eq("id",Integer.parseInt(row.get(i).get("mobileGroupId"))));
+                if (fosterwxCashMobileGroup == null){
+                    throw new Exception("第"+i+"行:账号分组ID不存在");
+                }
+            }else{
+                //.企微
+                FosterwxCashWorkwxMobileGroup fosterwxCashWorkwxMobileGroup = fosterwxCashWorkwxMobileGroupService.getOne(new QueryWrapper<FosterwxCashWorkwxMobileGroup>().eq("id",Integer.parseInt(row.get(i).get("mobileGroupId"))));
+                if (fosterwxCashWorkwxMobileGroup == null){
+                    throw new Exception("第"+i+"行:账号分组ID不存在");
+                }
             }
+            fosterwxCashOasBox.setWxType(wxType);
             fosterwxCashOasBox.setStationId(stationInfo.getId());
             fosterwxCashOasBox.setGroupId(Integer.parseInt(row.get(i).get("groupId")));
             fosterwxCashOasBox.setType(Integer.parseInt(row.get(i).get("type")));
@@ -175,6 +190,7 @@ public class FosterwxCashOasBoxServiceImpl extends ServiceImpl<FosterwxCashOasBo
             this.save(fosterwxCashOasBox);
 
             FosterwxCashOasBoxMobileGroup fosterwxCashOasBoxMobileGroup = fosterwxCashOasBoxMobileGroupService.getOne(new QueryWrapper<FosterwxCashOasBoxMobileGroup>()
+                    .eq("wx_type",wxType)
                     .eq("oas_box_id",fosterwxCashOasBox.getId())
             .eq("cash_mobile_group_id",Integer.parseInt(row.get(i).get("mobileGroupId"))));
             if (fosterwxCashOasBoxMobileGroup != null){

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

@@ -120,7 +120,7 @@ public class FosterwxCashScheduleTaskListServiceImpl extends ServiceImpl<Fosterw
 
         String ghid = "";
         Integer groupId = editList.get(0).getGroupId();
-        FosterwxCashOasBox fosterwxCashOasBox = fosterwxCashOasBoxService.getRandOas(editList.get(0).getGroupId());
+        FosterwxCashOasBox fosterwxCashOasBox = fosterwxCashOasBoxService.getRandOas(editList.get(0).getGroupId(), editList.get(0).getType());
         if (null != fosterwxCashOasBox) {
             ghid = fosterwxCashOasBox.getGhId();
         }
@@ -132,7 +132,7 @@ public class FosterwxCashScheduleTaskListServiceImpl extends ServiceImpl<Fosterw
 
                 taskRedis.createUrlByTyper(JSON.toJSONString(tempList));
                 tempList.clear();
-                fosterwxCashOasBox = fosterwxCashOasBoxService.getRandOas(editList.get(0).getGroupId());
+                fosterwxCashOasBox = fosterwxCashOasBoxService.getRandOas(editList.get(0).getGroupId(), editList.get(0).getType());
                 if (null != fosterwxCashOasBox) {
                     ghid = fosterwxCashOasBox.getGhId();
                 }
@@ -201,7 +201,7 @@ public class FosterwxCashScheduleTaskListServiceImpl extends ServiceImpl<Fosterw
      */
     @Override
     public void editBoxUrl(FosterwxCashScheduleTaskList fosterwxCashScheduleTaskList, FosterwxCashTaskList fosterwxCashTaskList) {
-        FosterwxCashOasBox fosterwxCashOasBox = fosterwxCashOasBoxService.getRandBox(fosterwxCashScheduleTaskList.getGroupId());
+        FosterwxCashOasBox fosterwxCashOasBox = fosterwxCashOasBoxService.getRandBox(fosterwxCashScheduleTaskList.getGroupId(), fosterwxCashScheduleTaskList.getType());
         if (null == fosterwxCashOasBox) {
             // 状态
             fosterwxCashScheduleTaskList.setStatus(3);
@@ -256,19 +256,19 @@ public class FosterwxCashScheduleTaskListServiceImpl extends ServiceImpl<Fosterw
             return;
         }
 
-        FosterwxCashOasBox fosterwxCashOasBox = fosterwxCashOasBoxService.getRandBox(fosterwxCashScheduleTaskList.getGroupId());
-        if (null == fosterwxCashOasBox) {
-            // 状态
-            fosterwxCashScheduleTaskList.setStatus(3);
-            // 失败原因
-            fosterwxCashScheduleTaskList.setErrInfo("该分组下没有可用的公众号");
-
-            fosterwxCashScheduleTaskListMapper.updateById(fosterwxCashScheduleTaskList);
-
-            return;
-        }
+        // FosterwxCashOasBox fosterwxCashOasBox = fosterwxCashOasBoxService.getRandBox(fosterwxCashScheduleTaskList.getGroupId());
+        // if (null == fosterwxCashOasBox) {
+        //     // 状态
+        //     fosterwxCashScheduleTaskList.setStatus(3);
+        //     // 失败原因
+        //     fosterwxCashScheduleTaskList.setErrInfo("该分组下没有可用的公众号");
+        //
+        //     fosterwxCashScheduleTaskListMapper.updateById(fosterwxCashScheduleTaskList);
+        //
+        //     return;
+        // }
 
-        fosterwxCashOasBoxService.addSendTextCnt(fosterwxCashScheduleTaskList.getGroupId(), fosterwxCashOasBox.getGhId());
+        fosterwxCashOasBoxService.addSendTextCnt(fosterwxCashScheduleTaskList.getGroupId(), fosterwxCashWorkwxTaskList.getGhId());
 
         // 状态
         if (3 != fosterwxCashWorkwxTaskList.getTaskType())
@@ -277,9 +277,9 @@ public class FosterwxCashScheduleTaskListServiceImpl extends ServiceImpl<Fosterw
         fosterwxCashScheduleTaskList.setErrInfo("");
         // 分配的公众号
         if (3 == fosterwxCashWorkwxTaskList.getTaskType()) {
-            fosterwxCashScheduleTaskList.setGhId(fosterwxCashOasBox.getGhId());
+            fosterwxCashScheduleTaskList.setGhId(fosterwxCashWorkwxTaskList.getBoxGhId());
         }
-        fosterwxCashScheduleTaskList.setBoxGhid(fosterwxCashOasBox.getGhId());
+        fosterwxCashScheduleTaskList.setBoxGhid(fosterwxCashWorkwxTaskList.getBoxGhId());
 
         // 小程序链接
         String sendUrl = "";

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

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

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

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

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

@@ -62,6 +62,9 @@ public class FosterwxMobileServiceImpl extends ServiceImpl<FosterwxMobileMapper,
     public FosterwxCashMobileService fosterwxCashMobileService;
 
     @Autowired
+    public FosterwxCashWorkwxMobileService fosterwxCashWorkwxMobileService;
+
+    @Autowired
     public FosterwxMobileTaskTimeListService fosterwxMobileTaskTimeListService;
 
     /**
@@ -183,31 +186,28 @@ public class FosterwxMobileServiceImpl extends ServiceImpl<FosterwxMobileMapper,
             );
             //.批量录入微信好友
             List<FosterwxMobileWxfriend> addFriend = new ArrayList<>();
-            Map<String, Boolean> friendsNames = new HashMap<>();
+            Map<Integer, Boolean> friendsIds = new HashMap<>();
             for (Integer s = 1; s <= 3; s++) {
                 String sStr = s.toString();
-                String wxFriendName = row.get(i).get("wxFriendName" + sStr);
-                String wxFriendUserName = row.get(i).get("wxFriendUserName" + sStr);
-                if (wxFriendName == null || wxFriendName.isEmpty()) {
+                String wxFriendIdStr = row.get(i).get("wxFriendId" + sStr);
+                Integer wxFriendId = Integer.parseInt(wxFriendIdStr);
+                if (wxFriendId == null || wxFriendId == 0) {
                     continue;
                 }
-                if (friendsNames.get(wxFriendName) != null) {
-                    throw new Exception("第" + (i + 1) + "行," + wxFriendName + "微信好友名称录入重复");
+                if (friendsIds.get(wxFriendId) != null) {
+                    throw new Exception("第" + (i + 1) + "行," + wxFriendId + "微信好友ID录入重复");
                 }
-                friendsNames.put(wxFriendName, true);
-                Boolean findRes = this.checkWxFriendCnt(friends, wxFriendName);
+                friendsIds.put(wxFriendId, true);
+                Boolean findRes = this.checkWxFriendCnt(friends, wxFriendId);
                 if (!findRes) {
-                    throw new Exception("第" + (i + 1) + "行," + wxFriendName + "微信好友名称在当前站点内已经使用超过三次，无法再次录入");
+                    throw new Exception("第" + (i + 1) + "行," + wxFriendId + "微信好友ID在当前站点内已经使用超过三次，无法再次录入");
                 }
                 FosterwxMobileWxfriend fosterwxMobileWxfriend = new FosterwxMobileWxfriend();
                 fosterwxMobileWxfriend.setMobileId(fosterwxMobile.getId());
                 fosterwxMobileWxfriend.setCreateAt(nowDate);
                 fosterwxMobileWxfriend.setUpdateAt(nowDate);
                 fosterwxMobileWxfriend.setSeq(s);
-                fosterwxMobileWxfriend.setWxName(wxFriendName);
-                if (wxFriendUserName != null && !wxFriendUserName.isEmpty()) {
-                    fosterwxMobileWxfriend.setWxUsername(wxFriendUserName);
-                }
+                fosterwxMobileWxfriend.setFriendId(wxFriendId);
                 addFriend.add(fosterwxMobileWxfriend);
             }
 
@@ -234,27 +234,63 @@ public class FosterwxMobileServiceImpl extends ServiceImpl<FosterwxMobileMapper,
      * @param list
      * @return
      */
-    public List<FosterwxMobileVo> setWxFriend(List<FosterwxMobileVo> list) {
-        for (FosterwxMobileVo fosterwxMobileVo : list) {
-            List<FosterwxMobileWxfriend> wxfriendList = fosterwxMobileWxfriendService.list(
-                    new QueryWrapper<FosterwxMobileWxfriend>().eq("mobile_id", fosterwxMobileVo.getId()).orderByAsc("seq"));
-            if (wxfriendList == null || wxfriendList.size() <= 0) {
+//    public List<FosterwxMobileVo> setWxFriend(List<FosterwxMobileVo> list) {
+//        for (FosterwxMobileVo fosterwxMobileVo : list) {
+//            List<FosterwxMobileWxfriend> wxfriendList = fosterwxMobileWxfriendService.list(
+//                    new QueryWrapper<FosterwxMobileWxfriend>().eq("mobile_id", fosterwxMobileVo.getId()).orderByAsc("seq"));
+//            if (wxfriendList == null || wxfriendList.size() <= 0) {
+//                continue;
+//            }
+//            for (FosterwxMobileWxfriend fosterwxMobileWxfriend : wxfriendList) {
+//                if (fosterwxMobileWxfriend.getSeq().equals(1)) {
+//                    fosterwxMobileVo.set(fosterwxMobileWxfriend.getWxName());
+//                    fosterwxMobileVo.setWxUsername1(fosterwxMobileWxfriend.getWxUsername());
+//                } else if (fosterwxMobileWxfriend.getSeq().equals(2)) {
+//                    fosterwxMobileVo.setWxName2(fosterwxMobileWxfriend.getWxName());
+//                    fosterwxMobileVo.setWxUsername2(fosterwxMobileWxfriend.getWxUsername());
+//                } else if (fosterwxMobileWxfriend.getSeq().equals(3)) {
+//                    fosterwxMobileVo.setWxName3(fosterwxMobileWxfriend.getWxName());
+//                    fosterwxMobileVo.setWxUsername3(fosterwxMobileWxfriend.getWxUsername());
+//                }
+//            }
+//        }
+//        return list;
+//    }
+
+    /**
+     * 批量加入变现账号
+     * @param setIdsHandle
+     * @return
+     */
+    public Boolean addCashMobileList(SetIdsHandle setIdsHandle) {
+        LocalDateTime now = LocalDateTime.now();
+        for (Integer id : setIdsHandle.getIds()) {
+            FosterwxMobile fosterwxMobile = this.getOne(new QueryWrapper<FosterwxMobile>().eq("id", id));
+            FosterwxCashMobile fosterwxCashMobile = fosterwxCashMobileService.getOne(new QueryWrapper<FosterwxCashMobile>().eq("mobile_id",id));
+            if (fosterwxCashMobile != null){
                 continue;
             }
-            for (FosterwxMobileWxfriend fosterwxMobileWxfriend : wxfriendList) {
-                if (fosterwxMobileWxfriend.getSeq().equals(1)) {
-                    fosterwxMobileVo.setWxName1(fosterwxMobileWxfriend.getWxName());
-                    fosterwxMobileVo.setWxUsername1(fosterwxMobileWxfriend.getWxUsername());
-                } else if (fosterwxMobileWxfriend.getSeq().equals(2)) {
-                    fosterwxMobileVo.setWxName2(fosterwxMobileWxfriend.getWxName());
-                    fosterwxMobileVo.setWxUsername2(fosterwxMobileWxfriend.getWxUsername());
-                } else if (fosterwxMobileWxfriend.getSeq().equals(3)) {
-                    fosterwxMobileVo.setWxName3(fosterwxMobileWxfriend.getWxName());
-                    fosterwxMobileVo.setWxUsername3(fosterwxMobileWxfriend.getWxUsername());
+            List<FosterwxDomain> domainList = fosterwxDomainService.list(new QueryWrapper<FosterwxDomain>().eq("station_id",fosterwxMobile.getStationId()));
+            FosterwxCashMobile add = new FosterwxCashMobile();
+            //.站点域名不存在则不插入域名信息
+            if (domainList.size() > 0){
+                Integer rand;
+                if (domainList.size() == 1){
+                    rand = 0;
+                }else{
+                    rand = (int)(0+Math.random()*((domainList.size()-1)-0+1));
                 }
+                add.setDomainId(rand);
             }
+
+            add.setGroupId(setIdsHandle.getId());
+            add.setMobileId(fosterwxMobile.getId());
+            add.setStationId(fosterwxMobile.getStationId());
+            add.setCreateAt(now);
+            add.setUpdateAt(now);
+            fosterwxCashMobileService.save(add);
         }
-        return list;
+        return true;
     }
 
     /**
@@ -262,16 +298,16 @@ public class FosterwxMobileServiceImpl extends ServiceImpl<FosterwxMobileMapper,
      * @param setIdsHandle
      * @return
      */
-    public Boolean addCashMobileList(SetIdsHandle setIdsHandle) {
+    public Boolean addCashWorkwxMobileList(SetIdsHandle setIdsHandle) {
         LocalDateTime now = LocalDateTime.now();
         for (Integer id : setIdsHandle.getIds()) {
             FosterwxMobile fosterwxMobile = this.getOne(new QueryWrapper<FosterwxMobile>().eq("id", id));
-            FosterwxCashMobile fosterwxCashMobile = fosterwxCashMobileService.getOne(new QueryWrapper<FosterwxCashMobile>().eq("mobile_id",id));
+            FosterwxCashWorkwxMobile fosterwxCashMobile = fosterwxCashWorkwxMobileService.getOne(new QueryWrapper<FosterwxCashWorkwxMobile>().eq("mobile_id",id));
             if (fosterwxCashMobile != null){
                 continue;
             }
             List<FosterwxDomain> domainList = fosterwxDomainService.list(new QueryWrapper<FosterwxDomain>().eq("station_id",fosterwxMobile.getStationId()));
-            FosterwxCashMobile add = new FosterwxCashMobile();
+            FosterwxCashWorkwxMobile add = new FosterwxCashWorkwxMobile();
             //.站点域名不存在则不插入域名信息
             if (domainList.size() > 0){
                 Integer rand;
@@ -288,15 +324,15 @@ public class FosterwxMobileServiceImpl extends ServiceImpl<FosterwxMobileMapper,
             add.setStationId(fosterwxMobile.getStationId());
             add.setCreateAt(now);
             add.setUpdateAt(now);
-            fosterwxCashMobileService.save(add);
+            fosterwxCashWorkwxMobileService.save(add);
         }
         return true;
     }
 
-    private Boolean checkWxFriendCnt(List<FosterwxMobileWxfriend> row, String wxName) {
+    private Boolean checkWxFriendCnt(List<FosterwxMobileWxfriend> row, Integer friendId) {
         Integer findCnt = 0;
         for (FosterwxMobileWxfriend fosterwxMobileWxfriend : row) {
-            if (fosterwxMobileWxfriend.getWxName().equals(wxName)) {
+            if (fosterwxMobileWxfriend.getFriendId().equals(friendId)) {
                 findCnt++;
             }
             if (findCnt >= 3) {

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

@@ -88,26 +88,26 @@ public class FosterwxMobileWxfriendServiceImpl extends ServiceImpl<FosterwxMobil
         List<FosterwxMobileWxfriend> friends = this.list(new QueryWrapper<FosterwxMobileWxfriend>()
                 .in("mobile_id",mobileIds)
         );
-        Map<String,Boolean> friendsNames = new HashMap<>();
+        Map<Integer,Boolean> friendsNames = new HashMap<>();
         for (FosterwxMobileWxfriend add :addFosterwxMobileHandle.getFriends()){
-            if(friendsNames.get(add.getWxName()) != null){
-                res.setErr(HttpMsg.wxFriendResume+add.getWxName());
+            if(friendsNames.get(add.getFriendId()) != null){
+                res.setErr(HttpMsg.wxFriendResume+add.getFriendId().toString());
                 return res;
             }
-            friendsNames.put(add.getWxName(),true);
-            Boolean findRes = this.checkWxFriendCnt(friends,add.getWxName());
+            friendsNames.put(add.getFriendId(),true);
+            Boolean findRes = this.checkWxFriendCnt(friends,add.getFriendId());
             if (!findRes){
-                res.setErr(HttpMsg.wxFriendCntMax3+add.getWxName());
+                res.setErr(HttpMsg.wxFriendCntMax3+add.getFriendId());
                 return res;
             }
         }
         return res;
     }
 
-    public Boolean checkWxFriendCnt(List<FosterwxMobileWxfriend> row,String wxName){
+    public Boolean checkWxFriendCnt(List<FosterwxMobileWxfriend> row,Integer friendId){
         Integer findCnt = 0;
         for (FosterwxMobileWxfriend fosterwxMobileWxfriend : row){
-            if (fosterwxMobileWxfriend.getWxName().equals(wxName)){
+            if (fosterwxMobileWxfriend.getFriendId().equals(friendId)){
                 findCnt++;
             }
             if (findCnt >= 3){

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

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

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

@@ -0,0 +1,34 @@
+package com.mokamrp.privates.task.pangu;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxMobileWxfriend;
+import com.mokamrp.privates.service.pangu.*;
+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.util.List;
+
+@Component
+public class TakeWxFriendToStation {
+
+    @Autowired
+    public FosterwxWxfriendService fosterwxWxfriendService;
+
+    @Autowired
+    public FosterwxMobileWxfriendService fosterwxMobileWxfriendService;
+
+    @Autowired
+    public FosterwxMobileService fosterwxMobileService;
+
+//    @Scheduled(cron = "0 */1 * * * ?")
+//    @SchedulerLock(name = "pangu:TakeWxFriendToStation", lockAtLeastForString = "PT5S", lockAtMostForString = "PT15M")
+//    public void execute() {
+//         List<FosterwxMobileWxfriend> list = fosterwxMobileWxfriendService.list(new QueryWrapper<FosterwxMobileWxfriend>()
+//                 .ne("wx_username","")
+//                 .ne("wx_name","")
+//                 .groupBy("wx_username"));
+//    }
+
+}

src/main/resources/application-local.properties

@@ -76,7 +76,9 @@ xxl-sso.excluded.paths=/healthy,\
   /pangu/promoteMaxRecord/getPromoteCodeMaxRecord
 #xxl.sso.redis.address=redis://xxl-sso:Jch9shshl@r-uf633f3f27aa2174pd.redis.rds.aliyuncs.com:6379/0
 xxl.sso.redis.address=redis://xxl-sso:MokaSapce666$%25_RediS@r-uf6727zrr24ioihy72pd.redis.rds.aliyuncs.com:23563/0
-menu.host=http://space-server.mokamrp.com/space/menu/getMenuInterface?sysCode=1006&userId=
+menu.host=https://test.space-server.mokamrp.com/space/menu/getMenuInterface?sysCode=1006&userId=
+
+
 datahub.endpoint=https://dh-cn-shanghai.aliyuncs.com
 datahub.accessid=LTAI5tEWU1j9H2poG4zWgfEP
 datahub.accesssecret=p9tVmeDeeEENKhfsBsSeYc0F0ggH5b

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