Merge branch 'saff_update_feature' into dev

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

@@ -9,11 +9,9 @@ import com.github.wxiaoqi.security.admin.entity.AppUserPosition;
 import com.github.wxiaoqi.security.admin.mapper.AppShareholderDetailMapper;
 import com.github.wxiaoqi.security.admin.vo.AppShareholderDetailVo;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
-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;
@@ -22,17 +20,14 @@ import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.mongodb.core.mapreduce.GroupBy;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 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.*;
-import java.util.concurrent.CountDownLatch;
 import java.util.stream.Collectors;
 
 
@@ -197,7 +192,8 @@ public class AppShareholderDetailBiz extends BaseBiz<AppShareholderDetailMapper,
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
     public int importShareholder(List<String[]> shareholderData) {
         List<AppShareholderDetail> appShareholderDetail = new ArrayList<>();
-        wrapperData(shareholderData);
+        int size = 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++) {
@@ -214,14 +210,15 @@ public class AppShareholderDetailBiz extends BaseBiz<AppShareholderDetailMapper,
                 throw new BaseException("导入数据失败");
             }
         }*/
-        return appShareholderDetail.size();
+        return size;
     }
 
     /**
      * @param subResultDate
      */
-    private void wrapperData(List<String[]> subResultDate) {
+    private int wrapperData(List<String[]> subResultDate) {
         int size = subResultDate.get(0).length;
+        int total=0;
         subResultDate.remove(0);
         for (String[] data : subResultDate) {
             data = Arrays.copyOf(data, size);
@@ -232,6 +229,7 @@ public class AppShareholderDetailBiz extends BaseBiz<AppShareholderDetailMapper,
             SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
             if (StringUtils.isNotBlank(name) && StringUtils.isNotBlank(phone) && StringUtils.isNotBlank(companyName)) {
                 try {
+                    total++;
                     Date relTime = StringUtils.isNoneBlank(time) ? formatter.parse(time) : null;
                     BranchCompany branchCompany = vehicleFeign.companyId(companyName);
                     if (branchCompany != null) {
@@ -272,5 +270,6 @@ public class AppShareholderDetailBiz extends BaseBiz<AppShareholderDetailMapper,
                 }
             }
         }
+        return total;
     }
 }