Merge branch 'saff_update_feature' into dev

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppShareholderDetailBiz.java

@@ -13,6 +13,7 @@ import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.xxfc.platform.im.utils.StringUtil;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.entity.BranchCompany;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
@@ -27,6 +28,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import tk.mybatis.mapper.entity.Example;
+
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -188,16 +190,17 @@ public class AppShareholderDetailBiz extends BaseBiz<AppShareholderDetailMapper,
      * 批量导入
      */
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
-    public int importShareholder(List<String[]> shareholderData, Integer userId, String userName) {
+    public int importShareholder(List<String[]> shareholderData) {
         List<AppShareholderDetail> appShareholderDetail = new ArrayList<>();
-        int threadNums = shareholderData.size() / BORDER_NUM == 0 ? 1 : shareholderData.size() / BORDER_NUM;
+        wrapperData(shareholderData);
+   /*int threadNums = shareholderData.size() / BORDER_NUM == 0 ? 1 : shareholderData.size() / BORDER_NUM;
         CountDownLatch latch = new CountDownLatch(threadNums);
         for (int i = 0; i < threadNums; i++) {
             int startIndex = i * BORDER_NUM;
             int endIndex = i == (threadNums - 1) ? shareholderData.size() : (i + 1) * BORDER_NUM;
             List<String[]> subResultDate = shareholderData.subList(startIndex, endIndex);
             threadPoolTaskExecutor.execute(() -> {
-                wrapperData(subResultDate);
+
                 latch.countDown();
             });
             try {
@@ -205,7 +208,7 @@ public class AppShareholderDetailBiz extends BaseBiz<AppShareholderDetailMapper,
             } catch (InterruptedException e) {
                 throw new BaseException("导入数据失败");
             }
-        }
+        }*/
         return appShareholderDetail.size();
     }
 
@@ -213,17 +216,21 @@ public class AppShareholderDetailBiz extends BaseBiz<AppShareholderDetailMapper,
      * @param subResultDate
      */
     private void wrapperData(List<String[]> subResultDate) {
-
+        int size = subResultDate.get(0).length;
+        subResultDate.remove(0);
         for (String[] data : subResultDate) {
+            data = Arrays.copyOf(data, size);
             String name = data[0];
             String phone = data[1];
             String companyName = data[2];
-            String Time = data[3];
+            String time = data[3];
             SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+            if (StringUtils.isNotBlank(name) && StringUtils.isNotBlank(phone) && StringUtils.isNotBlank(companyName)) {
                 try {
-                Date relTime = formatter.parse(Time);
+                    Date relTime = StringUtils.isNoneBlank(time) ? formatter.parse(time) : null;
                     BranchCompany branchCompany = vehicleFeign.companyId(companyName);
                     if (branchCompany != null) {
+                        if (branchCompany.getId() != null) {
                             Integer positionId = branchCompany.getId().equals(1) ? HEADQUARTERS_SHAREHOLDER : BRANCH_HEADQUARTERS_SHAREHOLDER;
                             AppShareholderDetailDTO appShareholderDetailDTO = new AppShareholderDetailDTO();
                             //用户表更改其身份
@@ -254,9 +261,11 @@ public class AppShareholderDetailBiz extends BaseBiz<AppShareholderDetailMapper,
                             BeanUtils.copyProperties(appShareholderDetailDTO, appShareholderDetail);
                             mapper.insertSelective(appShareholderDetail);
                         }
+                    }
                 } catch (ParseException e) {
                     log.error("股东导入失败：【{}】", e);
                 }
             }
         }
+    }
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/admin/AppShareholderDetailController.java

@@ -44,9 +44,9 @@ public class AppShareholderDetailController {
             if (appShareholderData.size() < 1) {
                 return ObjectRestResponse.createFailedResult(1001, "导入不能没数据！！！");
             }
-            appShareholderData.remove(0);
+//            appShareholderData.remove(0);
             try {
-                int effectSize = appShareholderDetailBiz.importShareholder(appShareholderData, Integer.valueOf(infoFromToken.getId()), infoFromToken.getUniqueName());
+                int effectSize = appShareholderDetailBiz.importShareholder(appShareholderData);
                 return ObjectRestResponse.succ(effectSize);
             } catch (BaseException ex) {
                 return ObjectRestResponse.createDefaultFail();