账号导入完成

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

@@ -281,22 +281,23 @@ public class FosterwxMobileController extends BaseController<FosterwxMobile> {
         feild.put(4, "mobileCreateAt");
         feild.put(5, "mobileAdvancePayAmt");
         feild.put(6, "mobileCombo");
-        feild.put(7, "mobileRealName");
-        feild.put(8, "mobileIdentityCardNo");
-        feild.put(9, "wxPassword");
-        feild.put(10, "wxRegisterAt");
-        feild.put(11, "wxRealName");
-        feild.put(12, "wxIdentityCardNo");
-        feild.put(13, "bankCardNo");
-        feild.put(14, "bankCardMobileNo");
-        feild.put(15, "wxFriendName1");
-        feild.put(16, "wxFriendUserName1");
-        feild.put(17, "wxFriendName2");
-        feild.put(18, "wxFriendUserName2");
-        feild.put(19, "wxFriendName3");
-        feild.put(20, "wxFriendUserName3");
-        feild.put(21, "workWxCorp");
-        feild.put(22, "workWxRegisterAt");
+        feild.put(7, "mobileComboFlow");
+        feild.put(8, "mobileRealName");
+        feild.put(9, "mobileIdentityCardNo");
+        feild.put(10, "wxPassword");
+        feild.put(11, "wxRegisterAt");
+        feild.put(12, "wxRealName");
+        feild.put(13, "wxIdentityCardNo");
+        feild.put(14, "bankCardNo");
+        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(22, "workWxCorp");
+        feild.put(23, "workWxRegisterAt");
         List<Map<String, String>> row = new ArrayList<>();
         try {
             row = Analysis.analysis(file, feild);

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

@@ -62,6 +62,9 @@ public class Analysis {
                 for (int j = 0; j < sheetRow.getPhysicalNumberOfCells(); j++) {
                     //将每一个单元格的值装入列集合
                     sheetRow.getCell(j).setCellType(CellType.STRING);
+                    if (sheetRow.getCell(j).getStringCellValue() == null || sheetRow.getCell(j).getStringCellValue().isEmpty()){
+                        continue;
+                    }
                     if(j>=field.size()){
                         break;
                     }

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

@@ -77,10 +77,8 @@ public class FosterwxMobileServiceImpl extends ServiceImpl<FosterwxMobileMapper,
         if(row.size() <= 0){
             return false;
         }
-        List<FosterwxMobile> add = new ArrayList<>();
         DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         for (int i = 0;i<row.size();i++) {
-
             LocalDateTime nowDate = LocalDateTime.now();
             Map<String, String> cell = row.get(i);
             FosterwxMobile fosterwxMobile = new FosterwxMobile();
@@ -91,19 +89,21 @@ public class FosterwxMobileServiceImpl extends ServiceImpl<FosterwxMobileMapper,
             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")));
+            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"));
-            fosterwxMobile.setStationId(Integer.parseInt(row.get(i).get("workWxCorp")));
-            fosterwxMobile.setStationId(Integer.parseInt(row.get(i).get("workWxRegisterAt")));
+            fosterwxMobile.setWorkWxCorp(row.get(i).get("workWxCorp"));
+            fosterwxMobile.setWorkWxRegisterAt(LocalDateTime.parse(row.get(i).get("workWxRegisterAt"),df));
             fosterwxMobile.setCreateAt(nowDate);
             fosterwxMobile.setUpdateAt(nowDate);
-            add.add(fosterwxMobile);
+            fosterwxMobile.setMobileUnioCode(String.format("%02d", fosterwxMobile.getStationId()) + String.format("%02d", fosterwxMobile.getMobileCode()));
+            this.save(fosterwxMobile);
             //.批量录入微信好友
             List<FosterwxMobileWxfriend> addFriend = new ArrayList<>();
             for (Integer s = 1;s<=3;s++) {
@@ -120,7 +120,7 @@ public class FosterwxMobileServiceImpl extends ServiceImpl<FosterwxMobileMapper,
             fosterwxMobileWxfriendService.remove(new QueryWrapper<FosterwxMobileWxfriend>().eq("mobile_id",fosterwxMobile.getId()));
             fosterwxMobileWxfriendService.saveBatch(addFriend);
         }
-        this.saveBatch(add);
+//        this.saveBatch(add);
         return true;
     }