Skip to content

H
haoban-manage3.0
Commit 619ef169 by 墨竹
Options

refactor:删除无效代码

parent 6ae6ffcd
Showing with 5 additions and 98 deletions
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/DealSyncOperationApiService.java
......@@ -167,14 +167,13 @@ public interface DealSyncOperationApiService {
void dealWxFriendStore(String taskId, String storeId, String wxEnterpriseId);
/**
* 定时
* 定时刷新企微好友
*
* @param res
*/
@Deprecated
void quartWxFriendClerk(String res);
void test(String wxEnterpriseId, String taskId);
/**
* 获取刷新状态
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/DealSyncOperationApiServiceImpl.java
......@@ -726,68 +726,6 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
dealWxFriendClerk(tabHaobanSyncTask.getTaskId(), tabHaobanSyncTask.getWxEnterpriseId());
}
}
}
@Override
public void test(String wxEnterpriseId, String taskId) {
List<TabHaobanStaffClerkRelation> relationList = new ArrayList<TabHaobanStaffClerkRelation>();
TabHaobanStaffClerkRelation tab = new TabHaobanStaffClerkRelation();
TabHaobanStaffClerkRelation tab1 = new TabHaobanStaffClerkRelation();
TabHaobanStaffClerkRelation tab2 = new TabHaobanStaffClerkRelation();
TabHaobanStaffClerkRelation tab3 = new TabHaobanStaffClerkRelation();
TabHaobanStaffClerkRelation tab4 = new TabHaobanStaffClerkRelation();
TabHaobanStaffClerkRelation tab5 = new TabHaobanStaffClerkRelation();
TabHaobanStaffClerkRelation tab6 = new TabHaobanStaffClerkRelation();
TabHaobanStaffClerkRelation tab7 = new TabHaobanStaffClerkRelation();
TabHaobanStaffClerkRelation tab8 = new TabHaobanStaffClerkRelation();
TabHaobanStaffClerkRelation tab9 = new TabHaobanStaffClerkRelation();
// tab.setWxUserId("12");
// tab1.setWxUserId("13989473881");
// tab2.setWxUserId("1545shiyao");
// tab3.setWxUserId("15757150876");
// tab4.setWxUserId("18758285875");
// tab5.setWxUserId("2224324sdftgret90");
// tab6.setWxUserId("2341578784");
// tab7.setWxUserId("234324");
// tab8.setWxUserId("niweizhong");
tab9.setWxUserId("QiuWenMin");
// tab.setStaffId("12");
// tab1.setStaffId("13989473881");
// tab2.setStaffId("1545shiyao");
// tab3.setStaffId("15757150876");
// tab4.setStaffId("18758285875");
// tab5.setStaffId("2224324sdftgret90");
// tab6.setStaffId("2341578784");
// tab7.setStaffId("234324");
// tab8.setStaffId("niweizhong");
tab9.setStaffId("QiuWenMin");
// relationList.add(tab);
// relationList.add(tab1);
// relationList.add(tab2);
// relationList.add(tab3);
// relationList.add(tab4);
// relationList.add(tab5);
// relationList.add(tab6);
// relationList.add(tab7);
// relationList.add(tab8);
relationList.add(tab9);
List<TabHaobanPreDealLog> dealLogList = relationList.stream().map(dto -> {
TabHaobanPreDealLog dealLog = new TabHaobanPreDealLog();
dealLog.setDataId(dto.getWxUserId());
dealLog.setpDataId(dto.getStaffId());
dealLog.setDataType(PreDealTypeEnum.friend_clerk.getVal());
dealLog.setStatusFlag(0);
dealLog.setTaskId(taskId);
dealLog.setDataContent(JSONObject.toJSONString(dto));
dealLog.setWxEnterpriseId(wxEnterpriseId);
return dealLog;
}).collect(Collectors.toList());
preDealService.insert(dealLogList);
HashSet<String> hashSet = (HashSet<String>) dealLogList.stream().map(TabHaobanPreDealLog::getDataId).collect(Collectors.toSet());
dealDepartmentToMq(taskId, hashSet, SyncTaskStatusEnum.friend_clerk_sync);
}
/**
......@@ -799,21 +737,6 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
private void dealFriendToMq(String taskId, Set<String> dealList, SyncTaskStatusEnum syncTaskStatusEnum) {
//预处理分组任务
syncTaskService.updateTaskStatus(taskId, syncTaskStatusEnum.getVal());
//
// dealList.forEach(relationId -> {
// DealParamMqDTO dealParamMqDTO = new DealParamMqDTO();
// dealParamMqDTO.setTaskId(taskId);
// dealParamMqDTO.setData(relationId);
// dealParamMqDTO.setType(syncTaskStatusEnum.getVal());
// GicMQClient clientInstance = GICMQClientUtil.getClientInstance();
// try {
// clientInstance.sendMessage("departmentSyncDealMq", JSONObject.toJSONString(dealParamMqDTO));
// } catch (Exception e) {
// logger.info("发送失败:{},{}", taskId, relationId);
// e.printStackTrace();
// }
// });
List<String> listRet = dealList.stream().map(relationId -> {
DealParamMqDTO dealParamMqDTO = new DealParamMqDTO();
dealParamMqDTO.setTaskId(taskId);
......@@ -821,13 +744,11 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
dealParamMqDTO.setType(syncTaskStatusEnum.getVal());
return JSONObject.toJSONString(dealParamMqDTO);
}).collect(Collectors.toList());
GicMQClient clientInstance = GICMQClientUtil.getClientInstance();
try {
clientInstance.sendBatchMessages("friendSyncDealMq", listRet);
} catch (Exception e) {
logger.info("发送失败:{},{}", taskId, JSONObject.toJSONString(listRet));
e.printStackTrace();
logger.info("发送失败:{},{}", taskId, JSONObject.toJSONString(listRet), e);
}
}
......
haoban-manage3-service/src/test/java/DealSyncTest.java
......@@ -2,44 +2,31 @@ import cn.hutool.core.thread.ConcurrencyTester;
import cn.hutool.core.thread.ThreadUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.gic.haoban.base.api.common.ServiceResponse;
import com.gic.haoban.manage.api.dto.StaffDTO;
import com.gic.haoban.manage.api.dto.SyncSingleDealDTO;
import com.gic.haoban.manage.api.service.DealSyncOperationApiService;
import com.gic.haoban.manage.api.service.MemberUnionidRelatedApiService;
import com.gic.haoban.manage.api.service.StaffApiService;
import com.gic.haoban.manage.api.service.StaffClerkRelationApiService;
import com.gic.haoban.manage.service.service.StaffService;
import com.gic.haoban.manage.service.service.TestService;
import com.gic.redis.data.util.RedisUtil;
import com.gic.wechat.api.dto.qywx.DepartmentDTO;
import com.gic.wechat.api.dto.qywx.QywxExternalcontactDTO;
import com.gic.wechat.api.dto.qywx.UserDTO;
import com.gic.wechat.api.service.qywx.QywxDepartmentApiService;
import com.gic.wechat.api.service.qywx.QywxUserApiService;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.redisson.api.RLock;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations = {"classpath:applicationContext-conf.xml"})
public class DealSyncTest {
private static Logger logger= LoggerFactory.getLogger(DealSyncTest.class);
private static final Logger logger = LoggerFactory.getLogger(DealSyncTest.class);
@Autowired
private DealSyncOperationApiService dealSyncOperationApiService;
......@@ -109,8 +96,8 @@ public class DealSyncTest {
@Test
public void test4() {
UserDTO workWxUser = qywxUserApiService.getSelfWorkWxUser("wweac4ef962720aa12", "GFu4FwkfcGFPue-qinB7ThEU4wR2SadbBH1yT5sLDzs", "WuXiangHong");
System.out.println(JSONObject.toJSONString(workWxUser));
String s = "";
memberUnionidRelatedApiService.dealQywxExternalUser(s);
}
}
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