Skip to content

H
haoban-manage3.0
Commit 5218bc32 by fudahua
Options

Merge remote-tracking branch 'origin/master'

parents 41edcf7f 54a4f914
Showing with 96 additions and 16 deletions
haoban-manage3-service/pom.xml
......@@ -48,12 +48,12 @@
<groupId>com.gic</groupId>
<artifactId>haoban-common</artifactId>
<version>${haoban-common}</version>
<!-- <exclusions> -->
<!-- <exclusion> -->
<!-- <artifactId>jsqlparser</artifactId> -->
<!-- <groupId>com.github.jsqlparser</groupId> -->
<!-- </exclusion> -->
<!-- </exclusions> -->
<exclusions>
<exclusion>
<artifactId>log4j</artifactId>
<groupId>log4j</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.gic</groupId>
......@@ -72,6 +72,12 @@
</dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>haoban-task-api</artifactId>
<version>${haoban-task-api}</version>
</dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>haoban-contacts-api</artifactId>
<version>${haoban-contacts-api}</version>
</dependency>
......@@ -89,6 +95,12 @@
<groupId>com.gic</groupId>
<artifactId>gic-enterprise-api</artifactId>
<version>${gic-enterprise-api}</version>
<exclusions>
<exclusion>
<artifactId>log4j</artifactId>
<groupId>log4j</groupId>
</exclusion>
</exclusions>
<!-- <exclusions> -->
<!-- <exclusion> -->
<!-- <artifactId>jsqlparser</artifactId> -->
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/BindApiServiceImpl.java
......@@ -159,6 +159,9 @@ public class BindApiServiceImpl implements BindApiService {
if(StringUtils.isNotBlank(fromClerkCode)){
//发送消息
ClerkDTO leader = clerkService.getClerkLeaderByStoreId(storeId);
if(leader == null){
leader = new ClerkDTO();
}
String clerkId = leader.getClerkId();
String storeName = departmentDTO.getDepartmentName();
String staffName = clerkName;
......@@ -223,6 +226,9 @@ public class BindApiServiceImpl implements BindApiService {
if(StringUtils.isNotBlank(sendClerkCode)){
//发送消息
ClerkDTO leader = clerkService.getClerkLeaderByStoreId(storeId);
if(leader == null){
leader = new ClerkDTO();
}
String clerkId = leader.getClerkId();
String storeName = departmentDTO.getDepartmentName();
String staffName = staffDTO.getStaffName();
......@@ -268,6 +274,9 @@ public class BindApiServiceImpl implements BindApiService {
if(StringUtils.isNotBlank(fromClerkCode)){
//发送消息
ClerkDTO leader = clerkService.getClerkLeaderByStoreId(storeId);
if(leader == null){
leader = new ClerkDTO();
}
String clerkId = leader.getClerkId();
String storeName = departmentDTO.getDepartmentName();
String staffName = clerkName;
......@@ -330,6 +339,9 @@ public class BindApiServiceImpl implements BindApiService {
if(StringUtils.isNotBlank(fromClerkCode)){
//发送消息
ClerkDTO leader = clerkService.getClerkLeaderByStoreId(storeId);
if(leader == null){
leader = new ClerkDTO();
}
String clerkId = leader.getClerkId();
String storeName = departmentDTO.getDepartmentName();
String staffName = clerkName;
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MemberUnionidRelatedApiServiceImpl.java
......@@ -456,6 +456,9 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
JSONObject jt = JSON.parseObject(external_contact);
unionId = jt.getString("unionid");
relaName = EmojiFilterUtil.filterEmojiLast(jt.getString("name"), true);
if(StringUtils.isBlank(relaName)){
relaName = "--";
}
avatar = jt.getString("avatar");
}
......@@ -563,6 +566,9 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
if(StringUtils.isNotBlank(external_contact)){
jt = JSON.parseObject(external_contact);
wxName = EmojiFilterUtil.filterEmojiLast(jt.getString("name"), true);
if(StringUtils.isBlank(wxName)){
wxName = "--";
}
}
if(StringUtils.isNotBlank(uj_follow_user)){
JSONArray j = JSON.parseArray(uj_follow_user);
......@@ -871,6 +877,9 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
if(StringUtils.isNotBlank(external_contact)){
jt = JSON.parseObject(external_contact);
name = EmojiFilterUtil.filterEmojiLast(jt.getString("name"), true);
if(StringUtils.isBlank(name)){
name = "--";
}
avatar = jt.getString("avatar");
}
if(StringUtils.isNotBlank(uj_follow_user)){
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java
......@@ -342,6 +342,7 @@ public class StaffApiServiceImpl implements StaffApiService {
res.setCode(3);
return res;
}
String imageUrl = changeHeaderImageUrl(user.getAvatar());
TabHaobanStaff staff = staffService.selectByUserIdAndEnterpriseId(userId,wxEnterpriseId);
staff = (staff==null?new TabHaobanStaff():staff);
staff.setWxUserId(userId);
......@@ -349,7 +350,7 @@ public class StaffApiServiceImpl implements StaffApiService {
staff.setStatusFlag(1);
staff.setWxEnterpriseId(wxEnterpriseId);
if(StringUtils.isNotBlank(user.getAvatar())){
staff.setHeadImg(changeHeaderImageUrl(user.getAvatar()));
staff.setHeadImg(imageUrl);
}
if (StringUtils.isNotBlank(user.getName())) {
user.setName(EmojiFilterUtil.removeAllEmoji(user.getName()));
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffDepartmentRelatedApiServiceImpl.java
......@@ -305,6 +305,10 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
@Override
public boolean sendSingleMessage(String clerkId, String title,
String content, String pageUrl) {
if(StringUtils.isEmpty(clerkId)){
logger.info("clerkId不存在============>");
return false;
}
Map<String,String> map = getWxUserIdByClerkId(clerkId);
String wxUserId = map.get("wxUserId");
String corpId = map.get("corpId");
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/task/KafkaMessageServiceImpl.java
......@@ -4,7 +4,10 @@ import com.alibaba.fastjson.JSONObject;
import com.gic.binlog.base.entity.GicField;
import com.gic.binlog.base.entity.GicRecord;
import com.gic.binlog.base.entity.enums.GicRecordType;
import com.gic.clerk.api.dto.ClerkDTO;
import com.gic.clerk.api.service.ClerkService;
import com.gic.commons.util.EntityUtil;
import com.gic.commons.util.GICMQClientUtil;
import com.gic.dubbo.entity.ProviderLocalTag;
import com.gic.haoban.base.api.common.ServiceResponse;
import com.gic.haoban.contacts.manage.api.enums.StatusEnum;
......@@ -16,6 +19,11 @@ import com.gic.haoban.manage.service.pojo.BinlogBasePojo;
import com.gic.haoban.manage.service.pojo.ClerkSyncPojo;
import com.gic.haoban.manage.service.service.StaffClerkBindLogService;
import com.gic.haoban.manage.service.service.StaffClerkRelationService;
import com.gic.haoban.task.api.dto.MqMessageQo;
import com.gic.mq.sdk.exception.RouterException;
import com.gic.qcloud.cmq.CMQClientException;
import com.gic.qcloud.cmq.CMQServerException;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.time.DateUtils;
import org.apache.kafka.clients.consumer.ConsumerRecord;
......@@ -48,6 +56,8 @@ public class KafkaMessageServiceImpl implements MessageListener<String, GicRecor
@Autowired
private StaffClerkRelationApiService staffClerkRelationApiService;
@Autowired
private ClerkService clerkService;
@Override
......@@ -65,6 +75,29 @@ public class KafkaMessageServiceImpl implements MessageListener<String, GicRecor
if (record.value().getTableName().equals(CLERK)) {
dealClerk((ClerkSyncPojo)pojo);
//TODO 发消息处理新增店长，任务重新分配问题
ClerkSyncPojo syncPojo = (ClerkSyncPojo)pojo;
GicRecordType gicRecordType = GicRecordType.valueOf(syncPojo.getRecordType());
if(gicRecordType.equals(GicRecordType.INSERT) || gicRecordType.equals(GicRecordType.UPDATE)){
//新增,更新某个人为店长
String clerkId = syncPojo.getClerkId();
ClerkDTO clerkDTO = clerkService.getClerkByClerkId(clerkId);
Integer clerkType = clerkDTO.getClerkType();
if(clerkType != null && clerkType.intValue() == 1){
//TODO 发消息处理新增店长，任务重新分配问题
try {
logger.info("待分配任务重分配======>{}",clerkId);
MqMessageQo mqMessageQo = new MqMessageQo();
mqMessageQo.setType(MqMessageQo.DISTRIBUTE_TASK);
mqMessageQo.setData(clerkId);
String s = JSONObject.toJSONString(mqMessageQo);
GICMQClientUtil.getClientInstance().sendCommonMessage(RouterConstant.ROUTERTYPE, s,
"com.gic.haoban.task.api.service.MqAsynApiService", "run");
} catch (Exception e) {
e.printStackTrace();
}
}
}
}
}
......
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/ClerkController.java
......@@ -130,6 +130,9 @@ public class ClerkController extends WebBaseController{
if(StringUtils.isNotBlank(oldClerkCode)){
//发送消息
ClerkDTO leader = clerkService.getClerkLeaderByStoreId(storeId);
if(leader == null){
leader = new ClerkDTO();
}
String clerkId = leader.getClerkId();
String storeName = departmentDTO.getDepartmentName();
String staffName = staffDTO.getStaffName();
......
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/StaffController.java
......@@ -466,6 +466,17 @@ public class StaffController extends WebBaseController{
List<String> departmentIds = relationList.stream().map(DepartmentShortDTO::getDepartmentId).collect(Collectors.toList());
Page<StaffDTO> page = staffApiService.pageStaff(departmentIds,null,null,pageInfo);
List<StaffDTO> list = page.getResult();
logger.info("pages={},totalPage={}",page.getCurrentPage(),page.getTotalPage());
while(page.getCurrentPage() < page.getTotalPage()){
pageNum ++ ;
pageInfo.setPageNum(pageNum);
page = staffApiService.pageStaff(departmentIds,null,null,pageInfo);
List<StaffDTO> sonList = page.getResult();
if(CollectionUtils.isNotEmpty(sonList)){
list.addAll(sonList);
}
logger.info("sonList={}",sonList.size());
}
List<StaffExportVO> voList = new ArrayList<>();
for (StaffDTO staffDTO : list) {
StaffExportVO vo = new StaffExportVO();
......@@ -481,15 +492,6 @@ public class StaffController extends WebBaseController{
vo.setActiveFlag(active);
voList.add(vo);
}
while(page.getPages() < page.getTotalPage()){
pageNum ++ ;
pageInfo.setPageNum(pageNum);
page = staffApiService.pageStaff(departmentIds,null,null,pageInfo);
List<StaffDTO> sonList = page.getResult();
if(CollectionUtils.isNotEmpty(sonList)){
list.addAll(sonList);
}
}
//拼接导购信息
mergeClerkInfo(voList, wxEnterpriseId);
String fileName = wxEnterpriseName + "通讯录" + DateUtil.dateToStr(new Date(), DateUtil.FORMAT_DATE_8);
......
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/ClerkController.java
......@@ -598,6 +598,10 @@ public class ClerkController extends WebBaseController{
jsonObject.put("storeId", clerk.getStoreId());
String data = jsonObject.toJSONString();
ClerkDTO gicClerk = clerkService.getClerkLeaderByStoreId(clerk.getStoreId());
if(gicClerk == null){
//店长不存在，直接返回
return resultResponse(HaoBanErrCode.ERR_1);
}
String pageUrl = staffDepartmentRelatedApiService.getPageUrl(AppPageType.STORE_RELATED_RECORD.getCode(), data);
staffDepartmentRelatedApiService.sendSingleMessage(gicClerk.getClerkId(), messageTitle, messageContent, pageUrl);
......
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