Merge branch 'master' of http://git.mokasz.com/marketing/moka-private

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

@@ -19,7 +19,9 @@ import com.mokamrp.privates.mapper.pangu.pojo.FosterwxMobile;
 import com.mokamrp.privates.mapper.pangu.pojo.FosterwxMobilePool;
 import com.mokamrp.privates.mapper.pangu.pojo.FosterwxMobileWxfriend;
 import com.mokamrp.privates.mapper.pangu.pojo.FosterwxStation;
+import com.mokamrp.privates.mapper.pojo.Corp;
 import com.mokamrp.privates.mapper.pojo.User;
+import com.mokamrp.privates.service.CorpService;
 import com.mokamrp.privates.service.pangu.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
@@ -59,6 +61,9 @@ public class FosterwxMobileController extends BaseController<FosterwxMobile> {
     @Autowired
     private FosterwxMobilePoolService fosterwxMobilePoolService;
 
+    @Autowired
+    private CorpService corpService;
+
     /*
      * @fast
      * 默认生成的控制器所继承的父类中有index/add/edit/del四个基础方法,均为post json请求
@@ -81,6 +86,10 @@ public class FosterwxMobileController extends BaseController<FosterwxMobile> {
             return AjaxResult.error("ids null");
         }
         FosterwxMobile res = service.getOne(new QueryWrapper<FosterwxMobile>().eq("id", ids));
+        Corp corp = corpService.getById(res.getWorkWxCorpId());
+        if (null != corp) {
+            res.setWxAppid(corp.getWxCorpid());
+        }
         List<FosterwxMobileWxfriend> friendList = fosterwxMobileWxfriendService.list(new QueryWrapper<FosterwxMobileWxfriend>().eq("mobile_id", res.getId()).orderByAsc("seq"));
         res.setFriend(friendList);
         return AjaxResult.success(Constants.SUCCESS, res);
@@ -126,9 +135,10 @@ public class FosterwxMobileController extends BaseController<FosterwxMobile> {
             fosterwxMobile = fosterwxMobileService.getById(id);
             // 更新个微池个微二维码及企微appid
             FosterwxMobile finalFosterwxMobile = fosterwxMobile;
+            Corp corp = corpService.getById(fosterwxMobile.getWorkWxCorpId());
             fosterwxMobilePoolService.update(new FosterwxMobilePool() {{
                 setCodeUrl(finalFosterwxMobile.getCodeUrl());
-                setWxAppid(finalFosterwxMobile.getWxAppid());
+                setWxAppid(corp.getWxCorpid());
                 setUpdateAt(LocalDateTime.now());
             }}, new QueryWrapper<FosterwxMobilePool>().eq("pool_index", fosterwxMobile.getMobileUnioCode()));
             // 判断开始做任务时间是否设置了
@@ -344,15 +354,15 @@ public class FosterwxMobileController extends BaseController<FosterwxMobile> {
 
 
     @PostMapping("/setWorkWxInfo")
-    public Object setWorkWxInfo(@Valid @RequestBody SetWorkWxInfoHandle setWorkWxInfoHandle, BindingResult bindingResult){
+    public Object setWorkWxInfo(@Valid @RequestBody SetWorkWxInfoHandle setWorkWxInfoHandle, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
         }
         FosterwxMobile save = new FosterwxMobile();
         save.setWorkWxCorpId(setWorkWxInfoHandle.getWorkWxCorpId());
         save.setWorkWxRegisterAt(setWorkWxInfoHandle.getWorkWxRegisterAt());
-        service.update(save,new QueryWrapper<FosterwxMobile>().in("id",setWorkWxInfoHandle.getIds()));
-        return AjaxResult.success(Constants.SUCCESS,true);
+        service.update(save, new QueryWrapper<FosterwxMobile>().in("id", setWorkWxInfoHandle.getIds()));
+        return AjaxResult.success(Constants.SUCCESS, true);
     }
 
     /**
@@ -385,6 +395,7 @@ public class FosterwxMobileController extends BaseController<FosterwxMobile> {
                 setInPool(1);
             }}, new QueryWrapper<FosterwxMobile>().eq("id", fosterwxMobile.getId()));
 
+            Corp corp = corpService.getById(fosterwxMobile.getWorkWxCorpId());
 
             FosterwxMobilePool fosterwxMobilePool = new FosterwxMobilePool();
             fosterwxMobilePool.setPoolIndex(fosterwxMobile.getMobileUnioCode());
@@ -398,6 +409,9 @@ public class FosterwxMobileController extends BaseController<FosterwxMobile> {
             fosterwxMobilePool.setMaxFans("");
             fosterwxMobilePool.setBusMobileNo(fosterwxMobile.getMobileNo());
             fosterwxMobilePool.setFlowPosition("");
+            if (null != corp) {
+                fosterwxMobilePool.setWxAppid(corp.getWxCorpid());
+            }
             fosterwxMobilePool.setCreateUid(authUser.getId());
             fosterwxMobilePool.setUpdateUid(authUser.getId());
             fosterwxMobilePool.setCreateAt(LocalDateTime.now());

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

@@ -124,6 +124,7 @@ public class FosterwxMobile extends Model<FosterwxMobile> {
     /**
      * 企微appid
      */
+    @TableField(exist = false)
     private String wxAppid;
 
     /**
@@ -144,6 +145,7 @@ public class FosterwxMobile extends Model<FosterwxMobile> {
     /**
      * 企业微信主体
      */
+    @TableField(exist = false)
     private String workWxCorp;
 
     /**

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

@@ -1,29 +1,29 @@
 package com.mokamrp.privates.service.pangu.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.api.R;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.mokamrp.privates.entity.ResHandle;
 import com.mokamrp.privates.entity.pangu.GetForsterwxMobileHandle;
-import com.mokamrp.privates.mapper.pangu.pojo.FosterwxMobile;
 import com.mokamrp.privates.mapper.pangu.FosterwxMobileMapper;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxMobile;
 import com.mokamrp.privates.mapper.pangu.pojo.FosterwxMobileWxfriend;
 import com.mokamrp.privates.mapper.pangu.pojo.FosterwxStation;
-import com.mokamrp.privates.mapper.pangu.pojo.FosterwxStationBindBox;
+import com.mokamrp.privates.mapper.pojo.Corp;
 import com.mokamrp.privates.mapper.pojo.User;
+import com.mokamrp.privates.service.CorpService;
 import com.mokamrp.privates.service.pangu.FosterwxMobileService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.mokamrp.privates.service.pangu.FosterwxMobileWxfriendService;
 import com.mokamrp.privates.service.pangu.FosterwxStationService;
-import org.apache.tomcat.jni.Local;
-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 org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -44,6 +44,10 @@ public class FosterwxMobileServiceImpl extends ServiceImpl<FosterwxMobileMapper,
 
     @Autowired
     public FosterwxStationService fosterwxStationService;
+
+    @Autowired
+    public CorpService corpService;
+
     /**
      * 获取数据列表 支持分页
      * @param handle
@@ -53,7 +57,14 @@ public class FosterwxMobileServiceImpl extends ServiceImpl<FosterwxMobileMapper,
         Integer pagesize = handle.getPagesize();
         Integer page = handle.getPage();
         Page<FosterwxMobile> pageObj = new Page<FosterwxMobile>(page, pagesize);
-        List<FosterwxMobile> list = fosterwxMobileMapper.getList(pageObj,handle);
+        List<FosterwxMobile> list = fosterwxMobileMapper.getList(pageObj, handle);
+        list.forEach(fosterwxMobile -> {
+            Corp corp = corpService.getById(fosterwxMobile.getWorkWxCorpId());
+            if (null != corp) {
+                fosterwxMobile.setWorkWxCorp(corp.getName());
+                fosterwxMobile.setWxAppid(corp.getWxCorpid());
+            }
+        });
         ResHandle<List<FosterwxMobile>> resHandle = new ResHandle<>();
         resHandle.setList(list);
         resHandle.setTotal(pageObj.getTotal());
@@ -68,7 +79,7 @@ public class FosterwxMobileServiceImpl extends ServiceImpl<FosterwxMobileMapper,
      */
     public Map<String, Object> getListByStationId(GetForsterwxMobileHandle getForsterwxMobileHandle, Integer stationId) {
         Page<FosterwxMobile> pageObj = new Page<FosterwxMobile>(getForsterwxMobileHandle.getPage(), getForsterwxMobileHandle.getPagesize());
-        List<FosterwxMobile> list = fosterwxMobileMapper.getListByStationId(pageObj,getForsterwxMobileHandle,stationId);
+        List<FosterwxMobile> list = fosterwxMobileMapper.getListByStationId(pageObj, getForsterwxMobileHandle, stationId);
         Map<String, Object> resMap = new HashMap<String, Object>();
         resMap.put("list", list);
         resMap.put("total", pageObj.getTotal());
@@ -80,50 +91,50 @@ public class FosterwxMobileServiceImpl extends ServiceImpl<FosterwxMobileMapper,
      * @param row
      * @return
      */
-    public Boolean importData(List<Map<String,String>> row, User authUser){
-        if(row.size() <= 0){
+    public Boolean importData(List<Map<String, String>> row, User authUser) {
+        if (row.size() <= 0) {
             return false;
         }
         DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-        for (int i = 0;i<row.size();i++) {
+        for (int i = 0; i < row.size(); i++) {
             LocalDateTime nowDate = LocalDateTime.now();
             Map<String, String> cell = row.get(i);
             FosterwxMobile fosterwxMobile = new FosterwxMobile();
             fosterwxMobile.setStationId(Integer.parseInt(row.get(i).get("stationId")));
-            fosterwxMobile.setMobileCode(String.format("%03d",Integer.parseInt(row.get(i).get("mobileCode"))));
+            fosterwxMobile.setMobileCode(String.format("%03d", Integer.parseInt(row.get(i).get("mobileCode"))));
             fosterwxMobile.setMobileNo(row.get(i).get("mobileNo"));
             fosterwxMobile.setMobileOperator(Integer.parseInt(row.get(i).get("mobileOperator")));
-            fosterwxMobile.setMobileCreateAt(LocalDateTime.parse(row.get(i).get("mobileCreateAt"),df));
+            fosterwxMobile.setMobileCreateAt(LocalDateTime.parse(row.get(i).get("mobileCreateAt"), df));
             fosterwxMobile.setMobileAdvancePayAmt(Integer.parseInt(row.get(i).get("mobileAdvancePayAmt")));
             fosterwxMobile.setMobileCombo(row.get(i).get("mobileCombo"));
             fosterwxMobile.setMobileComboFlow(row.get(i).get("mobileComboFlow"));
             fosterwxMobile.setMobileRealName(row.get(i).get("mobileRealName"));
             fosterwxMobile.setMobileIdentityCardNo(row.get(i).get("mobileIdentityCardNo"));
             fosterwxMobile.setWxPassword(row.get(i).get("wxPassword"));
-            fosterwxMobile.setWxRegisterAt(LocalDateTime.parse(row.get(i).get("wxRegisterAt"),df));
+            fosterwxMobile.setWxRegisterAt(LocalDateTime.parse(row.get(i).get("wxRegisterAt"), df));
             fosterwxMobile.setWxRealName(row.get(i).get("wxRealName"));
             fosterwxMobile.setWxIdentityCardNo(row.get(i).get("wxIdentityCardNo"));
             fosterwxMobile.setBankCardNo(row.get(i).get("bankCardNo"));
             fosterwxMobile.setBankCardMobileNo(row.get(i).get("bankCardMobileNo"));
-            if (row.get(i).get("workWxCorp") != null && !row.get(i).get("workWxCorp").isEmpty()){
+            if (row.get(i).get("workWxCorp") != null && !row.get(i).get("workWxCorp").isEmpty()) {
                 fosterwxMobile.setWorkWxCorp(row.get(i).get("workWxCorp"));
             }
-            if (row.get(i).get("workWxRegisterAt") != null && !row.get(i).get("workWxRegisterAt").isEmpty()){
-                fosterwxMobile.setWorkWxRegisterAt(LocalDateTime.parse(row.get(i).get("workWxRegisterAt"),df));
+            if (row.get(i).get("workWxRegisterAt") != null && !row.get(i).get("workWxRegisterAt").isEmpty()) {
+                fosterwxMobile.setWorkWxRegisterAt(LocalDateTime.parse(row.get(i).get("workWxRegisterAt"), df));
             }
             fosterwxMobile.setCreateAt(nowDate);
             fosterwxMobile.setUpdateAt(nowDate);
             FosterwxStation stationInfo = fosterwxStationService.getOne(new QueryWrapper<FosterwxStation>()
-                    .eq("id",fosterwxMobile.getStationId()));
-            fosterwxMobile.setMobileUnioCode(stationInfo.getStationName() +  fosterwxMobile.getMobileCode());
+                    .eq("id", fosterwxMobile.getStationId()));
+            fosterwxMobile.setMobileUnioCode(stationInfo.getStationName() + fosterwxMobile.getMobileCode());
             this.save(fosterwxMobile);
             //.批量录入微信好友
             List<FosterwxMobileWxfriend> addFriend = new ArrayList<>();
-            for (Integer s = 1;s<=3;s++) {
+            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 wxFriendName = row.get(i).get("wxFriendName" + sStr);
+                String wxFriendUserName = row.get(i).get("wxFriendUserName" + sStr);
+                if (wxFriendName == null || wxFriendName.isEmpty()) {
                     continue;
                 }
                 FosterwxMobileWxfriend fosterwxMobileWxfriend = new FosterwxMobileWxfriend();
@@ -132,13 +143,13 @@ public class FosterwxMobileServiceImpl extends ServiceImpl<FosterwxMobileMapper,
                 fosterwxMobileWxfriend.setUpdateAt(nowDate);
                 fosterwxMobileWxfriend.setSeq(s);
                 fosterwxMobileWxfriend.setWxName(wxFriendName);
-                if (wxFriendUserName != null && !wxFriendUserName.isEmpty()){
+                if (wxFriendUserName != null && !wxFriendUserName.isEmpty()) {
                     fosterwxMobileWxfriend.setWxUsername(wxFriendUserName);
                 }
                 addFriend.add(fosterwxMobileWxfriend);
             }
-            if (addFriend.size() > 0){
-                fosterwxMobileWxfriendService.remove(new QueryWrapper<FosterwxMobileWxfriend>().eq("mobile_id",fosterwxMobile.getId()));
+            if (addFriend.size() > 0) {
+                fosterwxMobileWxfriendService.remove(new QueryWrapper<FosterwxMobileWxfriend>().eq("mobile_id", fosterwxMobile.getId()));
                 fosterwxMobileWxfriendService.saveBatch(addFriend);
             }
         }