Commit 8ce1d154 by fudahua

去重

parent 848fb1a1
...@@ -41,10 +41,7 @@ import org.slf4j.LoggerFactory; ...@@ -41,10 +41,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.HashSet; import java.util.*;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -285,7 +282,13 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ ...@@ -285,7 +282,13 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
eidListMap.forEach((k, v) -> { eidListMap.forEach((k, v) -> {
//获取所有分组列表 //获取所有分组列表
List<StoreGroupDTO> groupDTOList = storeGroupService.listStoreGroupAndChildren(v.toArray(new String[]{}), k); List<StoreGroupDTO> groupDTOList = storeGroupService.listStoreGroupAndChildren(v.toArray(new String[]{}), k);
List<TabHaobanPreDealLog> dealList = groupDTOList.stream().map(storeGroupDTO -> { List<String> hasKey=new ArrayList<>();
List<TabHaobanPreDealLog> dealList = groupDTOList.stream().filter(dto->{
if (hasKey.contains(dto.getStoreGroupId())) {
return false;
}
return true;
}).map(storeGroupDTO -> {
TabHaobanPreDealLog dealLog = new TabHaobanPreDealLog(); TabHaobanPreDealLog dealLog = new TabHaobanPreDealLog();
dealLog.setDataId(storeGroupDTO.getStoreGroupId()); dealLog.setDataId(storeGroupDTO.getStoreGroupId());
if (pMap.containsKey(storeGroupDTO.getStoreGroupId())) { if (pMap.containsKey(storeGroupDTO.getStoreGroupId())) {
......
...@@ -67,6 +67,7 @@ public class SyncDealContoller extends WebBaseController { ...@@ -67,6 +67,7 @@ public class SyncDealContoller extends WebBaseController {
String wxEnterpriseId = login.getWxEnterpriseId(); String wxEnterpriseId = login.getWxEnterpriseId();
logger.info("login:{}", JSONObject.toJSONString(login)); logger.info("login:{}", JSONObject.toJSONString(login));
logger.info("data:{}", JSONObject.toJSONString(qo));
String taskLock = dealSyncOperationApiService.getTaskLock(wxEnterpriseId); String taskLock = dealSyncOperationApiService.getTaskLock(wxEnterpriseId);
if (null != taskLock) { if (null != taskLock) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment