|
|
@@ -44,7 +44,8 @@ public class MessageServiceImpl extends BaseMybatisDao<MessageFromSystemMapper>
|
|
|
private JpushEasemobAccountMapper jpushEasemobAccountMapper;
|
|
|
@Override
|
|
|
public String selectSendUser(Map<Integer, String> selectMap,Integer type) {
|
|
|
- if(selectMap.containsKey(ConsumerType.CUSTOMER_RETAIL.getTypeCode())){ //客户散户
|
|
|
+ if(selectMap.containsKey(ConsumerType.PERSON_CUSTOMER_RETAIL.getTypeCode())
|
|
|
+ || selectMap.containsKey(ConsumerType.ORGANIZATION_CUSTOMER_RETAIL.getTypeCode())){ //客户散户
|
|
|
return selectMap.get(ConsumerType.CUSTOMER_RETAIL.getTypeCode());
|
|
|
}else if(selectMap.containsKey(ConsumerType.USER_RETAIL.getTypeCode())){
|
|
|
return selectMap.get(ConsumerType.USER_RETAIL.getTypeCode()); //用户散户
|
|
|
@@ -140,7 +141,7 @@ public class MessageServiceImpl extends BaseMybatisDao<MessageFromSystemMapper>
|
|
|
mfs.setBody(body);
|
|
|
mfs.setCreateTime(createTime);
|
|
|
mfs.setSubject(subject);
|
|
|
- mfs.setConsumerType(targetType);
|
|
|
+ mfs.setConsumerType(getTargetType(targetType));
|
|
|
mfs.setIsDraft(isDraft);
|
|
|
mfs.setDeleteSign(Boolean.FALSE);
|
|
|
if(SecurityUtils.getSubject().getPrincipal() instanceof Admin){
|
|
|
@@ -152,8 +153,9 @@ public class MessageServiceImpl extends BaseMybatisDao<MessageFromSystemMapper>
|
|
|
List<MessageProducer> target = new ArrayList<MessageProducer>();
|
|
|
String[] cids;
|
|
|
if(subject == SubjectType.KE_HU.getTypeCode()){
|
|
|
- if(selectSendUser(targetMap,targetType).split(",")!=null){
|
|
|
- cids = selectSendUser(targetMap,targetType).split(",");
|
|
|
+ String tmp = selectSendUser(targetMap,targetType);
|
|
|
+ if(tmp !=null){
|
|
|
+ cids = tmp.split(",");
|
|
|
MessageProducer mp;
|
|
|
for(String cid : cids){
|
|
|
mp = new MessageProducer();
|
|
|
@@ -165,8 +167,9 @@ public class MessageServiceImpl extends BaseMybatisDao<MessageFromSystemMapper>
|
|
|
}
|
|
|
if(target.size()>0) insertBatchProducer(target);
|
|
|
}else if(subject == SubjectType.YUN_YING.getTypeCode()){
|
|
|
- if(selectSendUser(targetMap,targetType).split(",")!=null){
|
|
|
- cids = selectSendAdmin(targetMap,targetType).split(",");
|
|
|
+ String tmp = selectSendUser(targetMap,targetType);
|
|
|
+ if(tmp !=null){
|
|
|
+ cids = tmp.split(",");
|
|
|
MessageProducer mp;
|
|
|
for(String cid : cids){
|
|
|
mp = new MessageProducer();
|
|
|
@@ -196,8 +199,8 @@ public class MessageServiceImpl extends BaseMybatisDao<MessageFromSystemMapper>
|
|
|
Date createTime = new Date();
|
|
|
message.setCreateTime(createTime);
|
|
|
message.setSubject(subject);
|
|
|
- message.setConsumerType(targetType);
|
|
|
- message.setResourceType(getSourceType(sourceType)); //需要适配
|
|
|
+ message.setConsumerType(getTargetType(targetType)); //适配客户类型
|
|
|
+ message.setResourceType(getSourceType(sourceType)); //适配成果需求
|
|
|
message.setIsDraft(isDraft);
|
|
|
message.setDeleteSign(Boolean.FALSE);
|
|
|
if(SecurityUtils.getSubject().getPrincipal() instanceof Admin){
|
|
|
@@ -337,6 +340,18 @@ public class MessageServiceImpl extends BaseMybatisDao<MessageFromSystemMapper>
|
|
|
return sourceType;
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 为个人和组织客户做转换
|
|
|
+ * @param targetType
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ private Integer getTargetType(Integer targetType){
|
|
|
+ if(ConsumerType.PERSON_CUSTOMER_RETAIL.getTypeCode() == targetType
|
|
|
+ || ConsumerType.ORGANIZATION_CUSTOMER_RETAIL.getTypeCode() == targetType){
|
|
|
+ targetType = ConsumerType.CUSTOMER_RETAIL.getTypeCode();
|
|
|
+ }
|
|
|
+ return targetType;
|
|
|
+ }
|
|
|
@Override
|
|
|
public JpushEasemobAccount selectSynAccByUid(String uid) {
|
|
|
return jpushEasemobAccountMapper.selectSynAccByUid(uid);
|
|
|
@@ -350,4 +365,14 @@ public class MessageServiceImpl extends BaseMybatisDao<MessageFromSystemMapper>
|
|
|
}
|
|
|
return result;
|
|
|
}
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public int addJpushEasemobAccount(String uuid,String easemobName,String easemobPass) {
|
|
|
+ JpushEasemobAccount jea = new JpushEasemobAccount();
|
|
|
+ jea.setUid(TokenManager.getUserId());
|
|
|
+ jea.setUuid(uuid);
|
|
|
+ jea.setEasemobName(easemobName);
|
|
|
+ jea.setEasemobPass(easemobPass);
|
|
|
+ return jpushEasemobAccountMapper.insert(jea);
|
|
|
+ }
|
|
|
}
|