update

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

@@ -95,9 +95,12 @@ public class FosterwxMobileController extends BaseController<FosterwxMobile> {
         if (fosterwxMobileService.count(fosterwxMobileLambdaQueryWrapper) > 0) {
             return AjaxResult.error("该站点中该手机编码已登陆！请确认！");
         }
+        FosterwxStation stationInfo = fosterwxStationService.getOne(new QueryWrapper<FosterwxStation>()
+                .eq("station_id",addHandle.getRaw().getStationId()));
         // 新增账号
         this.onInsert(addHandle.getRaw());
-        addHandle.getRaw().setMobileUnioCode(String.format("%03d", addHandle.getRaw().getStationId()) + String.format("%03d", addHandle.getRaw().getMobileCode()));
+        addHandle.getRaw().setMobileCode(String.format("%03d", Integer.parseInt(addHandle.getRaw().getMobileCode())));
+        addHandle.getRaw().setMobileUnioCode(stationInfo.getStationName() + addHandle.getRaw().getMobileCode());
         fosterwxMobileService.save(addHandle.getRaw());
         // 判断开始做任务时间是否设置了
         AjaxResult ajaxResult = null;
@@ -196,7 +199,7 @@ public class FosterwxMobileController extends BaseController<FosterwxMobile> {
             return AjaxResult.error(HttpStatus.LOGIN_ERROR, HttpMsg.needLogin);
         }
         //.补足三位数
-        addHandle.getRaw().setMobileCode(String.format("%03d",addHandle.getRaw().getMobileCode()));
+        addHandle.getRaw().setMobileCode(String.format("%03d",Integer.parseInt(addHandle.getRaw().getMobileCode())));
         this.onInsert(addHandle.getRaw());
         Boolean res = fosterwxMobileService.save(addHandle.getRaw());
         if (res) {
@@ -215,7 +218,6 @@ public class FosterwxMobileController extends BaseController<FosterwxMobile> {
         Calendar c = Calendar.getInstance();
         c.set(Integer.valueOf(getForsterwxMobileHandle.getYear()), Integer.valueOf(getForsterwxMobileHandle.getMonth()), 0);
         int dayOfMonth = c.get(Calendar.DAY_OF_MONTH);
-
         Map<String, Object> res = new HashMap<>();
         for (int i = 1; i <= dayOfMonth; i++) {
             String date = getForsterwxMobileHandle.getYear() + "-" + String.format("%02d", Integer.valueOf(getForsterwxMobileHandle.getMonth())) + "-" + String.format("%02d", i);

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

@@ -112,7 +112,7 @@ public class FosterwxStationController extends BaseController<FosterwxStation> {
         if (fosterwxStationService.count(fosterwxStationLambdaQueryWrapper) > 0) {
             return AjaxResult.error("用户名重复");
         }
-        addHandle.getRaw().setStationName(String.format("%03d",addHandle.getRaw().getStationName()));
+        addHandle.getRaw().setStationName(String.format("%03d",Integer.parseInt(addHandle.getRaw().getStationName())));
         addHandle.getRaw().setUploadUid(user.getId());
         this.onInsert(addHandle.getRaw());
         Boolean res = fosterwxStationService.save(addHandle.getRaw());

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

@@ -7,11 +7,13 @@ 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.FosterwxMobileWxfriend;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxStation;
 import com.mokamrp.privates.mapper.pangu.pojo.FosterwxStationBindBox;
 import com.mokamrp.privates.mapper.pojo.User;
 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;
@@ -39,6 +41,9 @@ public class FosterwxMobileServiceImpl extends ServiceImpl<FosterwxMobileMapper,
 
     @Autowired
     public FosterwxMobileWxfriendService fosterwxMobileWxfriendService;
+
+    @Autowired
+    public FosterwxStationService fosterwxStationService;
     /**
      * 获取数据列表 支持分页
      * @param handle
@@ -85,7 +90,7 @@ public class FosterwxMobileServiceImpl extends ServiceImpl<FosterwxMobileMapper,
             Map<String, String> cell = row.get(i);
             FosterwxMobile fosterwxMobile = new FosterwxMobile();
             fosterwxMobile.setStationId(Integer.parseInt(row.get(i).get("stationId")));
-            fosterwxMobile.setMobileCode(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));
@@ -108,7 +113,9 @@ public class FosterwxMobileServiceImpl extends ServiceImpl<FosterwxMobileMapper,
             }
             fosterwxMobile.setCreateAt(nowDate);
             fosterwxMobile.setUpdateAt(nowDate);
-            fosterwxMobile.setMobileUnioCode(String.format("%03d", fosterwxMobile.getStationId()) + String.format("%03d", fosterwxMobile.getMobileCode()));
+            FosterwxStation stationInfo = fosterwxStationService.getOne(new QueryWrapper<FosterwxStation>()
+                    .eq("station_id",fosterwxMobile.getStationId()));
+            fosterwxMobile.setMobileUnioCode(stationInfo.getStationName() +  fosterwxMobile.getMobileCode());
             this.save(fosterwxMobile);
             //.批量录入微信好友
             List<FosterwxMobileWxfriend> addFriend = new ArrayList<>();

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

@@ -212,13 +212,13 @@ public class FosterwxTaskScheduleServiceImpl extends ServiceImpl<FosterwxTaskSch
                     // 已经有组了
                     String[] mobiles = mobileArry[mobileArry.length - 1].split("-");
                     if (Integer.valueOf(mobiles[1]) + 1 == Integer.parseInt(code)) {
-                        mobileArry[mobileArry.length - 1] = mobiles[0] + "-" + String.format("%03d", code);
+                        mobileArry[mobileArry.length - 1] = mobiles[0] + "-" + code;
                         mobileCode = "";
                         for (int i = 0; i < mobileArry.length; i++) {
                             mobileCode += mobileArry[i] + "、";
                         }
                     } else {
-                        mobileCode += String.format("%03d", code) + "、";
+                        mobileCode += code + "、";
                     }
                 } else {
                     if (Integer.valueOf(mobileArry[mobileArry.length - 1]) + 1 == Integer.parseInt(code)) {

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

@@ -7,6 +7,7 @@ import com.mokamrp.privates.constant.RedisKey;
 import com.mokamrp.privates.entity.pangu.AddFosterwxMobileHandle;
 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.service.pangu.FosterwxMobileService;
 import com.mokamrp.privates.service.pangu.FosterwxMobileWxfriendService;
 import com.mokamrp.privates.service.pangu.FosterwxStationService;
@@ -77,8 +78,9 @@ public class SyncFosterwxEdit {
                     fosterwxMobileLambdaQueryWrapper.eq(FosterwxMobile::getStationId, fosterwxMobile.getStationId());
                     fosterwxMobileLambdaQueryWrapper.eq(FosterwxMobile::getMobileCode, fosterwxMobile.getMobileCode());
                     if (fosterwxMobileService.count(fosterwxMobileLambdaQueryWrapper) > 0) continue;
-                    
-                    fosterwxMobile.setMobileUnioCode(String.format("%03d", fosterwxMobile.getStationId()) + String.format("%03d", fosterwxMobile.getMobileCode()));
+                    FosterwxStation stationInfo = fosterwxStationService.getOne(new QueryWrapper<FosterwxStation>()
+                            .eq("station_id",fosterwxMobile.getStationId()));
+                    fosterwxMobile.setMobileUnioCode(stationInfo.getStationName() + String.format("%03d", Integer.parseInt(fosterwxMobile.getMobileCode())));
                     fosterwxMobile.setCreateAt(LocalDateTime.now());
                     fosterwxMobile.setUpdateAt(LocalDateTime.now());
                     fosterwxMobileService.save(fosterwxMobile);