Merge remote-tracking branch 'origin/master'

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

@@ -232,7 +232,7 @@ public class AppUserLoginBiz extends BaseBiz<AppUserLoginMapper, AppUserLogin> {
         List<AppUserLogin> appUserLogins = mapper.selectbyPhones(phones);
         Map<String, Integer> phoneAndUserIdMap = null;
         if (CollectionUtils.isNotEmpty(appUserLogins)) {
-            phoneAndUserIdMap = appUserLogins.stream().collect(Collectors.toMap(AppUserLogin::getUsername, AppUserLogin::getId));
+            phoneAndUserIdMap = appUserLogins.parallelStream().collect(Collectors.toMap(AppUserLogin::getUsername, AppUserLogin::getId));
         }
         return phoneAndUserIdMap;
     }

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

@@ -17,6 +17,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -24,6 +25,8 @@ import tk.mybatis.mapper.entity.Example;
 
 import java.time.Instant;
 import java.util.*;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -47,6 +50,11 @@ public class BaseUserMemberExportBiz extends BaseBiz<BaseUserMemberExportMapper,
     @Autowired
     private AppUserLoginBiz appUserLoginBiz;
 
+    @Autowired
+    private  ThreadPoolTaskExecutor threadPoolTaskExecutor;
+
+    private final int BORDER_NUM=250;
+
 
     public void saveUserMember(UserMemberSaveDTO userMemberSaveDTO, Integer userId, String name) {
         if (userMemberSaveDTO != null) {
@@ -95,15 +103,37 @@ public class BaseUserMemberExportBiz extends BaseBiz<BaseUserMemberExportMapper,
         List<BaseUserMemberExport> baseUserMemberExports = new ArrayList<>();
 
         List<BaseUserMemberLevel> levesls = userMemberLevelBiz.getLevesls();
-        Map<Integer, BaseUserMemberLevel> levelAndbaseUserMemberMap = levesls.stream().collect(Collectors.toMap(BaseUserMemberLevel::getLevel, Function.identity()));
-        Map<String,Integer> leavelNameAndLeaveMap = levelAndbaseUserMemberMap.values().stream().collect(Collectors.toMap(BaseUserMemberLevel::getName, BaseUserMemberLevel::getLevel));
+        Map<Integer, BaseUserMemberLevel> levelAndbaseUserMemberMap = levesls.parallelStream().collect(Collectors.toMap(BaseUserMemberLevel::getLevel, Function.identity()));
+        Map<String,Integer> leavelNameAndLeaveMap = levelAndbaseUserMemberMap.values().parallelStream().collect(Collectors.toMap(BaseUserMemberLevel::getName, BaseUserMemberLevel::getLevel));
         List<String> phones = userMemberData.stream().map(x -> x[0]).distinct().collect(Collectors.toList());
         Map<String, Integer> phoneAndUserIdMap = appUserLoginBiz.findPhoneAndUserIdMapByPhones(phones);
         Set<Map.Entry<String, Integer>> leaveNameAndLeaveEntry = leavelNameAndLeaveMap.entrySet();
         Integer memberLevel =1;
         Integer discount = 0;
-        for (String[] data : userMemberData) {
+        AtomicInteger counter = new AtomicInteger(0);
+        int threadNums= userMemberData.size()/BORDER_NUM==0?1:userMemberData.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)?userMemberData.size():(i+1)*BORDER_NUM;
+            List<String[]> subResultDate = userMemberData.subList(startIndex,endIndex);
+            threadPoolTaskExecutor.execute(()->{
+                wrapperData(subResultDate, userId, userName, baseUserMemberExports, levelAndbaseUserMemberMap, phoneAndUserIdMap, leaveNameAndLeaveEntry, memberLevel, discount, counter);
+                 latch.countDown();
+                });
+         }
+        try {
+            latch.await();
+        } catch (InterruptedException e) {
+            throw new BaseException("导入数据失败");
+        }
+        InsertBatch(baseUserMemberExports);
+        return baseUserMemberExports.size();
+    }
 
+    private void wrapperData(List<String[]> userMemberData, Integer userId, String userName, List<BaseUserMemberExport> baseUserMemberExports, Map<Integer, BaseUserMemberLevel> levelAndbaseUserMemberMap, Map<String, Integer> phoneAndUserIdMap, Set<Map.Entry<String, Integer>> leaveNameAndLeaveEntry, Integer memberLevel, Integer discount, AtomicInteger counter) {
+        for (String[] data : userMemberData) {
+            counter.incrementAndGet();
             String phone = data[0];
             String memberLevelName = data[1];
             String memberName  = data[2];
@@ -131,6 +161,7 @@ public class BaseUserMemberExportBiz extends BaseBiz<BaseUserMemberExportMapper,
                 try {
                     baseUserMemberBiz.updUserMemberByUserId(userMemberDTO);
                 } catch (Exception e) {
+                    log.error("当前行数：【{}】",counter.get());
                     log.error("会员更新错误：【{}】", e.getMessage());
                     throw new BaseException(e);
                 }
@@ -138,7 +169,7 @@ public class BaseUserMemberExportBiz extends BaseBiz<BaseUserMemberExportMapper,
 
             BaseUserMemberExport memberExport = BaseUserMemberExport
                     .builder()
-                    .username(phone)
+                    .username(phone.trim())
                     .memberLevel(memberLevel)
                     .totalNumber(Integer.valueOf(totalNumber))
                     .rentFreeDays(Integer.valueOf(rentFreeDays))
@@ -155,9 +186,6 @@ public class BaseUserMemberExportBiz extends BaseBiz<BaseUserMemberExportMapper,
             }
             baseUserMemberExports.add(memberExport);
         }
-
-        InsertBatch(baseUserMemberExports);
-        return baseUserMemberExports.size();
     }
 
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleModelController.java

@@ -10,6 +10,7 @@ import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.github.wxiaoqi.security.common.util.ClientUtil;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.vo.GoodDataVO;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
@@ -32,8 +33,6 @@ import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.bind.annotation.*;
 import tk.mybatis.mapper.entity.Example;
 import tk.mybatis.mapper.weekend.WeekendSqls;
-import tk.mybatis.mapper.entity.Example;
-import tk.mybatis.mapper.weekend.WeekendSqls;
 
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
@@ -295,11 +294,10 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
     }
 
 
-    @Override
     @ApiOperation("删除")
     @DeleteMapping(value = "/app/{id}")
     @Transactional
-    public ObjectRestResponse<VehicleModel> remove(@PathVariable int id) {
+    public ObjectRestResponse<VehicleModel> remove(@PathVariable int id,UserDTO userDTO) {
 
         if (id == 1 || id == 14) {
             return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "The label cannot be deleted");
@@ -308,7 +306,12 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
         VehicleModel vm = new VehicleModel();
         vm.setId(id);
         vm.setIsdel(1);
-        vehicleModelBiz.updateSelectiveById(vm);
+        vm.setUpdTime(new Date());
+        vm.setUpdUser(userDTO.getId());
+        vm.setUpdName(userDTO.getUsername());
+        vm.setUpdHost(org.apache.commons.lang3.StringUtils.defaultIfBlank(request.getHeader("userHost"), ClientUtil.getClientIp(request)));
+//        vehicleModelBiz.updateSelectiveById(vm);
+        vehicleModelBiz.updateByPrimaryKeySelective(vm);
 
         //3.删除车型对应的标签
         VehicleCata vehicleCata = new VehicleCata();