兼容线下手机编号格式

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

@@ -85,6 +85,7 @@ public class FosterwxMobileController extends BaseController<FosterwxMobile> {
     public Object addPro(@Valid @RequestBody AddHandle<FosterwxMobile> addHandle, @AuthUser User authUser) {
         // 新增账号
         this.onInsert(addHandle.getRaw());
+        addHandle.getRaw().setMobileUnioCode(String.format("%02d", addHandle.getRaw().getStationId()) + String.format("%02d", addHandle.getRaw().getMobileCode()));
         fosterwxMobileService.save(addHandle.getRaw());
         // 判断开始做任务时间是否设置了
         AjaxResult ajaxResult = null;

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

@@ -7,6 +7,7 @@
         <id column="id" property="id" />
         <result column="station_id" property="stationId" />
         <result column="mobile_code" property="mobileCode" />
+        <result column="mobile_unio_code" property="mobileUnioCode"/>
         <result column="mobile_no" property="mobileNo" />
         <result column="mobile_operator" property="mobileOperator" />
         <result column="mobile_create_at" property="mobileCreateAt" />
@@ -33,7 +34,8 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, station_id, mobile_code, mobile_no, mobile_operator, mobile_create_at, mobile_advance_pay_amt, mobile_combo, mobile_combo_flow, mobile_real_name, mobile_identity_card_no, status, wx_status, wx_password, wx_real_name, wx_identity_card_no, wx_register_at, bank_card_no, bank_card_mobile_no, work_wx_corp, work_wx_register_at, work_wx_status, task_start_at, create_at, update_at
+        id
+        , station_id, mobile_code, mobile_unio_code, mobile_no, mobile_operator, mobile_create_at, mobile_advance_pay_amt, mobile_combo, mobile_combo_flow, mobile_real_name, mobile_identity_card_no, status, wx_status, wx_password, wx_real_name, wx_identity_card_no, wx_register_at, bank_card_no, bank_card_mobile_no, work_wx_corp, work_wx_register_at, work_wx_status, task_start_at, create_at, update_at
     </sql>
     <select id="getList" resultType="com.mokamrp.privates.mapper.pangu.pojo.FosterwxMobile">
         SELECT * FROM pan_fosterwx_mobile

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

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -43,6 +42,11 @@ public class FosterwxMobile extends Model<FosterwxMobile> {
     private Integer mobileCode;
 
     /**
+     * 手机唯一编码
+     */
+    private String mobileUnioCode;
+
+    /**
      * 手机号码
      */
     private String mobileNo;
@@ -180,6 +184,14 @@ public class FosterwxMobile extends Model<FosterwxMobile> {
         this.mobileCode = mobileCode;
     }
 
+    public String getMobileUnioCode() {
+        return mobileUnioCode;
+    }
+
+    public void setMobileUnioCode(String mobileUnioCode) {
+        this.mobileUnioCode = mobileUnioCode;
+    }
+
     public String getMobileNo() {
         return mobileNo;
     }
@@ -364,19 +376,20 @@ public class FosterwxMobile extends Model<FosterwxMobile> {
     @Override
     public String toString() {
         return "FosterwxMobile{" +
-        "id=" + id +
-        ", stationId=" + stationId +
-        ", mobileCode=" + mobileCode +
-        ", mobileNo=" + mobileNo +
-        ", mobileOperator=" + mobileOperator +
-        ", mobileCreateAt=" + mobileCreateAt +
-        ", mobileAdvancePayAmt=" + mobileAdvancePayAmt +
-        ", mobileCombo=" + mobileCombo +
-        ", mobileComboFlow=" + mobileComboFlow +
-        ", mobileRealName=" + mobileRealName +
-        ", mobileIdentityCardNo=" + mobileIdentityCardNo +
-        ", status=" + status +
-        ", wxStatus=" + wxStatus +
+                "id=" + id +
+                ", stationId=" + stationId +
+                ", mobileCode=" + mobileCode +
+                ", mobileUnioCode=" + mobileUnioCode +
+                ", mobileNo=" + mobileNo +
+                ", mobileOperator=" + mobileOperator +
+                ", mobileCreateAt=" + mobileCreateAt +
+                ", mobileAdvancePayAmt=" + mobileAdvancePayAmt +
+                ", mobileCombo=" + mobileCombo +
+                ", mobileComboFlow=" + mobileComboFlow +
+                ", mobileRealName=" + mobileRealName +
+                ", mobileIdentityCardNo=" + mobileIdentityCardNo +
+                ", status=" + status +
+                ", wxStatus=" + wxStatus +
         ", wxPassword=" + wxPassword +
         ", wxRealName=" + wxRealName +
         ", wxIdentityCardNo=" + wxIdentityCardNo +

src/main/java/com/mokamrp/privates/tast/pangu/SyncFosterwxEdit.java

@@ -1,6 +1,5 @@
 package com.mokamrp.privates.tast.pangu;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.mokamrp.privates.constant.RedisKey;
@@ -17,9 +16,7 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 @Component
 public class SyncFosterwxEdit {
@@ -45,56 +42,59 @@ public class SyncFosterwxEdit {
     public void execute() {
         System.out.println("[cronjob]:异步执行微信养号账号信息修改/新增操作");
         Integer cnt = 1;
-        while (true){
-            cnt ++;
-            if (cnt > 20){
+        while (true) {
+            cnt++;
+            if (cnt > 20) {
                 break;
             }
             try {
                 Thread.sleep(100);
                 String info = stringRedisTemplate.opsForList().rightPop(RedisKey.PanWxFosterMobileSync);
-                if (info == null || info.isEmpty()){
+                if (info == null || info.isEmpty()) {
                     continue;
                 }
-                FosterwxMobile fosterwxMobile = JSONObject.parseObject(info,FosterwxMobile.class);
-                if (fosterwxMobile.getStationId().equals(0)){
+                FosterwxMobile fosterwxMobile = JSONObject.parseObject(info, FosterwxMobile.class);
+                if (fosterwxMobile.getStationId().equals(0)) {
                     continue;
                 }
-                if (fosterwxMobile.getId().equals(0)){
+                if (fosterwxMobile.getId().equals(0)) {
                     //.新增
+                    // TODO 新增手机唯一编码
+                    fosterwxMobile.setMobileUnioCode(String.format("%02d", fosterwxMobile.getStationId()) + String.format("%02d", fosterwxMobile.getMobileCode()));
                     fosterwxMobileService.save(fosterwxMobile);
-                }else{
+                } else {
                     //.更新
-                    fosterwxMobileService.update(fosterwxMobile,new QueryWrapper<FosterwxMobile>().eq("id",fosterwxMobile.getId()));
+                    fosterwxMobileService.update(fosterwxMobile, new QueryWrapper<FosterwxMobile>().eq("id", fosterwxMobile.getId()));
                 }
                 //.更新微信好友信息
-                if (fosterwxMobile.getFriend() != null){
+                if (fosterwxMobile.getFriend() != null) {
                     AddFosterwxMobileHandle addFosterwxMobileHandle = new AddFosterwxMobileHandle();
                     addFosterwxMobileHandle.setMobileId(fosterwxMobile.getId());
                     addFosterwxMobileHandle.setFriends(fosterwxMobile.getFriend());
                     fosterwxMobileWxfriendService.removeAndAdd(addFosterwxMobileHandle);
                 }
                 //.立刻更新账号REDIS
-                List<FosterwxMobile> fosterwxMobileList = fosterwxMobileService.list(new QueryWrapper<FosterwxMobile>().eq("station_id",fosterwxMobile.getStationId()));
+                List<FosterwxMobile> fosterwxMobileList = fosterwxMobileService.list(new QueryWrapper<FosterwxMobile>().eq("station_id", fosterwxMobile.getStationId()));
                 List<Integer> mobileIds = new ArrayList<>();
-                for (FosterwxMobile obj : fosterwxMobileList){
+                for (FosterwxMobile obj : fosterwxMobileList) {
                     mobileIds.add(obj.getId());
                 }
-                this.fosterwxMobileWxfriendList = fosterwxMobileWxfriendService.list(new QueryWrapper<FosterwxMobileWxfriend>().in("mobile_id",mobileIds));
-                for (FosterwxMobile obj : fosterwxMobileList){
+                this.fosterwxMobileWxfriendList = fosterwxMobileWxfriendService.list(new QueryWrapper<FosterwxMobileWxfriend>().in("mobile_id", mobileIds));
+                for (FosterwxMobile obj : fosterwxMobileList) {
                     List<FosterwxMobileWxfriend> friends = this.getMobileWxfriendByMobileId(obj.getId());
                     obj.setFriend(friends);
                 }
-                stringRedisTemplate.opsForValue().set(RedisKey.PanWxFosterMobileInfo+fosterwxMobile.getStationId(), JSONObject.toJSONString(fosterwxMobileList));
+                stringRedisTemplate.opsForValue().set(RedisKey.PanWxFosterMobileInfo + fosterwxMobile.getStationId(), JSONObject.toJSONString(fosterwxMobileList));
             } catch (InterruptedException ie) {
                 Thread.currentThread().interrupt();
             }
         }
     }
-    public List<FosterwxMobileWxfriend> getMobileWxfriendByMobileId(Integer mobileId){
+
+    public List<FosterwxMobileWxfriend> getMobileWxfriendByMobileId(Integer mobileId) {
         List<FosterwxMobileWxfriend> res = new ArrayList<FosterwxMobileWxfriend>();
-        for (FosterwxMobileWxfriend fosterwxMobileWxfriend : this.fosterwxMobileWxfriendList){
-            if (fosterwxMobileWxfriend.getMobileId().equals(mobileId)){
+        for (FosterwxMobileWxfriend fosterwxMobileWxfriend : this.fosterwxMobileWxfriendList) {
+            if (fosterwxMobileWxfriend.getMobileId().equals(mobileId)) {
                 res.add(fosterwxMobileWxfriend);
             }
         }