Skip to content

H
haoban-manage3.0
Commit 328432bd by qwmqiuwenmin
Options

Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer

parents b5945e76 6806a242
Showing with 73 additions and 59 deletions
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MemberUnionidRelatedApiServiceImpl.java
......@@ -129,23 +129,34 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
if(CollectionUtil.isEmpty(list)){
return null;
}
//1、查该staff的门店id
List<TabHaobanStaffDepartmentRelated> relatedIds = staffDepartmentRelatedService.listByWxUserId(wxUserId);
if(CollectionUtil.isEmpty(relatedIds)){
log.info("staff关联部门不存在1");
String wxEnterpriseId = list.get(0).getWxEnterpriseId();
TabHaobanStaff haobanStaff = staffService.selectByUserIdAndEnterpriseId(wxUserId, wxEnterpriseId);
if (null == haobanStaff) {
log.info("staff不存在");
return null;
}
List<String> departmentIds = relatedIds.stream().map(s->s.getDepartmentId()).collect(Collectors.toList());
if(CollectionUtil.isEmpty(departmentIds)){
log.info("staff部门不存在1");
return null;
}
List<DepartmentDTO> stores = departmentApiService.listByDepartmentIds(departmentIds, 1);
if(CollectionUtil.isEmpty(stores)){
List<StaffClerkRelationDTO> clerkRelationDTOS = staffClerkRelationService.listBindCodeByStaffId(null, haobanStaff.getStaffId());
if(CollectionUtil.isEmpty(clerkRelationDTOS)){
log.info("staff关联门店不存在1");
return null;
}
List<String> storeIds = stores.stream().filter(s->(s.getRelatedId()!=null || "".equals(s.getRelatedId()))).map(s->s.getRelatedId()).collect(Collectors.toList());
// //1、查该staff的门店id
// List<TabHaobanStaffDepartmentRelated> relatedIds = staffDepartmentRelatedService.listByWxUserId(wxUserId);
// if(CollectionUtil.isEmpty(relatedIds)){
// log.info("staff关联部门不存在1");
// return null;
// }
// List<String> departmentIds = relatedIds.stream().map(s->s.getDepartmentId()).collect(Collectors.toList());
// if(CollectionUtil.isEmpty(departmentIds)){
// log.info("staff部门不存在1");
// return null;
// }
// List<DepartmentDTO> stores = departmentApiService.listByDepartmentIds(departmentIds, 1);
// if(CollectionUtil.isEmpty(stores)){
// log.info("staff关联门店不存在1");
// return null;
// }
List<String> storeIds = clerkRelationDTOS.stream().filter(s->(s.getStoreId()!=null || "".equals(s.getStoreId()))).map(s->s.getStoreId()).collect(Collectors.toList());
if(CollectionUtil.isEmpty(storeIds)){
log.info("staff关联门店不存在2");
return null;
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java
......@@ -13,6 +13,7 @@ import com.gic.haoban.manage.api.dto.*;
import com.gic.haoban.manage.api.enums.SecretTypeEnum;
import com.gic.haoban.manage.api.service.DepartmentApiService;
import com.gic.haoban.manage.service.service.*;
import com.gic.haoban.manage.service.util.EmojiFilterUtil;
import com.gic.redis.data.anno.RedisCache;
import com.gic.thirdparty.api.dto.PicUploadResDTO;
import com.gic.thirdparty.api.service.QQCloudPicService;
......@@ -347,11 +348,11 @@ public class StaffApiServiceImpl implements StaffApiService {
staff.setHeadImg(changeHeaderImageUrl(user.getAvatar()));
}
if (StringUtils.isNotBlank(user.getName())) {
user.setName(EmojiParser.removeAllEmojis(user.getName()));
user.setName(EmojiFilterUtil.removeAllEmoji(user.getName()));
staff.setStaffName((user.getName()));
}
if (StringUtils.isNotBlank(user.getAlias())) {
user.setAlias(EmojiParser.removeAllEmojis(user.getAlias()));
user.setAlias(EmojiFilterUtil.removeAllEmoji(user.getAlias()));
staff.setNickName((user.getAlias()));
}
String phoneNumber = user.getMobile();
......@@ -516,11 +517,11 @@ public class StaffApiServiceImpl implements StaffApiService {
}
tab.setPhoneNumber(user.getMobile());
if (StringUtils.isNotBlank(user.getName())) {
user.setName(EmojiParser.removeAllEmojis(user.getName()));
user.setName(EmojiFilterUtil.removeAllEmoji(user.getName()));
tab.setStaffName((user.getName()));
}
if (StringUtils.isNotBlank(user.getAlias())) {
user.setAlias(EmojiParser.removeAllEmojis(user.getAlias()));
user.setAlias(EmojiFilterUtil.removeAllEmoji(user.getAlias()));
tab.setNickName((user.getAlias()));
}
// tab.setNickName(user.getAlias());
......@@ -626,11 +627,11 @@ public class StaffApiServiceImpl implements StaffApiService {
}
tab.setPhoneNumber(user.getMobile());
if (StringUtils.isNotBlank(user.getName())) {
user.setName(EmojiParser.removeAllEmojis(user.getName()));
user.setName(EmojiFilterUtil.removeAllEmoji(user.getName()));
tab.setStaffName((user.getName()));
}
if (StringUtils.isNotBlank(user.getAlias())) {
user.setAlias(EmojiParser.removeAllEmojis(user.getAlias()));
user.setAlias(EmojiFilterUtil.removeAllEmoji(user.getAlias()));
tab.setNickName((user.getAlias()));
}
// tab.setNickName(user.getAlias());
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/task/QywxGroupSyncOperation.java
......@@ -24,6 +24,7 @@ import com.gic.haoban.manage.service.entity.TabHaobanDepartment;
import com.gic.haoban.manage.service.entity.TabHaobanPreDealLog;
import com.gic.haoban.manage.service.entity.TabHaobanSyncTask;
import com.gic.haoban.manage.service.service.*;
import com.gic.haoban.manage.service.util.EmojiFilterUtil;
import com.gic.mq.sdk.GicMQClient;
import com.gic.redis.data.util.RedisUtil;
import com.gic.wechat.api.dto.qywx.UserDTO;
......@@ -212,7 +213,7 @@ public class QywxGroupSyncOperation implements BaseSyncOperation {
dealLog.setpDataId(dataId);
dealLog.setDataType(PreDealTypeEnum.clerk.getVal());
dealLog.setStatusFlag(0);
dealLog.setDataContent(EmojiParser.removeAllEmojis(userDTO.getName()));
dealLog.setDataContent(EmojiFilterUtil.removeAllEmoji(userDTO.getName()));
dealLog.setTaskId(taskId);
dealLog.setWxEnterpriseId(wxEnterpriseId);
dealLog.setEnterpriseId(enterpriseId);
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/util/EmojiFilterUtil.java
package com.gic.haoban.manage.service.util;
import com.gic.commons.util.StringUtil;
import com.vdurmont.emoji.EmojiParser;
import org.apache.commons.lang3.StringUtils;
public class EmojiFilterUtil {
public static String removeAllEmoji(String content) {
if (StringUtils.isBlank(content)) {
return content;
}
String s = EmojiParser.removeAllEmojis(content);
if (StringUtils.isBlank(s)) {
return "";
}
return EmojiFilterUtil.filterEmojiLast(s,false);
}
/**
* @param isPharse 是否是短语 若是短语则 超过20字符编程*
*/
......
haoban-manage3-service/src/test/java/ServiceTest.java
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.gic.api.base.commons.JSONResponse;
import com.gic.haoban.base.api.common.ServiceResponse;
......@@ -7,16 +5,19 @@ import com.gic.haoban.manage.api.service.DepartmentApiService;
import com.gic.haoban.manage.api.service.StaffApiService;
import com.gic.haoban.manage.api.service.TestApiService;
import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService;
import com.gic.haoban.manage.service.util.EmojiFilterUtil;
import com.gic.redis.data.util.RedisUtil;
import com.gic.wechat.api.dto.qywx.*;
import com.gic.wechat.api.dto.qywx.DepartmentDTO;
import com.gic.wechat.api.dto.qywx.QywxImageExternalMessageDTO;
import com.gic.wechat.api.dto.qywx.QywxXcxSendMessageDTO;
import com.gic.wechat.api.dto.qywx.UserDTO;
import com.gic.wechat.api.enums.QywxMediaTypeEnum;
import com.gic.wechat.api.service.qywx.QywxDepartmentApiService;
import com.gic.wechat.api.service.qywx.QywxSuiteApiService;
import com.gic.wechat.api.service.qywx.QywxUserApiService;
import org.apache.logging.log4j.core.util.ExecutorServices;
import com.github.binarywang.java.emoji.EmojiConverter;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.quartz.spi.ThreadPool;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
......@@ -30,9 +31,7 @@ import java.io.IOException;
import java.net.URL;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.concurrent.Executor;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
......@@ -265,10 +264,16 @@ public void sendMessage() {
}
@Test
public void staff() {
ServiceResponse res = staffApiService.getWxSaveNew("a.XiaoPangZhi", "ca66a01b79474c40b3e7c7f93daf1a3b");
System.out.println(res);
EmojiConverter emojiConverter = EmojiConverter.getInstance();
// List<UserDTO> userDTOList = qywxUserApiService.listSelfDepartmentUser("wwd5b0d17fd7952df8", "cFhOS1fkb8-qJNHDr5S8QI1JbpsTLCSTOsxQQUUmYz4", "1", 0);
UserDTO wxUser = qywxUserApiService.getSelfWorkWxUser("wwd5b0d17fd7952df8", "cFhOS1fkb8-qJNHDr5S8QI1JbpsTLCSTOsxQQUUmYz4", "QingSu");
String s = EmojiFilterUtil.removeAllEmoji(wxUser.getName());
// String name = (String) b;
// ServiceResponse res = staffApiService.getWxSaveNew("a.XiaoPangZhi", "ca66a01b79474c40b3e7c7f93daf1a3b");
System.out.println(JSONObject.toJSONString(wxUser));
}
......
haoban-manage3-service/src/test/java/Setest.java
......@@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSONObject;
import com.gic.haoban.contacts.manage.api.dto.StoreAddDTO;
import com.gic.haoban.manage.api.dto.SyncSingleDealDTO;
import com.gic.haoban.manage.api.service.DealSyncOperationApiService;
import com.vdurmont.emoji.EmojiManager;
import com.vdurmont.emoji.EmojiParser;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -22,35 +24,10 @@ public class Setest {
@Test
public void test() {
List<StoreAddDTO> list=new ArrayList<>();
{
StoreAddDTO storeAddDTO = new StoreAddDTO();
storeAddDTO.setBrandId("1");
storeAddDTO.setStoreName("1-1");
list.add(storeAddDTO);
}
{
StoreAddDTO storeAddDTO = new StoreAddDTO();
storeAddDTO.setBrandId("2");
storeAddDTO.setStoreName("2-1");
list.add(storeAddDTO);
}
{
StoreAddDTO storeAddDTO = new StoreAddDTO();
storeAddDTO.setBrandId("1");
storeAddDTO.setStoreName("1-2");
list.add(storeAddDTO);
}
{
StoreAddDTO storeAddDTO = new StoreAddDTO();
storeAddDTO.setBrandId("2");
storeAddDTO.setStoreName("2-2");
list.add(storeAddDTO);
}
Map<String, List<StoreAddDTO>> collect = list.stream().collect(Collectors.groupingBy(StoreAddDTO::getBrandId, Collectors.toList()));
System.out.println(JSONObject.toJSONString(collect));
String str="゛ʚ情愫ɞ \uD83E\uDD0D";
String s = EmojiParser.parseToHtmlHexadecimal(str);
System.out.println(JSONObject.toJSONString(s));
}
......
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/InfoController.java
......@@ -181,7 +181,7 @@ public class InfoController extends WebBaseController{
}
WxEnterpriseDTO enterpriseDTO = wxEnterpriseApiService.getOne(enterpriseDetailDTO.getWxEnterpriseId());
if (enterpriseDetailDTO == null) {
if (enterpriseDTO == null) {
logger.info("改企业不存在:{}", qo.getGicEnterpriseId());
return resultResponse(HaoBanErrCode.ERR_400002);
}
......@@ -222,7 +222,13 @@ public class InfoController extends WebBaseController{
// List<DepartmentDTO> result = response.getResult();
List<StoreMemberVO> retList = new ArrayList<>();
if (CollectionUtils.isNotEmpty(result)) {
result.stream().forEach(dto -> {
result.stream().filter(staffClerkInfoDTO -> {
if (staffClerkInfoDTO.getEnterpriseId().equals(qo.getGicEnterpriseId())) {
return true;
}else{
return false;
}
}).forEach(dto -> {
StoreMemberVO VO = new StoreMemberVO();
StoreDTO store = storeService.getStore(dto.getStoreId());
ClerkDTO clerkDTO = clerkService.getClerkByClerkId(dto.getClerkId());
......
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